diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 26146496f..dbf215ca7 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -23,6 +23,8 @@
 	<uses-permission 
 	    android:name="android.permission.WRITE_EXTERNAL_STORAGE" 
 	    />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><uses-permission android:name="android.permission.READ_LOGS"/>
+	
 		
 	<application 
 		android:name=".AndorsTrailApplication" 
@@ -30,6 +32,7 @@
 		android:icon="@drawable/icon"
 		android:description="@string/app_description"
         android:allowBackup="true"
+        android:theme="@style/AndorsTrailTheme_Blue"
 		>
 		<activity 
 		    android:name=".activity.StartScreenActivity" 
@@ -43,22 +46,22 @@
    		<activity 
 			android:name=".activity.MainActivity" 
 			android:label="@string/app_name" 
-			android:theme="@style/Theme.NoBackground"
+			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
 		<activity android:name=".activity.HeroinfoActivity" />
-		<activity android:name=".activity.MonsterInfoActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.ItemInfoActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.LevelUpActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.ConversationActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
 		<activity android:name=".activity.ShopActivity" />
 		<activity android:name=".activity.AboutActivity" />
 		<activity android:name=".activity.LoadingActivity" />
 		<activity android:name=".activity.Preferences" />
-		<activity android:name=".activity.LoadSaveActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.BulkSelectionInterface" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.SkillInfoActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
 		<activity android:name=".activity.DisplayWorldMapActivity" />
 	</application>
 	
diff --git a/AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml b/AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml
new file mode 100644
index 000000000..3e34505be
--- /dev/null
+++ b/AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_pressed="true" android:color="@color/ui_blue_palette_text_gray_light"/>
+ 	<item android:state_enabled="true" android:state_checked="true" android:color="@color/ui_blue_palette_text_gray_light"/>
+ 	<item android:state_enabled="true" android:color="@color/ui_blue_palette_text_gray_mid"/>
+ 	<item android:state_enabled="false" android:color="@color/ui_blue_palette_text_gray_darker"/>
+ 	<item android:color="@color/ui_blue_palette_text_gray_mid"/>
+</selector>
diff --git a/AndorsTrail/res/drawable-nodpi/ts_background.png b/AndorsTrail/res/drawable-nodpi/ts_background.png
new file mode 100644
index 000000000..ae66c1fd6
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_background.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_clouds_l_01.png b/AndorsTrail/res/drawable-nodpi/ts_clouds_l_01.png
new file mode 100644
index 000000000..461b163ee
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_clouds_l_01.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_clouds_l_02.png b/AndorsTrail/res/drawable-nodpi/ts_clouds_l_02.png
new file mode 100644
index 000000000..a986403fc
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_clouds_l_02.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_clouds_l_03.png b/AndorsTrail/res/drawable-nodpi/ts_clouds_l_03.png
new file mode 100644
index 000000000..5e9bf54b4
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_clouds_l_03.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_clouds_l_04.png b/AndorsTrail/res/drawable-nodpi/ts_clouds_l_04.png
new file mode 100644
index 000000000..4e239d108
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_clouds_l_04.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_clouds_m_01.png b/AndorsTrail/res/drawable-nodpi/ts_clouds_m_01.png
new file mode 100644
index 000000000..da20d4e3a
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_clouds_m_01.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_clouds_m_02.png b/AndorsTrail/res/drawable-nodpi/ts_clouds_m_02.png
new file mode 100644
index 000000000..66a905469
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_clouds_m_02.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_clouds_s_01.png b/AndorsTrail/res/drawable-nodpi/ts_clouds_s_01.png
new file mode 100644
index 000000000..04c139785
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_clouds_s_01.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_clouds_s_02.png b/AndorsTrail/res/drawable-nodpi/ts_clouds_s_02.png
new file mode 100644
index 000000000..7df92d6bc
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_clouds_s_02.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_clouds_s_03.png b/AndorsTrail/res/drawable-nodpi/ts_clouds_s_03.png
new file mode 100644
index 000000000..5caf2bb66
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_clouds_s_03.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_foreground.png b/AndorsTrail/res/drawable-nodpi/ts_foreground.png
new file mode 100644
index 000000000..10aebffd8
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_foreground.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_midground.png b/AndorsTrail/res/drawable-nodpi/ts_midground.png
new file mode 100644
index 000000000..a51739169
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_midground.png differ
diff --git a/AndorsTrail/res/drawable-nodpi/ts_sky_gradient_x6.png b/AndorsTrail/res/drawable-nodpi/ts_sky_gradient_x6.png
new file mode 100644
index 000000000..2130982d9
Binary files /dev/null and b/AndorsTrail/res/drawable-nodpi/ts_sky_gradient_x6.png differ
diff --git a/AndorsTrail/res/drawable/char_hero.png b/AndorsTrail/res/drawable/char_hero.png
index 54e22e510..25aab6765 100644
Binary files a/AndorsTrail/res/drawable/char_hero.png and b/AndorsTrail/res/drawable/char_hero.png differ
diff --git a/AndorsTrail/res/drawable/char_hero_large.png b/AndorsTrail/res/drawable/char_hero_large.png
new file mode 100644
index 000000000..e39bb7237
Binary files /dev/null and b/AndorsTrail/res/drawable/char_hero_large.png differ
diff --git a/AndorsTrail/res/drawable/char_hero_maksiu_boy_01.png b/AndorsTrail/res/drawable/char_hero_maksiu_boy_01.png
new file mode 100755
index 000000000..d61765b06
Binary files /dev/null and b/AndorsTrail/res/drawable/char_hero_maksiu_boy_01.png differ
diff --git a/AndorsTrail/res/drawable/char_hero_maksiu_boy_01_large.png b/AndorsTrail/res/drawable/char_hero_maksiu_boy_01_large.png
new file mode 100755
index 000000000..b321a3cc7
Binary files /dev/null and b/AndorsTrail/res/drawable/char_hero_maksiu_boy_01_large.png differ
diff --git a/AndorsTrail/res/drawable/char_hero_maksiu_girl_01.png b/AndorsTrail/res/drawable/char_hero_maksiu_girl_01.png
new file mode 100755
index 000000000..97a87c88e
Binary files /dev/null and b/AndorsTrail/res/drawable/char_hero_maksiu_girl_01.png differ
diff --git a/AndorsTrail/res/drawable/char_hero_maksiu_girl_01_large.png b/AndorsTrail/res/drawable/char_hero_maksiu_girl_01_large.png
new file mode 100755
index 000000000..06c27fc43
Binary files /dev/null and b/AndorsTrail/res/drawable/char_hero_maksiu_girl_01_large.png differ
diff --git a/AndorsTrail/res/drawable/loading_anim.xml b/AndorsTrail/res/drawable/loading_anim.xml
new file mode 100644
index 000000000..d15ac7f19
--- /dev/null
+++ b/AndorsTrail/res/drawable/loading_anim.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:oneshot="false">
+        
+    <item android:drawable="@drawable/loading_anim_00"
+        android:duration="150" />
+    <item android:drawable="@drawable/loading_anim_01"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_02"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_03"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_04"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_05"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_06"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_00"
+        android:duration="150" />
+
+</animation-list>
diff --git a/AndorsTrail/res/drawable/loading_anim_00.png b/AndorsTrail/res/drawable/loading_anim_00.png
new file mode 100644
index 000000000..49e68fc08
Binary files /dev/null and b/AndorsTrail/res/drawable/loading_anim_00.png differ
diff --git a/AndorsTrail/res/drawable/loading_anim_01.png b/AndorsTrail/res/drawable/loading_anim_01.png
new file mode 100644
index 000000000..8bcb8047f
Binary files /dev/null and b/AndorsTrail/res/drawable/loading_anim_01.png differ
diff --git a/AndorsTrail/res/drawable/loading_anim_02.png b/AndorsTrail/res/drawable/loading_anim_02.png
new file mode 100644
index 000000000..70e9f7e86
Binary files /dev/null and b/AndorsTrail/res/drawable/loading_anim_02.png differ
diff --git a/AndorsTrail/res/drawable/loading_anim_03.png b/AndorsTrail/res/drawable/loading_anim_03.png
new file mode 100644
index 000000000..8a497b260
Binary files /dev/null and b/AndorsTrail/res/drawable/loading_anim_03.png differ
diff --git a/AndorsTrail/res/drawable/loading_anim_04.png b/AndorsTrail/res/drawable/loading_anim_04.png
new file mode 100644
index 000000000..59c37eca7
Binary files /dev/null and b/AndorsTrail/res/drawable/loading_anim_04.png differ
diff --git a/AndorsTrail/res/drawable/loading_anim_05.png b/AndorsTrail/res/drawable/loading_anim_05.png
new file mode 100644
index 000000000..177cb3bba
Binary files /dev/null and b/AndorsTrail/res/drawable/loading_anim_05.png differ
diff --git a/AndorsTrail/res/drawable/loading_anim_06.png b/AndorsTrail/res/drawable/loading_anim_06.png
new file mode 100644
index 000000000..81c65c157
Binary files /dev/null and b/AndorsTrail/res/drawable/loading_anim_06.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_00.png b/AndorsTrail/res/drawable/logo_anim_shine_00.png
new file mode 100644
index 000000000..ba8376104
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_00.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_01.png b/AndorsTrail/res/drawable/logo_anim_shine_01.png
new file mode 100644
index 000000000..d27fcdd38
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_01.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_02.png b/AndorsTrail/res/drawable/logo_anim_shine_02.png
new file mode 100644
index 000000000..70a4de4d6
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_02.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_03.png b/AndorsTrail/res/drawable/logo_anim_shine_03.png
new file mode 100644
index 000000000..e0db71a4b
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_03.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_04.png b/AndorsTrail/res/drawable/logo_anim_shine_04.png
new file mode 100644
index 000000000..6ac4bbf5b
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_04.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_05.png b/AndorsTrail/res/drawable/logo_anim_shine_05.png
new file mode 100644
index 000000000..e194b5fef
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_05.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_06.png b/AndorsTrail/res/drawable/logo_anim_shine_06.png
new file mode 100644
index 000000000..87da01378
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_06.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_07.png b/AndorsTrail/res/drawable/logo_anim_shine_07.png
new file mode 100644
index 000000000..68f190a40
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_07.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_08.png b/AndorsTrail/res/drawable/logo_anim_shine_08.png
new file mode 100644
index 000000000..b15095330
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_08.png differ
diff --git a/AndorsTrail/res/drawable/logo_anim_shine_09.png b/AndorsTrail/res/drawable/logo_anim_shine_09.png
new file mode 100644
index 000000000..3dc51b803
Binary files /dev/null and b/AndorsTrail/res/drawable/logo_anim_shine_09.png differ
diff --git a/AndorsTrail/res/drawable/sky_bottom.png b/AndorsTrail/res/drawable/sky_bottom.png
new file mode 100644
index 000000000..89ea724ee
Binary files /dev/null and b/AndorsTrail/res/drawable/sky_bottom.png differ
diff --git a/AndorsTrail/res/drawable/sky_gradient.png b/AndorsTrail/res/drawable/sky_gradient.png
new file mode 100644
index 000000000..84001ec12
Binary files /dev/null and b/AndorsTrail/res/drawable/sky_gradient.png differ
diff --git a/AndorsTrail/res/drawable/sky_gradient_drawable.xml b/AndorsTrail/res/drawable/sky_gradient_drawable.xml
new file mode 100644
index 000000000..70752f482
--- /dev/null
+++ b/AndorsTrail/res/drawable/sky_gradient_drawable.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:tileMode="repeat"
+    android:src="@drawable/ts_sky_gradient_x6"
+    android:antialias="false"
+    android:dither="false"
+    />
diff --git a/AndorsTrail/res/drawable/sky_top.png b/AndorsTrail/res/drawable/sky_top.png
new file mode 100644
index 000000000..0c6629ca3
Binary files /dev/null and b/AndorsTrail/res/drawable/sky_top.png differ
diff --git a/AndorsTrail/res/drawable/title_logo_animated.xml b/AndorsTrail/res/drawable/title_logo_animated.xml
new file mode 100644
index 000000000..eb800c515
--- /dev/null
+++ b/AndorsTrail/res/drawable/title_logo_animated.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:oneshot="false">
+        
+    <item android:drawable="@drawable/logo_anim_shine_00"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_01"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_02"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_03"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_04"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_05"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_06"
+        android:duration="180" />
+    <item android:drawable="@drawable/logo_anim_shine_07"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_08"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_09"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_00"
+        android:duration="5000" />
+
+</animation-list>
diff --git a/AndorsTrail/res/drawable/ts_sky_bottom.png b/AndorsTrail/res/drawable/ts_sky_bottom.png
new file mode 100644
index 000000000..1d051a893
Binary files /dev/null and b/AndorsTrail/res/drawable/ts_sky_bottom.png differ
diff --git a/AndorsTrail/res/drawable/ts_sky_gradient_x2.png b/AndorsTrail/res/drawable/ts_sky_gradient_x2.png
new file mode 100644
index 000000000..7d3d9fa60
Binary files /dev/null and b/AndorsTrail/res/drawable/ts_sky_gradient_x2.png differ
diff --git a/AndorsTrail/res/drawable/ts_sky_top.png b/AndorsTrail/res/drawable/ts_sky_top.png
new file mode 100644
index 000000000..8f5a36492
Binary files /dev/null and b/AndorsTrail/res/drawable/ts_sky_top.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_foreground.9.png b/AndorsTrail/res/drawable/ui_bar_blue_foreground.9.png
similarity index 100%
rename from AndorsTrail/res/drawable/ui_blue_foreground.9.png
rename to AndorsTrail/res/drawable/ui_bar_blue_foreground.9.png
diff --git a/AndorsTrail/res/drawable/ui_green_foreground.9.png b/AndorsTrail/res/drawable/ui_bar_green_foreground.9.png
similarity index 100%
rename from AndorsTrail/res/drawable/ui_green_foreground.9.png
rename to AndorsTrail/res/drawable/ui_bar_green_foreground.9.png
diff --git a/AndorsTrail/res/drawable/ui_purple_foreground.9.png b/AndorsTrail/res/drawable/ui_bar_purple_foreground.9.png
similarity index 100%
rename from AndorsTrail/res/drawable/ui_purple_foreground.9.png
rename to AndorsTrail/res/drawable/ui_bar_purple_foreground.9.png
diff --git a/AndorsTrail/res/drawable/ui_red_foreground.9.png b/AndorsTrail/res/drawable/ui_bar_red_foreground.9.png
similarity index 100%
rename from AndorsTrail/res/drawable/ui_red_foreground.9.png
rename to AndorsTrail/res/drawable/ui_bar_red_foreground.9.png
diff --git a/AndorsTrail/res/drawable/ui_yellow_foreground.9.png b/AndorsTrail/res/drawable/ui_bar_yellow_foreground.9.png
similarity index 100%
rename from AndorsTrail/res/drawable/ui_yellow_foreground.9.png
rename to AndorsTrail/res/drawable/ui_bar_yellow_foreground.9.png
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar.xml b/AndorsTrail/res/drawable/ui_blue_buttonbar.xml
new file mode 100644
index 000000000..56a40f597
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_buttonbar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ui_blue_buttonbar_bg"/>
+    <item android:drawable="@drawable/ui_blue_buttonbar_frame"/>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_bg.xml b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg.xml
new file mode 100644
index 000000000..b22f05651
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_unpressed"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_disabled_unpressed"
+        android:state_enabled="false"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_unpressed"
+        />
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_disabled_pressed.9.png
new file mode 100644
index 000000000..0d19ffad0
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_disabled_unpressed.9.png
new file mode 100644
index 000000000..cf51a7d58
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_enabled_pressed.9.png
new file mode 100644
index 000000000..8d40cf1c1
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_enabled_unpressed.9.png
new file mode 100644
index 000000000..7b8d39db2
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_bg_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame.xml b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame.xml
new file mode 100644
index 000000000..e3094c5e8
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
+    
+    <item app:single="true" android:drawable="@drawable/ui_blue_buttonbar_frame_solo" />
+    
+    <item app:vertical="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_vtop" />
+    <item app:vertical="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vbottom" />
+    <item app:vertical="true" app:first="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vtop" />
+
+	<item app:vertical="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_vbottom" />
+    <item app:vertical="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vtop" />
+    <item app:vertical="true" app:last="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vbottom" />
+    
+    <item app:vertical="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vmid" />
+    
+    <item app:horizontal="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_hleft" />
+    <item app:horizontal="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hright" />
+    <item app:horizontal="true" app:first="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hleft" />
+
+	<item app:horizontal="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_hright" />
+    <item app:horizontal="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hleft" />
+    <item app:horizontal="true" app:last="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hright" />
+    
+    <item app:horizontal="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hmid" />
+    
+    <item android:drawable="@drawable/ui_blue_buttonbar_frame_solo" />
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_hleft.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_hleft.9.png
new file mode 100644
index 000000000..53c7529b5
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_hleft.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_hmid.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_hmid.9.png
new file mode 100644
index 000000000..87e1b04ce
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_hmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_hright.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_hright.9.png
new file mode 100644
index 000000000..19f31c580
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_hright.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_solo.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_solo.9.png
new file mode 100644
index 000000000..9f2c04ea6
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_solo.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_vbottom.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_vbottom.9.png
new file mode 100644
index 000000000..1836d80dd
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_vbottom.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_vmid.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_vmid.9.png
new file mode 100644
index 000000000..0d7ad50cb
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_vmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_vtop.9.png b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_vtop.9.png
new file mode 100644
index 000000000..227abe004
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame_vtop.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_groupindicator.xml b/AndorsTrail/res/drawable/ui_blue_groupindicator.xml
new file mode 100644
index 000000000..5509483af
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_groupindicator.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_checked"
+        android:state_expanded="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_unchecked"
+        />
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_blue_lightframe.9.png b/AndorsTrail/res/drawable/ui_blue_lightframe.9.png
new file mode 100644
index 000000000..3cecded50
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_lightframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_lightframe_highlight.9.png b/AndorsTrail/res/drawable/ui_blue_lightframe_highlight.9.png
new file mode 100644
index 000000000..d4e650f21
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_lightframe_highlight.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_listseparator.xml b/AndorsTrail/res/drawable/ui_blue_listseparator.xml
new file mode 100644
index 000000000..3932aba94
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_listseparator.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:top="1dp" android:left="2dp" android:right="2dp" android:bottom="2dp">
+        <shape android:shape="line">
+            <stroke android:width="1dp" android:color="@color/ui_blue_palette_blue_light"/>
+            <size android:height="4dp"/>
+        </shape>
+    </item>
+	<item android:top="2dp" android:left="3dp" android:right="3dp" android:bottom="1dp">
+        <shape android:shape="line">
+            <stroke android:width="1dp" android:color="@android:color/black"/>
+            <size android:height="4dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_blue_radiobutton.xml b/AndorsTrail/res/drawable/ui_blue_radiobutton.xml
new file mode 100644
index 000000000..cfeba3ded
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_radiobutton.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_checked"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_checked"
+        android:state_selected="true"
+        android:state_enabled="true"
+        />
+    
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_unchecked"
+        android:state_checked="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_checked"
+        android:state_checked="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_disabled_unchecked"
+        android:state_checked="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_disabled_checked"
+        android:state_checked="true"
+        android:state_enabled="false"
+        />
+
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_blue_radiobutton_disabled_checked.9.png b/AndorsTrail/res/drawable/ui_blue_radiobutton_disabled_checked.9.png
new file mode 100644
index 000000000..d70f78476
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_radiobutton_disabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_radiobutton_disabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_blue_radiobutton_disabled_unchecked.9.png
new file mode 100644
index 000000000..edca2d8f8
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_radiobutton_disabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_radiobutton_enabled_checked.9.png b/AndorsTrail/res/drawable/ui_blue_radiobutton_enabled_checked.9.png
new file mode 100644
index 000000000..84d8e040d
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_radiobutton_enabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_radiobutton_enabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_blue_radiobutton_enabled_unchecked.9.png
new file mode 100644
index 000000000..307fa84cd
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_radiobutton_enabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_richframe.9.png b/AndorsTrail/res/drawable/ui_blue_richframe.9.png
new file mode 100644
index 000000000..c197da5af
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_richframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner.xml b/AndorsTrail/res/drawable/ui_blue_spinner.xml
new file mode 100644
index 000000000..d2a553ecb
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_spinner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ui_blue_spinner_bg"/>
+    <item android:drawable="@drawable/ui_blue_spinner_arrow"/>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_arrow.9.png b/AndorsTrail/res/drawable/ui_blue_spinner_arrow.9.png
new file mode 100644
index 000000000..0838e36bb
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_spinner_arrow.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_bg.xml b/AndorsTrail/res/drawable/ui_blue_spinner_bg.xml
new file mode 100644
index 000000000..9a02bda4b
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_spinner_bg.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+    <item
+        android:drawable="@drawable/ui_blue_spinner_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_spinner_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_spinner_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_spinner_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_blue_spinner_disabled_pressed.9.png
new file mode 100644
index 000000000..6b4792b64
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_spinner_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_blue_spinner_disabled_unpressed.9.png
new file mode 100644
index 000000000..ca5512c66
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_spinner_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_blue_spinner_enabled_pressed.9.png
new file mode 100644
index 000000000..af232a0cb
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_spinner_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_blue_spinner_enabled_unpressed.9.png
new file mode 100644
index 000000000..a0b62ce83
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_spinner_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_list_bg.xml b/AndorsTrail/res/drawable/ui_blue_spinner_list_bg.xml
new file mode 100644
index 000000000..615244e35
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_spinner_list_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_focused="true" android:drawable="@drawable/ui_blue_lightframe_highlight"/>
+	<item android:state_pressed="true" android:drawable="@drawable/ui_blue_lightframe_highlight"/>
+	<item android:state_checked="true" android:drawable="@drawable/ui_blue_lightframe_highlight"/>
+	<item android:state_checked="false" android:drawable="@drawable/ui_blue_lightframe"/>
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_blue_stdframe.9.png b/AndorsTrail/res/drawable/ui_blue_stdframe.9.png
new file mode 100644
index 000000000..9e5721a8c
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_stdframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_submenu_indicator.9.png b/AndorsTrail/res/drawable/ui_blue_submenu_indicator.9.png
new file mode 100644
index 000000000..7762f892b
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_submenu_indicator.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_tabframe.9.png b/AndorsTrail/res/drawable/ui_blue_tabframe.9.png
new file mode 100644
index 000000000..64db8ed81
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_tabframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_tabframe_topoverlay.9.png b/AndorsTrail/res/drawable/ui_blue_tabframe_topoverlay.9.png
new file mode 100644
index 000000000..ac946d8ff
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_tabframe_topoverlay.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_tabwidget.xml b/AndorsTrail/res/drawable/ui_blue_tabwidget.xml
new file mode 100644
index 000000000..da8411feb
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_tabwidget.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+     <item
+        android:drawable="@drawable/ui_blue_tabwidget_enabled_selected"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_tabwidget_enabled_unselected"
+        android:state_selected="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_tabwidget_enabled_selected"
+        android:state_selected="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_tabwidget_disabled_unselected"
+        android:state_selected="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_tabwidget_disabled_selected"
+        android:state_selected="true"
+        android:state_enabled="false"
+        />
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_blue_tabwidget_disabled_selected.9.png b/AndorsTrail/res/drawable/ui_blue_tabwidget_disabled_selected.9.png
new file mode 100644
index 000000000..faf3349ff
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_tabwidget_disabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_tabwidget_disabled_unselected.9.png b/AndorsTrail/res/drawable/ui_blue_tabwidget_disabled_unselected.9.png
new file mode 100644
index 000000000..2cb03dd63
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_tabwidget_disabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_tabwidget_enabled_selected.9.png b/AndorsTrail/res/drawable/ui_blue_tabwidget_enabled_selected.9.png
new file mode 100644
index 000000000..dc5e9e8b0
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_tabwidget_enabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_tabwidget_enabled_unselected.9.png b/AndorsTrail/res/drawable/ui_blue_tabwidget_enabled_unselected.9.png
new file mode 100644
index 000000000..dfa9c6e20
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_tabwidget_enabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_textbutton.xml b/AndorsTrail/res/drawable/ui_blue_textbutton.xml
new file mode 100644
index 000000000..3ebb0ad87
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_textbutton.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_pressed.9.png
new file mode 100644
index 000000000..18bbd6a7a
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_unpressed.9.png
new file mode 100644
index 000000000..f2a924851
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_pressed.9.png
new file mode 100644
index 000000000..5c8b39eaf
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_unpressed.9.png
new file mode 100644
index 000000000..91aae0885
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_togglebutton.xml b/AndorsTrail/res/drawable/ui_blue_togglebutton.xml
new file mode 100644
index 000000000..166c1e9f8
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_blue_togglebutton.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+     <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_unpressed"
+        android:state_checked="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_pressed"
+        android:state_checked="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_disabled_unpressed"
+        android:state_checked="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_disabled_pressed"
+        android:state_checked="true"
+        android:state_enabled="false"
+        />
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar.xml b/AndorsTrail/res/drawable/ui_charcoal_buttonbar.xml
new file mode 100644
index 000000000..b0d2c4665
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_buttonbar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ui_charcoal_buttonbar_bg"/>
+    <item android:drawable="@drawable/ui_charcoal_buttonbar_frame"/>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg.xml b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg.xml
new file mode 100644
index 000000000..cfa9e145b
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/ui_charcoal_buttonbar_bg_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_charcoal_buttonbar_bg_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_buttonbar_bg_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_buttonbar_bg_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_buttonbar_bg_enabled_unpressed"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_buttonbar_bg_disabled_unpressed"
+        android:state_enabled="false"
+        />
+
+    <item
+        android:drawable="@drawable/ui_charcoal_buttonbar_bg_enabled_unpressed"
+        />
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_pressed.9.png
new file mode 100644
index 000000000..4c5877ec4
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_unpressed.9.png
new file mode 100644
index 000000000..02d49b35e
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_pressed.9.png
new file mode 100644
index 000000000..70ecfd9cf
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_unpressed.9.png
new file mode 100644
index 000000000..e05db1b43
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_bg_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml
new file mode 100644
index 000000000..da65cfaf5
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
+    
+    <item app:single="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_solo" />
+    
+    <item app:vertical="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_charcoal_buttonbar_frame_vtop" />
+    <item app:vertical="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_vbottom" />
+    <item app:vertical="true" app:first="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_vtop" />
+
+	<item app:vertical="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_charcoal_buttonbar_frame_vbottom" />
+    <item app:vertical="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_vtop" />
+    <item app:vertical="true" app:last="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_vbottom" />
+    
+    <item app:vertical="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_vmid" />
+    
+    <item app:horizontal="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_charcoal_buttonbar_frame_hleft" />
+    <item app:horizontal="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_hright" />
+    <item app:horizontal="true" app:first="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_hleft" />
+
+	<item app:horizontal="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_charcoal_buttonbar_frame_hright" />
+    <item app:horizontal="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_hleft" />
+    <item app:horizontal="true" app:last="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_hright" />
+    
+    <item app:horizontal="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_hmid" />
+    
+    <item android:drawable="@drawable/ui_charcoal_buttonbar_frame_solo" />
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hleft.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hleft.9.png
new file mode 100644
index 000000000..9c7b6b26e
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hleft.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hmid.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hmid.9.png
new file mode 100644
index 000000000..a3a2b04f0
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hright.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hright.9.png
new file mode 100644
index 000000000..bb3acf7ff
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_hright.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_solo.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_solo.9.png
new file mode 100644
index 000000000..97ca80618
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_solo.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vbottom.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vbottom.9.png
new file mode 100644
index 000000000..dc5311b13
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vbottom.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vmid.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vmid.9.png
new file mode 100644
index 000000000..d4e9eb120
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vtop.9.png b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vtop.9.png
new file mode 100644
index 000000000..4a551aa18
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame_vtop.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_groupindicator.xml b/AndorsTrail/res/drawable/ui_charcoal_groupindicator.xml
new file mode 100644
index 000000000..327853166
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_groupindicator.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_radiobutton_enabled_checked"
+        android:state_expanded="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_radiobutton_enabled_unchecked"
+        />
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_lightframe.9.png b/AndorsTrail/res/drawable/ui_charcoal_lightframe.9.png
new file mode 100644
index 000000000..da36e29b0
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_lightframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_lightframe_highlight.9.png b/AndorsTrail/res/drawable/ui_charcoal_lightframe_highlight.9.png
new file mode 100644
index 000000000..711ca02c6
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_lightframe_highlight.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_listseparator.xml b/AndorsTrail/res/drawable/ui_charcoal_listseparator.xml
new file mode 100644
index 000000000..d3215d574
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_listseparator.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:top="1dp" android:left="2dp" android:right="2dp" android:bottom="2dp">
+        <shape android:shape="line">
+            <stroke android:width="1dp" android:color="@color/ui_charcoal_palette_charcoal_light"/>
+            <size android:height="4dp"/>
+        </shape>
+    </item>
+	<item android:top="2dp" android:left="3dp" android:right="3dp" android:bottom="1dp">
+        <shape android:shape="line">
+            <stroke android:width="1dp" android:color="@android:color/black"/>
+            <size android:height="4dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton.xml b/AndorsTrail/res/drawable/ui_charcoal_radiobutton.xml
new file mode 100644
index 000000000..f838e679a
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_radiobutton.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:drawable="@drawable/ui_charcoal_radiobutton_enabled_checked"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_charcoal_radiobutton_enabled_checked"
+        android:state_selected="true"
+        android:state_enabled="true"
+        />
+    
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_radiobutton_enabled_unchecked"
+        android:state_checked="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_charcoal_radiobutton_enabled_checked"
+        android:state_checked="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_radiobutton_disabled_unchecked"
+        android:state_checked="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_radiobutton_disabled_checked"
+        android:state_checked="true"
+        android:state_enabled="false"
+        />
+
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_checked.9.png b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_checked.9.png
new file mode 100644
index 000000000..f0ebb6430
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_unchecked.9.png
new file mode 100644
index 000000000..cccac0245
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_disabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_checked.9.png b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_checked.9.png
new file mode 100644
index 000000000..b16ec1a75
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_unchecked.9.png
new file mode 100644
index 000000000..e0a82fb1f
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_radiobutton_enabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_richframe.9.png b/AndorsTrail/res/drawable/ui_charcoal_richframe.9.png
new file mode 100644
index 000000000..e3a3bb773
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_richframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner.xml b/AndorsTrail/res/drawable/ui_charcoal_spinner.xml
new file mode 100644
index 000000000..508402f80
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_spinner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ui_charcoal_spinner_bg"/>
+    <item android:drawable="@drawable/ui_charcoal_spinner_arrow"/>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_arrow.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_arrow.9.png
new file mode 100644
index 000000000..363b95b43
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_arrow.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_bg.xml b/AndorsTrail/res/drawable/ui_charcoal_spinner_bg.xml
new file mode 100644
index 000000000..a2e84b072
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_spinner_bg.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_spinner_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_charcoal_spinner_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_spinner_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_spinner_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_pressed.9.png
new file mode 100644
index 000000000..ab84e0d00
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_unpressed.9.png
new file mode 100644
index 000000000..29a033055
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_pressed.9.png
new file mode 100644
index 000000000..27f8cca23
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_unpressed.9.png
new file mode 100644
index 000000000..a181e9722
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_spinner_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_spinner_list_bg.xml b/AndorsTrail/res/drawable/ui_charcoal_spinner_list_bg.xml
new file mode 100644
index 000000000..3c59cbdcd
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_spinner_list_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_focused="true" android:drawable="@drawable/ui_charcoal_lightframe_highlight"/>
+	<item android:state_pressed="true" android:drawable="@drawable/ui_charcoal_lightframe_highlight"/>
+	<item android:state_checked="true" android:drawable="@drawable/ui_charcoal_lightframe_highlight"/>
+	<item android:state_checked="false" android:drawable="@drawable/ui_charcoal_lightframe"/>
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_stdframe.9.png b/AndorsTrail/res/drawable/ui_charcoal_stdframe.9.png
new file mode 100644
index 000000000..7c24cf987
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_stdframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_submenu_indicator.9.png b/AndorsTrail/res/drawable/ui_charcoal_submenu_indicator.9.png
new file mode 100644
index 000000000..57469e341
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_submenu_indicator.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabframe.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabframe.9.png
new file mode 100644
index 000000000..41982e5d2
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabframe_topoverlay.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabframe_topoverlay.9.png
new file mode 100644
index 000000000..e0339750a
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabframe_topoverlay.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget.xml b/AndorsTrail/res/drawable/ui_charcoal_tabwidget.xml
new file mode 100644
index 000000000..b89b59617
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_tabwidget.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+     <item
+        android:drawable="@drawable/ui_charcoal_tabwidget_enabled_selected"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_tabwidget_enabled_unselected"
+        android:state_selected="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_charcoal_tabwidget_enabled_selected"
+        android:state_selected="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_tabwidget_disabled_unselected"
+        android:state_selected="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_tabwidget_disabled_selected"
+        android:state_selected="true"
+        android:state_enabled="false"
+        />
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_selected.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_selected.9.png
new file mode 100644
index 000000000..6ef232afa
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_unselected.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_unselected.9.png
new file mode 100644
index 000000000..7ba6ffc0c
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_disabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_selected.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_selected.9.png
new file mode 100644
index 000000000..abcc324ba
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_unselected.9.png b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_unselected.9.png
new file mode 100644
index 000000000..434814e42
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_tabwidget_enabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton.xml b/AndorsTrail/res/drawable/ui_charcoal_textbutton.xml
new file mode 100644
index 000000000..7391c634f
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_textbutton.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_textbutton_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_charcoal_textbutton_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_textbutton_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_textbutton_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_pressed.9.png
new file mode 100644
index 000000000..f247d2fe1
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_unpressed.9.png
new file mode 100644
index 000000000..382d4b411
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_textbutton_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_pressed.9.png
new file mode 100644
index 000000000..07274a5f0
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_unpressed.9.png
new file mode 100644
index 000000000..a7d93226d
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_charcoal_textbutton_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_charcoal_togglebutton.xml b/AndorsTrail/res/drawable/ui_charcoal_togglebutton.xml
new file mode 100644
index 000000000..708e61857
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_charcoal_togglebutton.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+     <item
+        android:drawable="@drawable/ui_charcoal_textbutton_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_textbutton_enabled_unpressed"
+        android:state_checked="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_charcoal_textbutton_enabled_pressed"
+        android:state_checked="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_textbutton_disabled_unpressed"
+        android:state_checked="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_charcoal_textbutton_disabled_pressed"
+        android:state_checked="true"
+        android:state_enabled="false"
+        />
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar.xml b/AndorsTrail/res/drawable/ui_green_buttonbar.xml
new file mode 100644
index 000000000..6e651e9b3
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_buttonbar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ui_green_buttonbar_bg"/>
+    <item android:drawable="@drawable/ui_green_buttonbar_frame"/>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_bg.xml b/AndorsTrail/res/drawable/ui_green_buttonbar_bg.xml
new file mode 100644
index 000000000..bca230ceb
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_buttonbar_bg.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/ui_green_buttonbar_bg_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_green_buttonbar_bg_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_buttonbar_bg_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_buttonbar_bg_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_buttonbar_bg_enabled_unpressed"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_buttonbar_bg_disabled_unpressed"
+        android:state_enabled="false"
+        />
+
+    <item
+        android:drawable="@drawable/ui_green_buttonbar_bg_enabled_unpressed"
+        />
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_pressed.9.png
new file mode 100644
index 000000000..feda4d421
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_unpressed.9.png
new file mode 100644
index 000000000..a9787e910
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_pressed.9.png
new file mode 100644
index 000000000..a42bce0cf
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_unpressed.9.png
new file mode 100644
index 000000000..6e4c73113
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_bg_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame.xml b/AndorsTrail/res/drawable/ui_green_buttonbar_frame.xml
new file mode 100644
index 000000000..4ccb45caa
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_buttonbar_frame.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
+    
+    <item app:single="true" android:drawable="@drawable/ui_green_buttonbar_frame_solo" />
+    
+    <item app:vertical="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_green_buttonbar_frame_vtop" />
+    <item app:vertical="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_green_buttonbar_frame_vbottom" />
+    <item app:vertical="true" app:first="true" android:drawable="@drawable/ui_green_buttonbar_frame_vtop" />
+
+	<item app:vertical="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_green_buttonbar_frame_vbottom" />
+    <item app:vertical="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_green_buttonbar_frame_vtop" />
+    <item app:vertical="true" app:last="true" android:drawable="@drawable/ui_green_buttonbar_frame_vbottom" />
+    
+    <item app:vertical="true" android:drawable="@drawable/ui_green_buttonbar_frame_vmid" />
+    
+    <item app:horizontal="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_green_buttonbar_frame_hleft" />
+    <item app:horizontal="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_green_buttonbar_frame_hright" />
+    <item app:horizontal="true" app:first="true" android:drawable="@drawable/ui_green_buttonbar_frame_hleft" />
+
+	<item app:horizontal="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_green_buttonbar_frame_hright" />
+    <item app:horizontal="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_green_buttonbar_frame_hleft" />
+    <item app:horizontal="true" app:last="true" android:drawable="@drawable/ui_green_buttonbar_frame_hright" />
+    
+    <item app:horizontal="true" android:drawable="@drawable/ui_green_buttonbar_frame_hmid" />
+    
+    <item android:drawable="@drawable/ui_green_buttonbar_frame_solo" />
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hleft.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hleft.9.png
new file mode 100644
index 000000000..c2454594d
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hleft.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hmid.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hmid.9.png
new file mode 100644
index 000000000..8f79fb040
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hright.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hright.9.png
new file mode 100644
index 000000000..d25f5064c
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_hright.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_solo.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_solo.9.png
new file mode 100644
index 000000000..fbe93818d
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_solo.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vbottom.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vbottom.9.png
new file mode 100644
index 000000000..9389a08bb
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vbottom.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vmid.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vmid.9.png
new file mode 100644
index 000000000..4d22ea63b
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vmid.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vtop.9.png b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vtop.9.png
new file mode 100644
index 000000000..8e51c8deb
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_buttonbar_frame_vtop.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_groupindicator.xml b/AndorsTrail/res/drawable/ui_green_groupindicator.xml
new file mode 100644
index 000000000..5a54e8599
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_groupindicator.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    
+    <item
+        android:drawable="@drawable/ui_green_radiobutton_enabled_checked"
+        android:state_expanded="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_radiobutton_enabled_unchecked"
+        />
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_green_lightframe.9.png b/AndorsTrail/res/drawable/ui_green_lightframe.9.png
new file mode 100644
index 000000000..9153bdcd5
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_lightframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_lightframe_highlight.9.png b/AndorsTrail/res/drawable/ui_green_lightframe_highlight.9.png
new file mode 100644
index 000000000..ab4dacac2
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_lightframe_highlight.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_listseparator.xml b/AndorsTrail/res/drawable/ui_green_listseparator.xml
new file mode 100644
index 000000000..acad3d3ca
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_listseparator.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:top="1dp" android:left="2dp" android:right="2dp" android:bottom="2dp">
+        <shape android:shape="line">
+            <stroke android:width="1dp" android:color="@color/ui_green_palette_green_light"/>
+            <size android:height="4dp"/>
+        </shape>
+    </item>
+	<item android:top="2dp" android:left="3dp" android:right="3dp" android:bottom="1dp">
+        <shape android:shape="line">
+            <stroke android:width="1dp" android:color="@android:color/black"/>
+            <size android:height="4dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_green_radiobutton.xml b/AndorsTrail/res/drawable/ui_green_radiobutton.xml
new file mode 100644
index 000000000..2b8a1f440
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_radiobutton.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:drawable="@drawable/ui_green_radiobutton_enabled_checked"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_green_radiobutton_enabled_checked"
+        android:state_selected="true"
+        android:state_enabled="true"
+        />
+    
+    
+    <item
+        android:drawable="@drawable/ui_green_radiobutton_enabled_unchecked"
+        android:state_checked="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_green_radiobutton_enabled_checked"
+        android:state_checked="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_radiobutton_disabled_unchecked"
+        android:state_checked="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_radiobutton_disabled_checked"
+        android:state_checked="true"
+        android:state_enabled="false"
+        />
+
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_checked.9.png b/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_checked.9.png
new file mode 100644
index 000000000..2ca9b1f5a
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_unchecked.9.png
new file mode 100644
index 000000000..0b721ac68
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_radiobutton_disabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_checked.9.png b/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_checked.9.png
new file mode 100644
index 000000000..7fe938e6c
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_checked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_unchecked.9.png b/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_unchecked.9.png
new file mode 100644
index 000000000..600c0ae4f
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_radiobutton_enabled_unchecked.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_richframe.9.png b/AndorsTrail/res/drawable/ui_green_richframe.9.png
new file mode 100644
index 000000000..27e92e176
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_richframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner.xml b/AndorsTrail/res/drawable/ui_green_spinner.xml
new file mode 100644
index 000000000..8fc5adffe
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_spinner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ui_green_spinner_bg"/>
+    <item android:drawable="@drawable/ui_green_spinner_arrow"/>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_arrow.9.png b/AndorsTrail/res/drawable/ui_green_spinner_arrow.9.png
new file mode 100644
index 000000000..7b715ad56
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_spinner_arrow.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_bg.xml b/AndorsTrail/res/drawable/ui_green_spinner_bg.xml
new file mode 100644
index 000000000..1c025e293
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_spinner_bg.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+    <item
+        android:drawable="@drawable/ui_green_spinner_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_green_spinner_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_spinner_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_spinner_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_spinner_disabled_pressed.9.png
new file mode 100644
index 000000000..a8f849a5a
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_spinner_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_spinner_disabled_unpressed.9.png
new file mode 100644
index 000000000..06c3fc5a4
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_spinner_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_spinner_enabled_pressed.9.png
new file mode 100644
index 000000000..b845db2fa
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_spinner_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_spinner_enabled_unpressed.9.png
new file mode 100644
index 000000000..650bab900
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_spinner_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_spinner_list_bg.xml b/AndorsTrail/res/drawable/ui_green_spinner_list_bg.xml
new file mode 100644
index 000000000..c0fdaa1d6
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_spinner_list_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_focused="true" android:drawable="@drawable/ui_green_lightframe_highlight"/>
+	<item android:state_pressed="true" android:drawable="@drawable/ui_green_lightframe_highlight"/>
+	<item android:state_checked="true" android:drawable="@drawable/ui_green_lightframe_highlight"/>
+	<item android:state_checked="false" android:drawable="@drawable/ui_green_lightframe"/>
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_green_stdframe.9.png b/AndorsTrail/res/drawable/ui_green_stdframe.9.png
new file mode 100644
index 000000000..ec4d976cb
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_stdframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_submenu_indicator.9.png b/AndorsTrail/res/drawable/ui_green_submenu_indicator.9.png
new file mode 100644
index 000000000..87647019b
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_submenu_indicator.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabframe.9.png b/AndorsTrail/res/drawable/ui_green_tabframe.9.png
new file mode 100644
index 000000000..cb7272b8f
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_tabframe.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabframe_topoverlay.9.png b/AndorsTrail/res/drawable/ui_green_tabframe_topoverlay.9.png
new file mode 100644
index 000000000..9998d9e9f
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_tabframe_topoverlay.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabwidget.xml b/AndorsTrail/res/drawable/ui_green_tabwidget.xml
new file mode 100644
index 000000000..eb7365a52
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_tabwidget.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+     <item
+        android:drawable="@drawable/ui_green_tabwidget_enabled_selected"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_tabwidget_enabled_unselected"
+        android:state_selected="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_green_tabwidget_enabled_selected"
+        android:state_selected="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_tabwidget_disabled_unselected"
+        android:state_selected="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_tabwidget_disabled_selected"
+        android:state_selected="true"
+        android:state_enabled="false"
+        />
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_selected.9.png b/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_selected.9.png
new file mode 100644
index 000000000..e87f995ca
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_unselected.9.png b/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_unselected.9.png
new file mode 100644
index 000000000..5c550ce2d
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_tabwidget_disabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_selected.9.png b/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_selected.9.png
new file mode 100644
index 000000000..ae1afb13a
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_selected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_unselected.9.png b/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_unselected.9.png
new file mode 100644
index 000000000..011ce1d9b
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_tabwidget_enabled_unselected.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_textbutton.xml b/AndorsTrail/res/drawable/ui_green_textbutton.xml
new file mode 100644
index 000000000..bc90e5096
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_textbutton.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+    <item
+        android:drawable="@drawable/ui_green_textbutton_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_green_textbutton_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_textbutton_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_textbutton_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    
+    
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_green_textbutton_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_textbutton_disabled_pressed.9.png
new file mode 100644
index 000000000..889338488
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_textbutton_disabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_textbutton_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_textbutton_disabled_unpressed.9.png
new file mode 100644
index 000000000..77dd8553b
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_textbutton_disabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_textbutton_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_green_textbutton_enabled_pressed.9.png
new file mode 100644
index 000000000..f1c5a4e8b
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_textbutton_enabled_pressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_textbutton_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_green_textbutton_enabled_unpressed.9.png
new file mode 100644
index 000000000..83f7d567a
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_green_textbutton_enabled_unpressed.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_green_togglebutton.xml b/AndorsTrail/res/drawable/ui_green_togglebutton.xml
new file mode 100644
index 000000000..31c0011f0
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_green_togglebutton.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+     <item
+        android:drawable="@drawable/ui_green_textbutton_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_textbutton_enabled_unpressed"
+        android:state_checked="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_green_textbutton_enabled_pressed"
+        android:state_checked="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_textbutton_disabled_unpressed"
+        android:state_checked="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_green_textbutton_disabled_pressed"
+        android:state_checked="true"
+        android:state_enabled="false"
+        />
+</selector>
diff --git a/AndorsTrail/res/drawable/ui_progress_ap.xml b/AndorsTrail/res/drawable/ui_progress_ap.xml
new file mode 100644
index 000000000..092c4113e
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_progress_ap.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@android:id/background">
+	    <nine-patch android:src="@drawable/ui_bar_background"/>
+	</item>
+	<item android:id="@android:id/secondaryProgress">
+	    <clip>
+	        <nine-patch android:src="@drawable/ui_bar_background"/>
+	    </clip>
+	</item>
+	<item android:id="@android:id/progress">
+	    <clip>
+	        <nine-patch android:src="@drawable/ui_bar_blue_foreground" />
+	    </clip>
+	</item>
+</layer-list>
diff --git a/AndorsTrail/res/drawable/ui_progress_exp.xml b/AndorsTrail/res/drawable/ui_progress_exp.xml
index 878b2dc01..477ea3f35 100644
--- a/AndorsTrail/res/drawable/ui_progress_exp.xml
+++ b/AndorsTrail/res/drawable/ui_progress_exp.xml
@@ -11,7 +11,7 @@
 	</item>
 	<item android:id="@android:id/progress">
 	    <clip>
-	        <nine-patch android:src="@drawable/ui_yellow_foreground" />
+	        <nine-patch android:src="@drawable/ui_bar_yellow_foreground" />
 	    </clip>
 	</item>
 <!-- <item android:id="@android:id/secondaryProgress">
diff --git a/AndorsTrail/res/drawable/ui_progress_health.xml b/AndorsTrail/res/drawable/ui_progress_health.xml
index 806ecc205..0ede41b56 100644
--- a/AndorsTrail/res/drawable/ui_progress_health.xml
+++ b/AndorsTrail/res/drawable/ui_progress_health.xml
@@ -11,7 +11,7 @@
 	</item>
 	<item android:id="@android:id/progress">
 	    <clip>
-	        <nine-patch android:src="@drawable/ui_red_foreground" />
+	        <nine-patch android:src="@drawable/ui_bar_red_foreground" />
 	    </clip>
 	</item>
 
diff --git a/AndorsTrail/res/layout-land/heroinfo_inventory.xml b/AndorsTrail/res/layout-land/heroinfo_inventory.xml
index 19a00479b..d987a3e99 100644
--- a/AndorsTrail/res/layout-land/heroinfo_inventory.xml
+++ b/AndorsTrail/res/layout-land/heroinfo_inventory.xml
@@ -1,88 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="horizontal"
-	>
-
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:gravity="left"
-		>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/heroinfo_wornequipment"
-			/>
-
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:orientation="horizontal"
-			android:gravity="center_vertical"
-			>
-
-			<include layout="@layout/heroinfo_equipped" />
-
-			<include layout="@layout/heroinfo_statsicons" />
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:gravity="left"
-		>
-		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			>
-			<Spinner
-				android:id="@+id/inventorylist_category_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="left"
-				android:orientation="horizontal"
-				android:prompt="@string/heroinfo_inventory_categories"
-				android:layout_marginLeft="10dp"
-				android:layout_marginTop="10dp"
-				android:layout_marginBottom="5dp" />
-
-			<Spinner
-				android:id="@+id/inventorylist_sort_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:layout_toRightOf="@+id/inventorylist_category_filters"
-				android:prompt="@string/heroinfo_inventory_sort"
-				android:layout_margin="@dimen/dialog_margin"
-				android:layout_marginTop="10dp"
-				android:layout_marginRight="5dp"
-				android:layout_marginBottom="5dp"
-				android:layout_marginLeft="5dp" />
-		</LinearLayout>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/heroinfo_inventory"
-			/>
-
-		<ListView
-			android:id="@+id/inventorylist_root"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			/>
-
-	</LinearLayout>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/AndorsTrail_Style_TabFrame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal" >
+
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="left"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/heroinfo_wornequipment" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="horizontal" >
+
+            <include layout="@layout/heroinfo_equipped" />
+
+            <include layout="@layout/heroinfo_statsicons" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="left"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            style="@style/AndorsTrail_Style_StdFrame"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="left"
+            android:orientation="vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/heroinfo_inventory" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/inventorylist_category_filters_button"
+                    style="@style/AndorsTrail_Style_SpinnerEmulator"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="5dp"
+                    android:layout_weight="1"
+                    android:gravity="left"
+                    android:text="" />
+
+                <Button
+                    android:id="@+id/inventorylist_sort_filters_button"
+                    style="@style/AndorsTrail_Style_SpinnerEmulator"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="left"
+                    android:text="" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <ListView
+            android:id="@+id/inventorylist_root"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout-land/startscreen.xml b/AndorsTrail/res/layout-land/startscreen.xml
new file mode 100644
index 000000000..821e40cac
--- /dev/null
+++ b/AndorsTrail/res/layout-land/startscreen.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <include
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        layout="@layout/title_bg_layout" />
+
+    <TextView
+        android:id="@+id/startscreen_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:text="@android:string/unknownName" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="false"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal" >
+
+        <!-- android:background="@layout/title_bg_layout" -->
+
+        <LinearLayout
+            android:id="@+id/startcreen_centerarea"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.4"
+            android:gravity="center"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/startscreen_dev_version"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:background="#FFFFFFFF"
+                android:gravity="center_horizontal"
+                android:textColor="#880000"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/startscreen_fragment_container"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.6"
+            android:gravity="bottom|center_horizontal" />
+
+            <!-- <include layout="@layout/startscreen_mainmenu" />
+        </FrameLayout> -->
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout-land/title_bg_layout.xml b/AndorsTrail/res/layout-land/title_bg_layout.xml
new file mode 100644
index 000000000..2bee874b3
--- /dev/null
+++ b/AndorsTrail/res/layout-land/title_bg_layout.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title_bg"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <include layout="@layout/title_bg_sky_layout"/>
+
+	<com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView 
+        android:id="@+id/ts_clouds_animator_back"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+        />
+    
+    <ImageView 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="-30sp"
+        android:scaleType="fitEnd"
+        android:src="@drawable/ts_background"/>
+    
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView 
+        android:id="@+id/ts_clouds_animator_mid"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+        />
+    
+     <ImageView 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="-30sp"
+        android:scaleType="fitEnd"
+        android:src="@drawable/ts_midground"/>
+     
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView 
+        android:id="@+id/ts_clouds_animator_front"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+        />
+    
+     <ImageView 
+        android:id="@+id/ts_foreground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="-30sp"
+        android:scaleType="fitEnd"
+        android:src="@drawable/ts_foreground"/>
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/title_logo_placeholder_above"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0" >
+        </TextView>
+        
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.4"
+            android:orientation="vertical" >
+
+            <TextView
+            	android:id="@+id/title_logo_placeholder_left"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="0" >
+            </TextView>
+
+            <ImageView
+                android:id="@+id/title_logo"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginLeft="10sp"
+                android:layout_marginRight="10sp"
+                android:layout_marginTop="20sp"
+                android:layout_weight="1"
+                android:scaleType="fitCenter"
+                android:src="@drawable/title_logo_animated" />
+
+            <TextView
+            	android:id="@+id/title_logo_placeholder_right"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="0.7" >
+            </TextView>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/title_logo_placeholder_below"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.6" >
+        </TextView>
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/actorconditioninfo.xml b/AndorsTrail/res/layout/actorconditioninfo.xml
index 936e39762..55ec9a0af 100644
--- a/AndorsTrail/res/layout/actorconditioninfo.xml
+++ b/AndorsTrail/res/layout/actorconditioninfo.xml
@@ -1,105 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
 
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	>
+    <TextView
+        android:id="@+id/actorconditioninfo_title"
+        style="@style/titleWithIcon"
+		android:background="?attr/ui_theme_richframe_bitmap"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@drawable/equip_weapon"
+        android:text="@string/actorinfo_currentconditions" />
 
-	<ScrollView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		>
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:padding="@dimen/dialog_margin"
-			>
-			<TextView
-				android:id="@+id/actorconditioninfo_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/actorinfo_currentconditions"
-				style="@style/titleWithIcon"
-				android:drawableLeft="@drawable/equip_weapon"
-				/>
+    <ScrollView
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
 
-			<TextView
-				android:text="@string/actorconditioninfo_category"
-				android:id="@+id/actorconditioninfo_category"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="@dimen/section_margin"
-				/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/dialog_margin" >
 
-			<TextView
-				android:text="@string/actorconditioninfo_constant_effect"
-				android:id="@+id/actorconditioninfo_constant_effect_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				/>
+            <TextView
+                android:id="@+id/actorconditioninfo_category"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/section_margin"
+                android:text="@string/actorconditioninfo_category" />
 
-				<com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
-					android:id="@+id/actorconditioninfo_constant_effect_abilitymodifierinfo"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="10sp"
-					/>
+            <TextView
+                android:id="@+id/actorconditioninfo_constant_effect_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/actorconditioninfo_constant_effect" />
 
-			<TextView
-				android:text="@string/actorconditioninfo_effect_every_round"
-				android:id="@+id/actorconditioninfo_everyround_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				/>
+            <com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
+                android:id="@+id/actorconditioninfo_constant_effect_abilitymodifierinfo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10sp" />
 
-				<LinearLayout
-					android:id="@+id/actorconditioninfo_everyround_list"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="10sp"
-					android:orientation="vertical"
-					>
-				</LinearLayout>
+            <TextView
+                android:id="@+id/actorconditioninfo_everyround_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/actorconditioninfo_effect_every_round" />
 
-			<TextView
-				android:text="@string/actorconditioninfo_effect_every_full_round"
-				android:id="@+id/actorconditioninfo_everyfullround_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				/>
+            <LinearLayout
+                android:id="@+id/actorconditioninfo_everyround_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10sp"
+                android:orientation="vertical" >
+            </LinearLayout>
 
-				<LinearLayout
-					android:id="@+id/actorconditioninfo_everyfullround_list"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="10sp"
-					android:orientation="vertical"
-					>
-				</LinearLayout>
+            <TextView
+                android:id="@+id/actorconditioninfo_everyfullround_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/actorconditioninfo_effect_every_full_round" />
 
-		</LinearLayout>
-	</ScrollView>
+            <LinearLayout
+                android:id="@+id/actorconditioninfo_everyfullround_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10sp"
+                android:orientation="vertical" >
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
 
-	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+    <!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		style="@android:style/ButtonBar"
-		>
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent" />
 
-		<Button
-			android:id="@+id/actorconditioninfo_close"
-			android:layout_width="match_parent"
-			android:layout_weight="1"
-			android:layout_height="wrap_content"
-			android:text="@string/dialog_close"
-			/>
-	</LinearLayout>
-</LinearLayout>
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/actorconditioninfo_close"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_close" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/actorconditionitemview.xml b/AndorsTrail/res/layout/actorconditionitemview.xml
new file mode 100644
index 000000000..2ed92e6b3
--- /dev/null
+++ b/AndorsTrail/res/layout/actorconditionitemview.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	style="@style/textWithIcon"
+	android:drawableLeft="@drawable/equip_weapon"
+	android:text="@android:string/unknownName"
+	/>
diff --git a/AndorsTrail/res/layout/bulkselection.xml b/AndorsTrail/res/layout/bulkselection.xml
index b0adaffcf..5a05c6269 100644
--- a/AndorsTrail/res/layout/bulkselection.xml
+++ b/AndorsTrail/res/layout/bulkselection.xml
@@ -1,154 +1,138 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:gravity="center_horizontal"
-	>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical" >
 
-	<ScrollView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		>
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:padding="@dimen/dialog_margin"
-			>
+    <TextView
+        android:id="@+id/bulkselection_itemname"
+        style="@style/titleWithIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:background="?attr/ui_theme_richframe_bitmap"
+        android:drawableLeft="@drawable/equip_weapon"
+        android:text="@string/inventory_info" />
 
-			<TextView
-				android:id="@+id/bulkselection_itemname"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center_horizontal"
-				android:text="@string/inventory_info"
-				style="@style/titleWithIcon"
-				android:drawableLeft="@drawable/equip_weapon"
-			/>
+    <ScrollView
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" >
 
-			<LinearLayout
-				android:layout_height="wrap_content"
-				android:layout_width="match_parent"
-				android:orientation="horizontal"
-				android:gravity="center_horizontal"
-				>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/dialog_margin" >
 
-				<TextView
-					android:text="@string/inventory_drop"
-					android:id="@+id/bulkselection_action_type"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal" >
 
-				<EditText
-					android:text="1"
-					android:inputType="number"
-					android:singleLine="true"
-					android:id="@+id/bulkselection_amount_taken"
-					android:layout_height="wrap_content"
-					android:layout_width="wrap_content"
-					/>
+                <TextView
+                    android:id="@+id/bulkselection_action_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/inventory_drop" />
 
-				<TextView
-					android:text="/"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:paddingLeft="10dp"
-					android:paddingRight="10dp"
-					/>
+                <EditText
+                    android:id="@+id/bulkselection_amount_taken"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:inputType="number"
+                    android:singleLine="true"
+                    android:text="1" />
 
-				<TextView
-					android:text="250"
-					android:id="@+id/bulkselection_amount_available"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:text="/" />
 
-			</LinearLayout>
+                <TextView
+                    android:id="@+id/bulkselection_amount_available"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="250" />
+            </LinearLayout>
 
-			<LinearLayout
-				android:layout_height="wrap_content"
-				android:layout_width="match_parent"
-				android:orientation="horizontal"
-				>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
 
-				<Button
-					android:text="-1"
-					android:id="@+id/bulkselection_decrement_button"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:paddingLeft="20dp"
-					android:paddingRight="20dp"
-					/>
+                <Button
+                    android:id="@+id/bulkselection_decrement_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:text="-1" />
 
-		 		<SeekBar
-					android:id="@+id/bulkselection_slider"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_gravity="center_vertical"
-					android:layout_weight="1"
-					/>
+                <SeekBar
+                    android:id="@+id/bulkselection_slider"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1" />
 
-				<Button
-					android:text="+1"
-					android:id="@+id/bulkselection_increment_button"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:paddingLeft="20dp"
-					android:paddingRight="20dp"
-					/>
+                <Button
+                    android:id="@+id/bulkselection_increment_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:text="+1" />
 
-				<Button
-					android:text="@string/bulkselection_select_all"
-					android:id="@+id/bulkselection_select_all_button"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:paddingLeft="20dp"
-					android:paddingRight="20dp"
-					/>
+                <Button
+                    android:id="@+id/bulkselection_select_all_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:text="@string/bulkselection_select_all" />
+            </LinearLayout>
 
-			</LinearLayout>
+            <TextView
+                android:id="@+id/bulkselection_summary_totalgold"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingBottom="10dp"
+                android:text="@string/bulkselection_totalcost_buy" />
+        </LinearLayout>
+    </ScrollView>
 
-			<TextView
-				android:text="@string/bulkselection_totalcost_buy"
-				android:id="@+id/bulkselection_summary_totalgold"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:paddingBottom="10dp"
-				/>
+    <!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
 
-		</LinearLayout>
-	</ScrollView>
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent" />
 
-	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		style="@android:style/ButtonBar"
-		>
+        <Button
+            android:id="@+id/bulkselection_cancel_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@android:string/cancel" />
 
-		<Button
-			android:id="@+id/bulkselection_finalize_button"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/inventory_drop"
-			/>
+        <Button
+            android:id="@+id/bulkselection_finalize_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/inventory_drop" />
+    </LinearLayout>
 
-		<Button
-			android:id="@+id/bulkselection_cancel_button"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@android:string/cancel"
-			/>
-
-	</LinearLayout>
-
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/clouds_animator.xml b/AndorsTrail/res/layout/clouds_animator.xml
new file mode 100644
index 000000000..af4c98b32
--- /dev/null
+++ b/AndorsTrail/res/layout/clouds_animator.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+    <RelativeLayout 
+        android:id="@+id/ts_clouds_layer"
+        android:layout_width="match_parent"
+    	android:layout_height="match_parent"/>  	
+
+</merge>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/combatview.xml b/AndorsTrail/res/layout/combatview.xml
index bf8f10df7..19b0ea04d 100644
--- a/AndorsTrail/res/layout/combatview.xml
+++ b/AndorsTrail/res/layout/combatview.xml
@@ -12,6 +12,7 @@
 
         <LinearLayout
             android:id="@+id/combatview_actionbar"
+            style="@style/AndorsTrail_Style_StdFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
@@ -21,28 +22,27 @@
                 android:id="@+id/combatview_moveattack"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:ellipsize="marquee"
                 android:minHeight="0dp"
+                android:scrollHorizontally="true"
+                android:singleLine="true"
                 android:text="@string/combat_attack"
                 android:textSize="@dimen/actionbar_text" />
 
-            <TextView
+            <com.gpl.rpg.AndorsTrail.view.RangeBar
                 android:id="@+id/combatview_status"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:paddingBottom="4sp"
-                android:shadowColor="#000"
-                android:shadowDx="1"
-                android:shadowDy="1"
-                android:shadowRadius="1"
-                android:text="@string/status_ap"
-                android:textSize="@dimen/actionbar_text" />
+                android:layout_weight="1" />
 
             <Button
                 android:id="@+id/combatview_endturn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:ellipsize="marquee"
                 android:minHeight="0dp"
+                android:scrollHorizontally="true"
+                android:singleLine="true"
                 android:text="@string/combat_endturn"
                 android:textSize="@dimen/actionbar_text" />
 
@@ -50,16 +50,21 @@
                 android:id="@+id/combatview_flee"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:ellipsize="marquee"
                 android:minHeight="0dp"
+                android:scrollHorizontally="true"
+                android:singleLine="true"
                 android:text="@string/combat_flee"
                 android:textSize="@dimen/actionbar_text" />
         </LinearLayout>
 
         <TextView
             android:id="@+id/combatview_monsterismoving"
+            style="@style/AndorsTrail_Style_StdFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/combatview_actionbar"
+            android:layout_alignTop="@id/combatview_actionbar"
             android:gravity="center"
             android:paddingBottom="4sp"
             android:shadowColor="#000"
@@ -71,12 +76,13 @@
 
         <RelativeLayout
             android:id="@+id/combatview_monsterbar"
+            style="@style/AndorsTrail_Style_StdFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/combatview_actionbar"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            >
+            android:orientation="horizontal" >
+
             <!-- android:animateLayoutChanges="true" -->
 
             <ImageButton
@@ -116,7 +122,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/combatview_fixedarea"
-        android:layout_margin="5dp"
         android:gravity="right" >
 
         <RelativeLayout
@@ -124,7 +129,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="right" />
-
     </RelativeLayout>
 
 </merge>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/conversation.xml b/AndorsTrail/res/layout/conversation.xml
index bc6b4601c..37ebe9e90 100644
--- a/AndorsTrail/res/layout/conversation.xml
+++ b/AndorsTrail/res/layout/conversation.xml
@@ -23,7 +23,7 @@
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		android:gravity="center_vertical"
-		style="@android:style/ButtonBar"
+		style="@style/AndorsTrail_Style_StdFrame"
 		>
 
 		<Button
diff --git a/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml b/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml
new file mode 100644
index 000000000..f785b3fc7
--- /dev/null
+++ b/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.gpl.rpg.AndorsTrail.view.SelectableTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="@style/checkedListItem"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="5dp"
+    android:drawableRight="?attr/ui_theme_radiobutton_drawable" />
diff --git a/AndorsTrail/res/layout/custom_dialog_title_icon.xml b/AndorsTrail/res/layout/custom_dialog_title_icon.xml
new file mode 100644
index 000000000..886758ef8
--- /dev/null
+++ b/AndorsTrail/res/layout/custom_dialog_title_icon.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog_hitrect"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:minWidth="200dp"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/dialog_title"
+        style="@style/titleWithIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/ui_theme_richframe_bitmap"
+        android:drawableLeft="@drawable/char_hero"
+        android:gravity="center_vertical" />
+
+    <LinearLayout
+        android:id="@+id/dialog_description_container"
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingBottom="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp" >
+
+        <TextView
+            android:id="@+id/dialog_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:id="@+id/dialog_content_container"
+            style="@style/AndorsTrail_Style_StdFrame"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.8"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingBottom="5dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="5dp" />
+
+        <LinearLayout
+            android:id="@+id/dialog_button_container"
+            style="@style/AndorsTrail_Style_StdFrame"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal"
+            android:paddingBottom="5dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="5dp" >
+
+            <Button
+                android:id="@+id/dialog_template_button"
+                style="@style/AndorsTrail_Style_TextButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/custom_menu_item_layout.xml b/AndorsTrail/res/layout/custom_menu_item_layout.xml
new file mode 100644
index 000000000..9c0188572
--- /dev/null
+++ b/AndorsTrail/res/layout/custom_menu_item_layout.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/contextMenuText"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" />
+
diff --git a/AndorsTrail/res/layout/custom_menu_item_separator_layout.xml b/AndorsTrail/res/layout/custom_menu_item_separator_layout.xml
new file mode 100644
index 000000000..2b532b258
--- /dev/null
+++ b/AndorsTrail/res/layout/custom_menu_item_separator_layout.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/ui_theme_listseparator_drawable" />
+
diff --git a/AndorsTrail/res/layout/custom_menu_layout.xml b/AndorsTrail/res/layout/custom_menu_layout.xml
new file mode 100644
index 000000000..3dd667fe1
--- /dev/null
+++ b/AndorsTrail/res/layout/custom_menu_layout.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+	android:orientation="horizontal"
+     >
+
+    <LinearLayout
+    	android:id="@+id/custom_menu_items_wrapper"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/custom_menu_submenu_layout.xml b/AndorsTrail/res/layout/custom_menu_submenu_layout.xml
new file mode 100644
index 000000000..ba0920758
--- /dev/null
+++ b/AndorsTrail/res/layout/custom_menu_submenu_layout.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/contextMenuText"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:drawableRight="?attr/ui_theme_submenu_indicator_bitmap" />
+
diff --git a/AndorsTrail/res/layout/displayworldmap.xml b/AndorsTrail/res/layout/displayworldmap.xml
index 5e0ba16fe..2f95c69dc 100644
--- a/AndorsTrail/res/layout/displayworldmap.xml
+++ b/AndorsTrail/res/layout/displayworldmap.xml
@@ -1,44 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	>
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		android:background="@drawable/ui_gradientshape"
-		android:padding="@dimen/boxshape_margin"
-		>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:orientation="horizontal"
+        android:padding="@dimen/boxshape_margin" >
 
-		<TextView
-			android:layout_width="0dip"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/menu_button_worldmap"
-			style="@style/textWithIcon"
-			android:textSize="@dimen/titletext"
-			android:drawableLeft="@android:drawable/ic_dialog_map"
+        <TextView
+            style="@style/textWithIcon"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:drawableLeft="@drawable/ui_icon_map"
+            android:text="@string/menu_button_worldmap"
+            android:textSize="@dimen/titletext" />
+        
+        <Button
+            android:id="@+id/displayworldmap_recenter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_recenter" />
 
-			/>
+        <Button
+            android:id="@+id/displayworldmap_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_close" />
+    </LinearLayout>
 
-		<Button
-			android:id="@+id/displayworldmap_close"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			style="?android:attr/buttonStyleSmall"
-			android:text="@string/dialog_close"
-			/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:orientation="vertical"
+        >
 
-	</LinearLayout>
+        <WebView
+            android:id="@+id/displayworldmap_webview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/ui_theme_displayworldmap_bg_color"
+            />
+    </LinearLayout>
 
-	<WebView
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:id="@+id/displayworldmap_webview"
-		/>
-
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/heroinfo_equipped.xml b/AndorsTrail/res/layout/heroinfo_equipped.xml
index b2f916be2..10fc685a3 100644
--- a/AndorsTrail/res/layout/heroinfo_equipped.xml
+++ b/AndorsTrail/res/layout/heroinfo_equipped.xml
@@ -6,13 +6,13 @@
 	>
 
 	<RelativeLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="80dp"
 		android:layout_height="100dp"
 		android:layout_centerInParent="true"
 		android:id="@+id/heroinfo_worn_center"
 		>
 		<ImageView
+		    android:id="@+id/heroinfo_inventory_heroicon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_centerInParent="true"
diff --git a/AndorsTrail/res/layout/heroinfo_inventory.xml b/AndorsTrail/res/layout/heroinfo_inventory.xml
index e9019ffba..dfc587541 100644
--- a/AndorsTrail/res/layout/heroinfo_inventory.xml
+++ b/AndorsTrail/res/layout/heroinfo_inventory.xml
@@ -1,88 +1,76 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	>
-
-	<LinearLayout
-		android:layout_height="wrap_content"
-		android:layout_width="wrap_content"
-		android:orientation="vertical"
-		android:gravity="left"
-		>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/heroinfo_wornequipment"
-			/>
-
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:orientation="horizontal"
-			android:gravity="center_vertical"
-			>
-
-			<include layout="@layout/heroinfo_equipped" />
-
-			<include layout="@layout/heroinfo_statsicons" />
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:gravity="left"
-		>
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			>
-			<Spinner
-				android:id="@+id/inventorylist_category_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="left"
-				android:orientation="horizontal"
-				android:prompt="@string/heroinfo_inventory_categories"
-				android:layout_marginLeft="10dp"
-				android:layout_marginTop="10dp"
-				android:layout_marginBottom="5dp" />
-
-			<Spinner
-				android:id="@+id/inventorylist_sort_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:layout_toRightOf="@+id/inventorylist_category_filters"
-				android:prompt="@string/heroinfo_inventory_sort"
-				android:layout_margin="@dimen/dialog_margin"
-				android:layout_marginTop="10dp"
-				android:layout_marginRight="5dp"
-				android:layout_marginBottom="5dp"
-				android:layout_marginLeft="5dp" />
-		</LinearLayout>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/heroinfo_inventory"
-			/>
-
-		<ListView
-			android:id="@+id/inventorylist_root"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			/>
-
-	</LinearLayout>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/AndorsTrail_Style_TabFrame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/heroinfo_wornequipment" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal" >
+
+            <include layout="@layout/heroinfo_equipped" />
+
+            <include layout="@layout/heroinfo_statsicons" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:gravity="left"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/heroinfo_inventory" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/inventorylist_category_filters_button"
+                style="@style/AndorsTrail_Style_SpinnerEmulator"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp"
+                android:gravity="left"
+                android:text="" />
+
+            <Button
+                android:id="@+id/inventorylist_sort_filters_button"
+                style="@style/AndorsTrail_Style_SpinnerEmulator"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:gravity="left"
+                android:text="" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/inventorylist_root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/heroinfo_skill_list.xml b/AndorsTrail/res/layout/heroinfo_skill_list.xml
index b851d7d18..4a790184a 100644
--- a/AndorsTrail/res/layout/heroinfo_skill_list.xml
+++ b/AndorsTrail/res/layout/heroinfo_skill_list.xml
@@ -1,65 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
-
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="5dp"
-		android:layout_marginTop="10dp"
-		android:gravity="right"
-		android:orientation="horizontal">
-
-		<TextView
-			android:id="@+id/heroinfo_listskills_number_of_increases"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentLeft="true"
-			android:layout_gravity="left"
-			android:layout_marginBottom="@dimen/section_margin"
-			android:layout_marginLeft="10dp"
-			android:layout_marginRight="10dp"
-			android:layout_marginTop="@dimen/section_margin"
-			android:layout_weight="1"
-			android:text="@string/skill_number_of_increases_several" />
-
-		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			android:id="@+id/skillList_filters_spinners"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:gravity="right"
-			android:orientation="horizontal">
-
-			<Spinner
-				android:id="@+id/skillList_category_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="right"
-				android:layout_marginLeft="5dp"
-				android:layout_marginRight="5dp"
-				android:orientation="horizontal"
-				android:prompt="@string/heroinfo_skill_categories" />
-
-			<Spinner
-				android:id="@+id/skillList_sort_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="right"
-				android:layout_marginLeft="5dp"
-				android:layout_toRightOf="@+id/heroinfo_skill_categories"
-				android:layout_marginRight="10dp"
-				android:orientation="horizontal"
-				android:prompt="@string/heroinfo_skill_sort" />
-
-		</LinearLayout>
-	</LinearLayout>
-
-	<ListView
-		android:id="@+id/heroinfo_listskills_list"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	style="@style/AndorsTrail_Style_TabFrame">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/ui_theme_stdframe_bitmap"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/heroinfo_listskills_number_of_increases"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="left"
+			android:layout_marginLeft="10dp"
+			android:layout_marginRight="10dp"
+			android:text="@string/skill_number_of_increases_several" />
+
+		<LinearLayout 
+			android:id="@+id/skillList_filters_spinners"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="right"
+			android:orientation="horizontal">
+
+		    <Button
+                android:id="@+id/skillList_category_filters_button"
+                style="@style/AndorsTrail_Style_SpinnerEmulator"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dp"
+                android:gravity="left"
+                android:text="" />
+
+            <Button
+                android:id="@+id/skillList_sort_filters_button"
+                style="@style/AndorsTrail_Style_SpinnerEmulator"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:gravity="left"
+                android:text="" />
+		    
+		</LinearLayout>
+	</LinearLayout>
+
+	<ListView
+		android:id="@+id/heroinfo_listskills_list"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/heroinfo_stats.xml b/AndorsTrail/res/layout/heroinfo_stats.xml
index 33e3e344b..2b9198165 100644
--- a/AndorsTrail/res/layout/heroinfo_stats.xml
+++ b/AndorsTrail/res/layout/heroinfo_stats.xml
@@ -1,175 +1,243 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:layout_gravity="center_horizontal"
-	android:orientation="vertical"
-	android:padding="@dimen/dialog_margin" >
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal"
+    android:orientation="vertical"
+	style="@style/AndorsTrail_Style_TabFrame" >
 
-	<ScrollView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1" >
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" >
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:id="@+id/heroinfo_container"
-			>
+        <LinearLayout
+            android:id="@+id/heroinfo_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
 
-			<TextView
-				android:id="@+id/heroinfo_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				style="@style/titleWithIcon"
-				android:drawableLeft="@drawable/char_hero"
-				android:text="@android:string/unknownName"
-				/>
+            <TextView
+                android:id="@+id/heroinfo_title"
+                style="@style/titleWithIcon"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/ui_theme_stdframe_bitmap"
+                android:drawableLeft="@drawable/char_hero_large"
+                android:text="@android:string/unknownName" />
 
-			<TableLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="@dimen/section_margin" >
+            <TableLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/ui_theme_stdframe_bitmap" >
 
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_level" />
-					<TextView android:id="@+id/heroinfo_level" android:text="@android:string/unknownName" />
-				</TableRow>
+                <TableRow>
 
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_totalexperience" />
-					<TextView android:id="@+id/heroinfo_totalexperience" android:text="@android:string/unknownName" />
-				</TableRow>
-			</TableLayout>
+                    <TextView
+                        style="@style/traitsinfo_label"
+                        android:text="@string/heroinfo_level" />
 
-			<com.gpl.rpg.AndorsTrail.view.RangeBar
-				android:id="@+id/heroinfo_healthbar"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content" />
+                    <TextView
+                        android:id="@+id/heroinfo_level"
+                        android:text="@android:string/unknownName" />
+                </TableRow>
 
-			<com.gpl.rpg.AndorsTrail.view.RangeBar
-				android:id="@+id/heroinfo_expbar"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="5sp" />
+                <TableRow>
 
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/actorinfo_currenttraits"
-				style="@style/actorinfo_sectionheader"
-				/>
-			<View
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="@drawable/ui_headerbackground"
-				/>
+                    <TextView
+                        style="@style/traitsinfo_label"
+                        android:text="@string/heroinfo_totalexperience" />
 
-			<TableLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:id="@+id/actorinfo_stats_table"
-				>
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_actionpoints" />
-					<TextView android:id="@+id/heroinfo_ap" />
-				</TableRow>
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_reequip_cost" />
-					<TextView android:id="@+id/heroinfo_reequip_cost" />
-				</TableRow>
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_useitem_cost" />
-					<TextView android:id="@+id/heroinfo_useitem_cost" />
-				</TableRow>
-				<include layout="@layout/traitsinfoview" />
-			</TableLayout>
+                    <TextView
+                        android:id="@+id/heroinfo_totalexperience"
+                        android:text="@android:string/unknownName" />
+                </TableRow>
+            </TableLayout>
 
-			<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
-				android:id="@+id/actorinfo_onhiteffects"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/ui_theme_stdframe_bitmap"
+                android:orientation="vertical" >
 
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/actorinfo_currentconditions"
-				android:id="@+id/actorinfo_currentconditions_title"
-				style="@style/actorinfo_sectionheader"
-				/>
-			<com.gpl.rpg.AndorsTrail.view.ActorConditionList
-				android:id="@+id/actorinfo_currentconditions"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				/>
+                <com.gpl.rpg.AndorsTrail.view.RangeBar
+                    android:id="@+id/heroinfo_healthbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/actorinfo_basetraits"
-				style="@style/actorinfo_sectionheader"
-				/>
-			<View
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="@drawable/ui_headerbackground"
-				/>
+                <com.gpl.rpg.AndorsTrail.view.RangeBar
+                    android:id="@+id/heroinfo_expbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5sp" />
+                
+                <com.gpl.rpg.AndorsTrail.view.RangeBar
+                    android:id="@+id/heroinfo_apbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5sp" />
+            </LinearLayout>
 
-			<TableLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:id="@+id/heroinfo_basestats_table"
-				>
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/traitsinfo_base_max_hp" />
-					<TextView android:id="@+id/basetraitsinfo_max_hp" />
-				</TableRow>
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/traitsinfo_base_max_ap" />
-					<TextView android:id="@+id/basetraitsinfo_max_ap" />
-				</TableRow>
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_reequip_cost" />
-					<TextView android:id="@+id/heroinfo_base_reequip_cost" />
-				</TableRow>
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_useitem_cost" />
-					<TextView android:id="@+id/heroinfo_base_useitem_cost" />
-				</TableRow>
-				<include layout="@layout/traitsinfoview" />
-			</TableLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/ui_theme_stdframe_bitmap"
+                android:orientation="vertical" >
 
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/heroinfo_gamestats"
-				style="@style/actorinfo_sectionheader"
-				/>
-			<View
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:id="@+id/actorinfo_currentconditions_title2"
-				android:background="@drawable/ui_headerbackground"
-				/>
-			<include layout="@layout/heroinfo_stats_gamestats" />
+                <TextView
+                    style="@style/actorinfo_sectionheader"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/actorinfo_currenttraits" />
 
-		</LinearLayout>
-	</ScrollView>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="-1dp"
+                    android:layout_marginBottom="-1dp"
+                    android:background="?attr/ui_theme_listseparator_drawable" />
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:gravity="center_vertical"
-		android:orientation="horizontal" >
+                <TableLayout
+                    android:id="@+id/actorinfo_stats_table"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" >
 
-		<Button
-			android:id="@+id/heroinfo_levelup"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/heroinfo_levelup" />
-	</LinearLayout>
+<!--                     <TableRow>
+
+                        <TextView
+                            style="@style/traitsinfo_label"
+                            android:text="@string/heroinfo_actionpoints" />
+
+                        <TextView android:id="@+id/heroinfo_ap" />
+                    </TableRow> -->
+
+                    <TableRow>
+
+                        <TextView
+                            style="@style/traitsinfo_label"
+                            android:text="@string/heroinfo_reequip_cost" />
+
+                        <TextView android:id="@+id/heroinfo_reequip_cost" />
+                    </TableRow>
+
+                    <TableRow>
+
+                        <TextView
+                            style="@style/traitsinfo_label"
+                            android:text="@string/heroinfo_useitem_cost" />
+
+                        <TextView android:id="@+id/heroinfo_useitem_cost" />
+                    </TableRow>
+
+                    <include layout="@layout/traitsinfoview" />
+                </TableLayout>
+
+                <com.gpl.rpg.AndorsTrail.view.ItemEffectsView
+                    android:id="@+id/actorinfo_onhiteffects"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/actorinfo_currentconditions_title"
+                    style="@style/actorinfo_sectionheader"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/actorinfo_currentconditions" />
+
+                <com.gpl.rpg.AndorsTrail.view.ActorConditionList
+                    android:id="@+id/actorinfo_currentconditions"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    style="@style/actorinfo_sectionheader"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/actorinfo_basetraits" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="-1dp"
+                    android:layout_marginBottom="-1dp"
+                    android:background="?attr/ui_theme_listseparator_drawable" />
+
+                <TableLayout
+                    android:id="@+id/heroinfo_basestats_table"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" >
+
+                    <TableRow>
+
+                        <TextView
+                            style="@style/traitsinfo_label"
+                            android:text="@string/traitsinfo_base_max_hp" />
+
+                        <TextView android:id="@+id/basetraitsinfo_max_hp" />
+                    </TableRow>
+
+                    <TableRow>
+
+                        <TextView
+                            style="@style/traitsinfo_label"
+                            android:text="@string/traitsinfo_base_max_ap" />
+
+                        <TextView android:id="@+id/basetraitsinfo_max_ap" />
+                    </TableRow>
+
+                    <TableRow>
+
+                        <TextView
+                            style="@style/traitsinfo_label"
+                            android:text="@string/heroinfo_reequip_cost" />
+
+                        <TextView android:id="@+id/heroinfo_base_reequip_cost" />
+                    </TableRow>
+
+                    <TableRow>
+
+                        <TextView
+                            style="@style/traitsinfo_label"
+                            android:text="@string/heroinfo_useitem_cost" />
+
+                        <TextView android:id="@+id/heroinfo_base_useitem_cost" />
+                    </TableRow>
+
+                    <include layout="@layout/traitsinfoview" />
+                </TableLayout>
+
+                <TextView
+                    style="@style/actorinfo_sectionheader"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/heroinfo_gamestats" />
+
+                <View
+                    android:id="@+id/actorinfo_currentconditions_title2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="-1dp"
+                    android:layout_marginBottom="-1dp"
+                    android:background="?attr/ui_theme_listseparator_drawable" />
+
+                <include layout="@layout/heroinfo_stats_gamestats" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/heroinfo_levelup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/heroinfo_levelup" />
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/inventoryitemview.xml b/AndorsTrail/res/layout/inventoryitemview.xml
index 2ed92e6b3..d54fd686b 100644
--- a/AndorsTrail/res/layout/inventoryitemview.xml
+++ b/AndorsTrail/res/layout/inventoryitemview.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	style="@style/textWithIcon"
+	style="@style/textWithIconInList"
 	android:drawableLeft="@drawable/equip_weapon"
 	android:text="@android:string/unknownName"
 	/>
diff --git a/AndorsTrail/res/layout/iteminfo.xml b/AndorsTrail/res/layout/iteminfo.xml
index cbd52bb21..965c92cd8 100644
--- a/AndorsTrail/res/layout/iteminfo.xml
+++ b/AndorsTrail/res/layout/iteminfo.xml
@@ -1,95 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
 
-	<ScrollView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		>
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:padding="@dimen/dialog_margin"
-			>
-			<TextView
-				android:id="@+id/iteminfo_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/inventory_info"
-				style="@style/titleWithIcon"
-				android:drawableLeft="@drawable/equip_weapon"
-				/>
+    <TextView
+        android:id="@+id/iteminfo_title"
+        style="@style/titleWithIcon"
+        android:background="?attr/ui_theme_richframe_bitmap"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@drawable/equip_weapon"
+        android:text="@string/inventory_info" />
 
-			<TextView
-				android:id="@+id/iteminfo_description"
-				android:textStyle="italic"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="@dimen/section_margin"
-				/>
+    <ScrollView
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" >
 
-			<TextView
-				android:id="@+id/iteminfo_displaytype"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/dialog_margin" >
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:gravity="center_vertical"
-				android:layout_marginBottom="@dimen/section_margin"
-				>
-				<TextView
-					android:text="@string/iteminfo_category"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					/>
-				<TextView
-					android:id="@+id/iteminfo_category"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					/>
-			</LinearLayout>
+            <TextView
+                android:id="@+id/iteminfo_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/section_margin"
+                android:textStyle="italic" />
 
-			<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
-				android:id="@+id/iteminfo_effects"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				/>
-		</LinearLayout>
-	</ScrollView>
+            <TextView
+                android:id="@+id/iteminfo_displaytype"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/section_margin"
+                android:gravity="center_vertical"
+                android:orientation="horizontal" >
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		style="@android:style/ButtonBar"
-		>
-		<Button
-			android:id="@+id/iteminfo_action"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/iteminfo_action_use"
-			/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/iteminfo_category" />
 
-		<Button
-			android:id="@+id/iteminfo_close"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/dialog_close"
-			/>
-	</LinearLayout>
-</LinearLayout>
+                <TextView
+                    android:id="@+id/iteminfo_category"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <com.gpl.rpg.AndorsTrail.view.ItemEffectsView
+                android:id="@+id/iteminfo_effects"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+    </ScrollView>
+
+    <!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
+
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent" />
+
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/iteminfo_action"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/iteminfo_action_use" />
+
+        <Button
+            android:id="@+id/iteminfo_close"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/dialog_close" />
+        
+        <Button
+            android:id="@+id/iteminfo_more"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/dialog_more" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/levelup.xml b/AndorsTrail/res/layout/levelup.xml
index b0db784d1..e05facef0 100644
--- a/AndorsTrail/res/layout/levelup.xml
+++ b/AndorsTrail/res/layout/levelup.xml
@@ -1,70 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:padding="@dimen/dialog_margin"
-	>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="@dimen/dialog_margin" >
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		>
+    <TextView
+        android:id="@+id/levelup_title"
+        style="@style/titleWithIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/ui_theme_richframe_bitmap"
+        android:drawableLeft="@drawable/char_hero"
+        android:text="@string/levelup_title" />
 
-		<TextView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/levelup_title"
-			android:text="@string/levelup_title"
-			style="@style/titleWithIcon"
-			android:drawableLeft="@drawable/char_hero"
-			/>
+    <TextView
+        android:id="@+id/levelup_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:text="@string/levelup_description" />
 
-		<TextView
-			android:id="@+id/levelup_description"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/levelup_description"
-			/>
+    <ScrollView
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
 
-		<Button
-			android:id="@+id/levelup_add_health"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/levelup_add_health"
-			/>
-		<Button
-			android:id="@+id/levelup_add_attackchance"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/levelup_add_attackchance"
-			/>
-		<Button
-			android:id="@+id/levelup_add_attackdamage"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/levelup_add_attackdamage"
-			/>
-		<Button
-			android:id="@+id/levelup_add_blockchance"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/levelup_add_blockchance"
-			/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp" >
 
-		<TextView
-			android:id="@+id/levelup_adds_new_skillpoint"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/levelup_adds_new_skillpoint"
-			style="@style/textWithIcon"
-			android:drawableLeft="@drawable/ui_icon_skill"
-			/>
+            <Button
+                android:id="@+id/levelup_add_health"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/levelup_add_health" />
 
-		<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-		<ListView android:layout_width="match_parent" android:layout_height="1dp" />
+            <Button
+                android:id="@+id/levelup_add_attackchance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/levelup_add_attackchance" />
 
-	</LinearLayout>
+            <Button
+                android:id="@+id/levelup_add_attackdamage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/levelup_add_attackdamage" />
 
-</ScrollView>
+            <Button
+                android:id="@+id/levelup_add_blockchance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/levelup_add_blockchance" />
+
+            <TextView
+                android:id="@+id/levelup_adds_new_skillpoint"
+                style="@style/textWithIcon"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/ui_icon_skill"
+                android:text="@string/levelup_adds_new_skillpoint" />
+
+            <!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
+
+            <ListView
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@null" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/loadsave.xml b/AndorsTrail/res/layout/loadsave.xml
index b8ef59983..204b245b6 100644
--- a/AndorsTrail/res/layout/loadsave.xml
+++ b/AndorsTrail/res/layout/loadsave.xml
@@ -13,6 +13,8 @@
 		android:layout_height="wrap_content"
 		android:text="@string/loadsave_title_save"
 		style="@style/titleWithIcon"
+		android:gravity="center"
+		android:background="?attr/ui_theme_richframe_bitmap"
 		/>
 
 	<TextView
@@ -20,11 +22,15 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/loadsave_selectslot"
+		android:textColor="?attr/ui_theme_textbutton_textcolor_color"
+		android:background="?attr/ui_theme_stdframe_bitmap"
 		/>
 
 	<ScrollView
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		style="@style/AndorsTrail_Style_StdFrame"
 		>
 		<LinearLayout
 			android:id="@+id/loadsave_slot_list"
@@ -37,7 +43,20 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@android:string/unknownName"
+				android:layout_marginTop="2dp"
+				android:layout_marginBottom="2dp"
 				/>
+		</LinearLayout>
+
+	</ScrollView>
+
+	<LinearLayout
+			android:id="@+id/loadsave_save_to_new_slot_container"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			style="@style/AndorsTrail_Style_StdFrame"
+			>
 			<Button
 				android:id="@+id/loadsave_save_to_new_slot"
 				android:layout_width="match_parent"
@@ -45,7 +64,6 @@
 				android:text="@string/loadsave_save_to_new_slot"
 				/>
 		</LinearLayout>
-
-	</ScrollView>
-
+	
+	
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/main.xml b/AndorsTrail/res/layout/main.xml
index 6bdb9929c..0ed328325 100644
--- a/AndorsTrail/res/layout/main.xml
+++ b/AndorsTrail/res/layout/main.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:background="@android:color/black"
 	android:id="@+id/main_container"
 	>
 
@@ -67,7 +68,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_above="@id/main_statusview"
-		android:layout_margin="5dp"
 		android:id="@+id/statusview_activeconditions"
 		android:gravity="right"
 		/>
diff --git a/AndorsTrail/res/layout/monsterencounter.xml b/AndorsTrail/res/layout/monsterencounter.xml
index ec9fc214d..1b2f1aef6 100644
--- a/AndorsTrail/res/layout/monsterencounter.xml
+++ b/AndorsTrail/res/layout/monsterencounter.xml
@@ -1,66 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical"
-	>
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:padding="@dimen/dialog_margin"
-		>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
 
-		<TextView
-			android:id="@+id/monsterencounter_title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/dialog_monsterencounter_title"
-			style="@style/titleWithIcon"
-			android:drawableLeft="@drawable/equip_weapon"
-			/>
+    <TextView
+        android:id="@+id/monsterencounter_title"
+        style="@style/titleWithIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/ui_theme_richframe_bitmap"
+        android:drawableLeft="@drawable/equip_weapon"
+        android:gravity="start"
+        android:text="@string/dialog_monsterencounter_title" />
 
-		<TextView
-			android:id="@+id/monsterencounter_description"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/dialog_monsterencounter_message"
-			/>
-	</LinearLayout>
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="@dimen/dialog_margin" >
 
-	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/monsterencounter_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_monsterencounter_message" />
+    </LinearLayout>
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		android:gravity="center_vertical"
-		style="@android:style/ButtonBar"
-		>
-		<Button
-			android:id="@+id/monsterencounter_attack"
-			android:layout_width="match_parent"
-			android:layout_weight="1"
-			android:layout_height="wrap_content"
-			android:text="@android:string/yes"
-			/>
+    <!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
 
-		<Button
-			android:id="@+id/monsterencounter_info"
-			android:layout_width="match_parent"
-			android:layout_weight="1"
-			android:layout_height="wrap_content"
-			android:text="@string/dialog_monsterencounter_info"
-			/>
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent" />
 
-		<Button
-			android:id="@+id/monsterencounter_cancel"
-			android:layout_width="match_parent"
-			android:layout_weight="1"
-			android:layout_height="wrap_content"
-			android:text="@android:string/no"
-			/>
-	</LinearLayout>
-</LinearLayout>
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/monsterencounter_attack"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@android:string/yes" />
+
+        <Button
+            android:id="@+id/monsterencounter_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/dialog_monsterencounter_info" />
+
+        <Button
+            android:id="@+id/monsterencounter_cancel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@android:string/no" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/monsterinfo.xml b/AndorsTrail/res/layout/monsterinfo.xml
index 22d19fd14..58fc47dcb 100644
--- a/AndorsTrail/res/layout/monsterinfo.xml
+++ b/AndorsTrail/res/layout/monsterinfo.xml
@@ -1,109 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
 
-	<ScrollView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		>
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:padding="@dimen/dialog_margin"
-			android:id="@+id/monsterinfo_container"
-			>
+    <TextView
+        android:id="@+id/monsterinfo_title"
+        style="@style/titleWithIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/ui_theme_richframe_bitmap"
+        android:drawableLeft="@drawable/char_hero"
+        android:gravity="left"
+        android:text="@string/dialog_monsterencounter_info" />
 
-			<TextView
-				android:id="@+id/monsterinfo_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/dialog_monsterencounter_info"
-				style="@style/titleWithIcon"
-				android:drawableLeft="@drawable/char_hero"
-				/>
+    <ScrollView
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" >
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:layout_marginBottom="@dimen/section_margin"
-				>
-				<TextView
-					android:text="@string/actorinfo_difficulty"
-					android:layout_marginRight="10sp"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					/>
-				<TextView
-					android:id="@+id/monsterinfo_difficulty"
-					android:text="@string/monster_difficulty_normal"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					/>
-			</LinearLayout>
+        <LinearLayout
+            android:id="@+id/monsterinfo_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/dialog_margin" >
 
-			<com.gpl.rpg.AndorsTrail.view.RangeBar
-				android:id="@+id/monsterinfo_healthbar"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="@dimen/section_margin"
-				/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/section_margin"
+                android:orientation="horizontal" >
 
-			<TableLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:id="@+id/actorinfo_stats_table"
-				>
-				<TableRow>
-					<TextView style="@style/traitsinfo_label" android:text="@string/traitsinfo_base_max_ap" />
-					<TextView android:id="@+id/monsterinfo_max_ap" />
-				</TableRow>
-				<include layout="@layout/traitsinfoview" />
-			</TableLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10sp"
+                    android:text="@string/actorinfo_difficulty" />
 
-			<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
-				android:id="@+id/actorinfo_onhiteffects"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				/>
+                <TextView
+                    android:id="@+id/monsterinfo_difficulty"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/monster_difficulty_normal" />
+            </LinearLayout>
 
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/actorinfo_currentconditions"
-				android:id="@+id/actorinfo_currentconditions_title"
-				android:layout_marginTop="@dimen/section_margin"
-				/>
-			<com.gpl.rpg.AndorsTrail.view.ActorConditionList
-				android:id="@+id/actorinfo_currentconditions"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				/>
+            <com.gpl.rpg.AndorsTrail.view.RangeBar
+                android:id="@+id/monsterinfo_healthbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/section_margin" />
 
-		</LinearLayout>
-	</ScrollView>
+            <TableLayout
+                android:id="@+id/actorinfo_stats_table"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
 
-	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+                <TableRow>
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		style="@android:style/ButtonBar"
-		>
-		<Button
-			android:id="@+id/monsterinfo_close"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/dialog_close"
-			/>
-	</LinearLayout>
-</LinearLayout>
+                    <TextView
+                        style="@style/traitsinfo_label"
+                        android:text="@string/traitsinfo_base_max_ap" />
+
+                    <TextView android:id="@+id/monsterinfo_max_ap" />
+                </TableRow>
+
+                <include layout="@layout/traitsinfoview" />
+            </TableLayout>
+
+            <com.gpl.rpg.AndorsTrail.view.ItemEffectsView
+                android:id="@+id/actorinfo_onhiteffects"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:id="@+id/actorinfo_currentconditions_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/section_margin"
+                android:text="@string/actorinfo_currentconditions" />
+
+            <com.gpl.rpg.AndorsTrail.view.ActorConditionList
+                android:id="@+id/actorinfo_currentconditions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+    </ScrollView>
+
+    <!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
+
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent" />
+
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/monsterinfo_close"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_close" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/questlog.xml b/AndorsTrail/res/layout/questlog.xml
index da31d00ae..9ad8fce9c 100644
--- a/AndorsTrail/res/layout/questlog.xml
+++ b/AndorsTrail/res/layout/questlog.xml
@@ -1,24 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:padding="@dimen/dialog_margin"
-	android:orientation="vertical"
-	>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/AndorsTrail_Style_TabFrame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
 
-	<Spinner
-		android:id="@+id/questlog_includecompleted"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:prompt="@string/questlog_includecompleted_prompt"
-		/>
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="right"
+        android:orientation="horizontal" >
 
-	<ExpandableListView
-		android:id="@+id/questlog_contents"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		/>
+        <Button
+            android:id="@+id/questlog_includecompleted_button"
+            style="@style/AndorsTrail_Style_SpinnerEmulator"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:gravity="left"
+            android:text="" />
+        <!--
+             <Spinner
+            android:id="@+id/questlog_includecompleted"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:prompt="@string/questlog_includecompleted_prompt" />
+        -->
+    </LinearLayout>
 
-</LinearLayout>
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <ExpandableListView
+            android:id="@+id/questlog_contents"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/questlogentry.xml b/AndorsTrail/res/layout/questlogentry.xml
index 7ae9e8588..0aa03994f 100644
--- a/AndorsTrail/res/layout/questlogentry.xml
+++ b/AndorsTrail/res/layout/questlogentry.xml
@@ -4,4 +4,5 @@
 	android:id="@+id/questlog_entrytext"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	style="@style/textView"
 	/>
diff --git a/AndorsTrail/res/layout/quickbuttons_usable_inventory.xml b/AndorsTrail/res/layout/quickbuttons_usable_inventory.xml
index af06d9345..069a15dcd 100644
--- a/AndorsTrail/res/layout/quickbuttons_usable_inventory.xml
+++ b/AndorsTrail/res/layout/quickbuttons_usable_inventory.xml
@@ -1,33 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical"
-	android:gravity="left"
-	>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="left"
+    android:orientation="vertical" >
 
-    <TextView
-		android:id="@+id/quickslot_assign_title"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:text="@string/inventory_assign"
-		android:drawableLeft="@drawable/ui_icon_equipment"
-		android:paddingTop="3sp"
-		style="@style/titleWithIcon"
-		/>
-    
-    <TextView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:text="@string/inventory_selectitem"
-		/>
-    
-    
-	<ListView
-		android:id="@+id/quickbuttons_assignlist"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		/>
+    <ListView
+        android:id="@+id/quickbuttons_assignlist"
+        style="@style/AndorsTrail_Style_ListView_Frameless"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/rangebar.xml b/AndorsTrail/res/layout/rangebar.xml
index 45706aed4..9ba58a4c1 100644
--- a/AndorsTrail/res/layout/rangebar.xml
+++ b/AndorsTrail/res/layout/rangebar.xml
@@ -1,42 +1,61 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	>
-	<TextView
-		android:id="@+id/rangebar_label"
-		android:layout_width="30sp"
-		android:layout_height="wrap_content"
-		android:textSize="@dimen/statusbar_text"
-		android:layout_marginRight="3sp"
-		android:shadowDx="1"
-		android:shadowDy="1"
-		android:shadowRadius="1"
-		android:shadowColor="#000"
-		/>
-
-	<ProgressBar android:id="@+id/rangebar_progress"
-		style="?android:attr/progressBarStyleHorizontal"
-		android:progressDrawable="@drawable/ui_progress_health"
-		android:layout_width="match_parent"
-		android:layout_height="@dimen/healthbar_height"
-		android:layout_toRightOf="@id/rangebar_label"
-		android:layout_centerVertical="true"
-		android:layout_marginRight="3sp"
-		/>
-
-	<TextView android:id="@+id/rangebar_text"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingLeft="35sp"
-		android:textSize="@dimen/statusbar_text"
-		android:layout_centerInParent="true"
-		android:textColor="#FFF"
-		android:shadowDx="1"
-		android:shadowDy="1"
-		android:shadowRadius="1"
-		android:shadowColor="#222"
-		android:paddingBottom="2sp"
-		/>
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	>
+	
+    <LinearLayout 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+	<TextView
+		android:id="@+id/rangebar_label"
+		android:layout_width="@dimen/rangebar_labelwidth_small"
+		android:layout_height="wrap_content"
+		android:textSize="@dimen/statusbar_text"
+		android:layout_marginRight="3sp"
+		android:layout_marginLeft="3sp"
+		android:shadowDx="1"
+		android:shadowDy="1"
+		android:shadowRadius="1"
+		android:textColor="?attr/ui_theme_palette_text_gray_mid_color"
+		android:shadowColor="#000"
+		android:ellipsize="marquee"
+		android:singleLine="true"
+		android:scrollHorizontally="true"
+		
+		/>
+
+	<RelativeLayout 
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content">
+	
+	<ProgressBar android:id="@+id/rangebar_progress"
+		style="?android:attr/progressBarStyleHorizontal"
+		android:progressDrawable="@drawable/ui_progress_health"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/healthbar_height"
+		android:layout_centerInParent="true"
+		android:layout_centerVertical="true"
+		android:layout_marginRight="3sp"
+		/>
+
+	<TextView android:id="@+id/rangebar_text"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textSize="@dimen/statusbar_text"
+		android:layout_centerInParent="true"
+		android:layout_marginRight="3sp"
+		android:textColor="?attr/ui_theme_palette_text_gray_light_color"
+		android:shadowDx="1"
+		android:shadowDy="1"
+		android:shadowRadius="1"
+		android:shadowColor="#222"
+		android:paddingBottom="2sp"
+		/>
+	
+	</RelativeLayout>
+	
+	</LinearLayout>
+</merge>
diff --git a/AndorsTrail/res/layout/save_preview.xml b/AndorsTrail/res/layout/save_preview.xml
new file mode 100644
index 000000000..ab7d30846
--- /dev/null
+++ b/AndorsTrail/res/layout/save_preview.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:background="?attr/ui_theme_stdframe_bitmap"
+    android:clickable="true"
+    android:gravity="top|start" >
+
+    <RelativeLayout
+        android:id="@+id/save_preview_hero_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:gravity="top|start" >
+
+        <ImageView
+            android:id="@+id/save_preview_hero_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/save_preview_hero_desc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@id/save_preview_hero_icon"
+            android:gravity="top|start"
+            android:text="@android:string/unknownName" />
+    </RelativeLayout>
+
+    <Button
+        android:id="@+id/startscreen_continue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/save_preview_hero_info"
+        android:layout_marginTop="10dp"
+        android:text="@string/startscreen_continue" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/shoplist.xml b/AndorsTrail/res/layout/shoplist.xml
index 5f6e93784..861b59689 100644
--- a/AndorsTrail/res/layout/shoplist.xml
+++ b/AndorsTrail/res/layout/shoplist.xml
@@ -1,43 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:gravity="left"
-	android:orientation="vertical">
+    style="@style/AndorsTrail_Style_TabFrame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="left"
+    android:orientation="vertical" >
 
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="5dp"
-		android:layout_marginTop="10dp"
-		android:gravity="right"
-		android:orientation="horizontal"
-		android:layout_alignParentRight="true">
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
 
-		<TextView
-			android:id="@+id/shop_gc"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ui_icon_coins"
-			android:drawablePadding="@dimen/boxshape_margin"
-			android:gravity="center_vertical"
-			/>
-		<Spinner
-			android:id="@+id/shoplist_sort_filters"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginLeft="5dp"
-			android:layout_marginRight="10dp"
-			android:orientation="horizontal"
-			android:layout_alignParentRight="true"
-			android:prompt="@string/shop_item_sort" />
-	</LinearLayout>
+        <TextView
+            android:id="@+id/shop_gc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:drawableLeft="@drawable/ui_icon_coins"
+            android:gravity="center_vertical" />
 
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.2" />
 
-	<ListView
-		android:id="@+id/shop_list"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		/>
+        <Button
+            android:id="@+id/shoplist_sort_filters"
+            style="@style/AndorsTrail_Style_SpinnerEmulator"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:layout_marginLeft="5dp"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:orientation="horizontal" />
+    </LinearLayout>
 
-</LinearLayout>
+    <ListView
+        android:id="@+id/shop_list"
+        style="@style/AndorsTrail_Style_ListView_Frameless"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/skill_info_view.xml b/AndorsTrail/res/layout/skill_info_view.xml
index 582f6f8e5..cbb90b948 100644
--- a/AndorsTrail/res/layout/skill_info_view.xml
+++ b/AndorsTrail/res/layout/skill_info_view.xml
@@ -1,83 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
 
-	<ScrollView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		>
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:padding="@dimen/dialog_margin"
-			>
-			<TextView
-				android:id="@+id/skillinfo_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/heroinfo_skill"
-				style="@style/titleWithIcon"
-				android:drawableLeft="@drawable/ui_icon_skill"
-				/>
+    <TextView
+        android:id="@+id/skillinfo_title"
+        style="@style/titleWithIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/ui_theme_richframe_bitmap"
+        android:drawableLeft="@drawable/ui_icon_skill"
+        android:gravity="start"
+        android:text="@string/heroinfo_skill" />
 
-			<TextView
-				android:text="@string/skill_current_level"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="right"
-				android:id="@+id/skillinfo_currentlevel"
-				android:layout_marginBottom="@dimen/section_margin"
-				/>
+    <ScrollView
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" >
 
-			<TextView
-				android:text="@string/skill_longdescription_weapon_chance"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:id="@+id/skillinfo_longdescription"
-				android:layout_marginBottom="@dimen/section_margin"
-				/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/dialog_margin" >
 
-			<TextView
-				android:text="@string/skill_prerequisite_other_skill"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:id="@+id/skillinfo_requirement"
-				android:layout_marginBottom="@dimen/section_margin"
-				/>
+            <TextView
+                android:id="@+id/skillinfo_currentlevel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginBottom="@dimen/section_margin"
+                android:text="@string/skill_current_level" />
 
-		</LinearLayout>
+            <TextView
+                android:id="@+id/skillinfo_longdescription"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/section_margin"
+                android:text="@string/skill_longdescription_weapon_chance" />
 
-	</ScrollView>
+            <TextView
+                android:id="@+id/skillinfo_requirement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/section_margin"
+                android:text="@string/skill_prerequisite_other_skill" />
+        </LinearLayout>
+    </ScrollView>
 
-	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+    <!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		style="@android:style/ButtonBar"
-		>
-		<Button
-			android:id="@+id/skillinfoinfo_action"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/skillinfo_action_levelup"
-			/>
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent" />
 
-		<Button
-			android:id="@+id/skillinfoinfo_close"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/dialog_close"
-			/>
-	</LinearLayout>
-</LinearLayout>
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/skillinfoinfo_action"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/skillinfo_action_levelup" />
+
+        <Button
+            android:id="@+id/skillinfoinfo_close"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/dialog_close" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/skill_listentry_view.xml b/AndorsTrail/res/layout/skill_listentry_view.xml
index a37974346..ce6f8fe08 100644
--- a/AndorsTrail/res/layout/skill_listentry_view.xml
+++ b/AndorsTrail/res/layout/skill_listentry_view.xml
@@ -3,6 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	style="@style/textWithIconInList"
 	>
 	<ImageView
 		android:id="@+id/skillentry_icon"
@@ -21,6 +22,7 @@
 		android:layout_toRightOf="@id/skillentry_icon"
 		android:layout_alignParentTop="true"
 		android:text="@string/skill_title_weapon_chance"
+		style="@style/textView"
 		android:textSize="22sp"
 		/>
 
@@ -31,6 +33,7 @@
 		android:layout_toRightOf="@id/skillentry_icon"
 		android:layout_below="@id/skillentry_title"
 		android:text="@string/skill_shortdescription_weapon_chance"
+		style="@style/textView"
 		/>
 
 </RelativeLayout>
diff --git a/AndorsTrail/res/layout/startscreen.xml b/AndorsTrail/res/layout/startscreen.xml
index 5ecaf76e8..e705820ef 100644
--- a/AndorsTrail/res/layout/startscreen.xml
+++ b/AndorsTrail/res/layout/startscreen.xml
@@ -1,114 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	android:gravity="center_horizontal"
-	android:background="@drawable/ui_startbackground"
-	>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
-	<RelativeLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		>
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_centerInParent="true"
-			android:orientation="vertical"
-			android:gravity="center_horizontal"
-			>
-			<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/andors_trail_logo"
-				/>
-			<TextView
-				android:id="@+id/startscreen_currenthero"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@android:string/unknownName"
-				/>
-			<EditText
-				android:id="@+id/startscreen_enterheroname"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:visibility="gone"
-				android:inputType="textPersonName"
-				/>
+    <include layout="@layout/title_bg_layout" />
 
-			<TextView
-				android:id="@+id/startscreen_dev_version"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="15dp"
-				android:textColor="#880000"
-				android:gravity="center_horizontal"
-				android:visibility="gone"
-				/>
+    <TextView
+        android:id="@+id/startscreen_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:text="@android:string/unknownName" />
 
-		</LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical" >
 
-		<TextView
-			android:id="@+id/startscreen_version"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentTop="true"
-			android:layout_alignParentRight="true"
-			android:text="@android:string/unknownName"
-			/>
-	</RelativeLayout>
+        <!-- android:background="@layout/title_bg_layout" -->
 
-	<Button
-		android:id="@+id/startscreen_continue"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:text="@string/startscreen_continue"
-		/>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		android:gravity="center_vertical"
-		>
-		<Button
-			android:id="@+id/startscreen_newgame"
-			android:layout_width="0dip"
-			android:layout_weight="1"
-			android:layout_height="wrap_content"
-			android:text="@string/startscreen_newgame"
-			/>
-		<Button
-			android:id="@+id/startscreen_load"
-			android:layout_width="0dip"
-			android:layout_weight="1"
-			android:layout_height="wrap_content"
-			android:text="@string/startscreen_load"
-			/>
-	</LinearLayout>
+            <TextView
+                android:id="@+id/startscreen_dev_version"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginTop="15dp"
+                android:background="#FFFFFFFF"
+                android:gravity="center_horizontal"
+                android:textColor="#880000"
+                android:visibility="gone" />
+        </RelativeLayout>
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		android:gravity="center_vertical"
-		>
-		<Button
-			android:id="@+id/startscreen_preferences"
-			android:layout_width="0dip"
-			android:layout_weight="1"
-			android:layout_height="wrap_content"
-			android:text="@string/menu_settings"
-			/>
-		<Button
-			android:id="@+id/startscreen_about"
-			android:layout_width="0dip"
-			android:layout_weight="1"
-			android:layout_height="wrap_content"
-			android:text="@string/startscreen_about"
-			/>
-	</LinearLayout>
-</LinearLayout>
+        <FrameLayout
+            android:id="@+id/startscreen_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+            <!-- <include layout="@layout/startscreen_mainmenu" />
+        </FrameLayout> -->
+        
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/startscreen_mainmenu.xml b/AndorsTrail/res/layout/startscreen_mainmenu.xml
new file mode 100644
index 000000000..d1835d2f1
--- /dev/null
+++ b/AndorsTrail/res/layout/startscreen_mainmenu.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="bottom"
+    android:orientation="vertical" >
+
+    <!--
+         <TextView
+        android:id="@+id/startscreen_currenthero"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#BB1212FF"
+        android:gravity="center_horizontal"
+        android:text="@android:string/unknownName" />
+    -->
+
+    <include
+        android:id="@+id/save_preview_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        layout="@layout/save_preview"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:clickable="true"
+        android:gravity="bottom"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:layout_marginTop="5dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/startscreen_newgame"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:text="@string/startscreen_newgame" />
+
+            <Button
+                android:id="@+id/startscreen_load"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:text="@string/startscreen_load" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/startscreen_preferences"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:text="@string/menu_settings" />
+
+            <Button
+                android:id="@+id/startscreen_about"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:text="@string/startscreen_about" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/startscreen_newgame.xml b/AndorsTrail/res/layout/startscreen_newgame.xml
new file mode 100644
index 000000000..ceef63423
--- /dev/null
+++ b/AndorsTrail/res/layout/startscreen_newgame.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="bottom"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:gravity="bottom|start"
+        android:clickable="true"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:text="@string/startscreen_selectherosprite" />
+
+        <RadioGroup
+            android:id="@+id/newgame_spritegroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <ToggleButton
+                android:id="@+id/newgame_sprite0"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:checked="true"
+                android:drawableTop="@drawable/char_hero_large"
+                android:text=""
+                android:textSize="0dp" />
+
+            <ToggleButton
+                android:id="@+id/newgame_sprite1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/char_hero_maksiu_girl_01_large"
+                android:text=""
+                android:textSize="0dp" />
+
+            <ToggleButton
+                android:id="@+id/newgame_sprite2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:drawableTop="@drawable/char_hero_maksiu_boy_01_large"
+                android:text=""
+                android:textSize="0dp" />
+        </RadioGroup>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:clickable="true"
+        android:gravity="bottom|start"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/startscreen_currenthero"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:text="@string/startscreen_enterheroname" />
+
+        <EditText
+            android:id="@+id/startscreen_enterheroname"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPersonName" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:clickable="true"
+        android:gravity="center_vertical"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/startscreen_newgame_cancel"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_marginTop="5dp"
+            android:layout_weight="1"
+            android:text="@android:string/cancel" />
+
+        <Button
+            android:id="@+id/startscreen_newgame_start"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_marginTop="5dp"
+            android:layout_weight="1"
+            android:text="@string/startscreen_newgame_start" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/statusview.xml b/AndorsTrail/res/layout/statusview.xml
index 7897d08ba..2fe68f9e6 100644
--- a/AndorsTrail/res/layout/statusview.xml
+++ b/AndorsTrail/res/layout/statusview.xml
@@ -1,50 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" >
 
-	<ImageButton
-		android:id="@+id/status_image"
-		android:scaleType="fitCenter"
-		android:padding="8dp"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentLeft="true"
-		android:layout_centerVertical="true"
-		android:layout_margin="0sp"
-		/>
+    <RelativeLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
 
-	<ImageButton
-		android:id="@+id/toolbox_toggle"
-		android:scaleType="fitCenter"
-		android:padding="8dp"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		android:layout_margin="0sp"
-		/>
+        <ImageButton
+            android:id="@+id/status_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_margin="0sp"
+            android:padding="8dp"
+            android:scaleType="fitCenter" />
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_centerVertical="true"
-		android:layout_toRightOf="@id/status_image"
-		android:layout_toLeftOf="@id/toolbox_toggle"
-		android:orientation="vertical"
-		>
-		<com.gpl.rpg.AndorsTrail.view.RangeBar
-			android:id="@+id/statusview_health"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			/>
-		<com.gpl.rpg.AndorsTrail.view.RangeBar
-			android:id="@+id/statusview_exp"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			/>
-	</LinearLayout>
+        <ImageButton
+            android:id="@+id/toolbox_toggle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_margin="0sp"
+            android:padding="8dp"
+            android:scaleType="fitCenter" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/toolbox_toggle"
+            android:layout_toRightOf="@id/status_image"
+            android:orientation="vertical" >
+
+            <com.gpl.rpg.AndorsTrail.view.RangeBar
+                android:id="@+id/statusview_health"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <com.gpl.rpg.AndorsTrail.view.RangeBar
+                android:id="@+id/statusview_exp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+    </RelativeLayout>
 
 </merge>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/tabbedlayout.xml b/AndorsTrail/res/layout/tabbedlayout.xml
index bf05bd564..331c21d03 100644
--- a/AndorsTrail/res/layout/tabbedlayout.xml
+++ b/AndorsTrail/res/layout/tabbedlayout.xml
@@ -18,6 +18,7 @@
 				android:layout_height="wrap_content"
 				android:layout_weight="0"
 				android:visibility="gone"
+				android:background="?attr/ui_theme_tabwidget_drawable"
 				/>
 
 		<FrameLayout
diff --git a/AndorsTrail/res/layout/tabindicator.xml b/AndorsTrail/res/layout/tabindicator.xml
new file mode 100644
index 000000000..3eddc47a1
--- /dev/null
+++ b/AndorsTrail/res/layout/tabindicator.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="?attr/ui_theme_tabwidget_drawable"
+     >
+    
+    <ImageView 
+        android:id="@+id/tabindicator_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|center_horizontal"/>
+    
+    <TextView android:id="@+id/tabindicator_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:gravity="bottom|center_horizontal"
+        android:ellipsize="marquee"
+        android:singleLine="true"
+        android:scrollHorizontally="true"
+        android:textColor="?attr/ui_theme_textbutton_textcolor_color"/>
+
+</LinearLayout>
diff --git a/AndorsTrail/res/layout/title_bg_layout.xml b/AndorsTrail/res/layout/title_bg_layout.xml
new file mode 100644
index 000000000..4b5096be2
--- /dev/null
+++ b/AndorsTrail/res/layout/title_bg_layout.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title_bg"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <include layout="@layout/title_bg_sky_layout"/>
+
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView 
+        android:id="@+id/ts_clouds_animator_back"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+        />
+    
+    <ImageView 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="-50sp"
+        android:layout_marginRight="-100sp"
+        android:scaleType="fitEnd"
+        android:adjustViewBounds="true"
+        android:src="@drawable/ts_background"/>
+    
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView 
+        android:id="@+id/ts_clouds_animator_mid"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+        />
+    
+     <ImageView 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="-50sp"
+        android:layout_marginRight="-100sp"
+        android:scaleType="fitEnd"
+        android:adjustViewBounds="true"
+        android:src="@drawable/ts_midground"/>
+     
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView 
+        android:id="@+id/ts_clouds_animator_front"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+        />
+    
+     <ImageView 
+        android:id="@+id/ts_foreground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="-50sp"
+        android:layout_marginRight="-100sp"
+        android:scaleType="fitEnd"
+        android:adjustViewBounds="true"
+        android:src="@drawable/ts_foreground"/>
+     
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/title_logo_placeholder_above"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0" >
+        </TextView>
+        
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.4"
+            android:orientation="horizontal" >
+
+            <TextView
+            	android:id="@+id/title_logo_placeholder_left"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.1" >
+            </TextView>
+
+            <ImageView
+                android:id="@+id/title_logo"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20sp"
+                android:layout_marginRight="20sp"
+                android:layout_marginTop="20sp"
+                android:layout_weight="0.8"
+                android:scaleType="fitCenter"
+                android:src="@drawable/title_logo_animated" />
+
+            <TextView
+            	android:id="@+id/title_logo_placeholder_right"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.1" >
+            </TextView>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/title_logo_placeholder_below"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.6" >
+        </TextView>
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/title_bg_sky_layout.xml b/AndorsTrail/res/layout/title_bg_sky_layout.xml
new file mode 100644
index 000000000..26fd91423
--- /dev/null
+++ b/AndorsTrail/res/layout/title_bg_sky_layout.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_centerInParent="true"
+    android:orientation="vertical"
+    android:elevation="0dp" >
+
+    <ImageView
+        android:id="@+id/title_bg_top"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.4"
+        android:scaleType="fitXY"
+        android:src="@drawable/ts_sky_top" />
+<!-- 
+    <ImageView
+        android:id="@+id/title_bg_centerpattern"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:src="@drawable/sky_gradient_drawable" />
+-->
+<!--
+    <ImageView
+        android:id="@+id/title_bg_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.6"
+        android:scaleType="fitXY"
+        android:src="@drawable/ts_sky_bottom" />
+-->        
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/toolboxview.xml b/AndorsTrail/res/layout/toolboxview.xml
index bdbf913d9..781173308 100644
--- a/AndorsTrail/res/layout/toolboxview.xml
+++ b/AndorsTrail/res/layout/toolboxview.xml
@@ -1,30 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:orientation="vertical"
-	android:background="@drawable/ui_gradientshape"
-	>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
 
-	<ImageButton
-		android:id="@+id/toolbox_save"
-		style="@style/toolboxButtonTile"
-		android:src="@drawable/ui_icon_save"
-		/>
-	<ImageButton
-		android:id="@+id/toolbox_combatlog"
-		style="@style/toolboxButtonTile"
-		android:src="@drawable/ui_icon_combat"
-		/>
-	<ImageButton
-		android:id="@+id/toolbox_map"
-		style="@style/toolboxButtonTile"
-		android:src="@drawable/ui_icon_map"
-		/>
-	<ImageButton
-		android:id="@+id/toolbox_quickitems"
-		style="@style/toolboxButtonTile"
-		android:src="@drawable/ui_icon_equipment"
-		/>
-</LinearLayout>
+    <ImageButton
+        android:id="@+id/toolbox_save"
+        style="@style/toolboxButtonTile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ui_icon_save" />
+
+    <ImageButton
+        android:id="@+id/toolbox_combatlog"
+        style="@style/toolboxButtonTile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ui_icon_combat" />
+
+    <ImageButton
+        android:id="@+id/toolbox_map"
+        style="@style/toolboxButtonTile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ui_icon_map" />
+
+    <ImageButton
+        android:id="@+id/toolbox_quickitems"
+        style="@style/toolboxButtonTile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ui_icon_equipment" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/itemlist_food.json b/AndorsTrail/res/raw/itemlist_food.json
index 6419d70bd..f58b244bc 100644
--- a/AndorsTrail/res/raw/itemlist_food.json
+++ b/AndorsTrail/res/raw/itemlist_food.json
@@ -202,5 +202,87 @@
                 }
             ]
         }
+    },
+    {
+        "id": "chaotic_penalty",
+        "iconID": "items_weapons:61",
+        "name": "Chaotic Penalty",
+        "category": "lsword",
+        "displaytype": "extraordinary",
+        "hasManualPrice": 1,
+        "baseMarketCost": 0,
+        "equipEffect": {
+            "increaseMaxAP": 2,
+            "increaseAttackCost": 7,
+            "increaseAttackChance": 25,
+            "increaseCriticalSkill": 10,
+            "setCriticalMultiplier": 2,
+            "increaseAttackDamage": {
+                "min": -10,
+                "max": -10
+            },
+            "addedConditions":[
+            	{
+                	"condition":"courage",
+                	"magnitude": 5
+            	}
+        	]
+        },
+        "killEffect": {
+            "increaseCurrentHP": {
+                "min": 1,
+                "max": 1
+            }
+        },
+        "hitEffect":{
+        	"conditionsTarget":[
+            	{
+                	"condition":"fear",
+                	"magnitude":5,
+                	"duration":2,
+                	"chance":"100"
+            	}
+        	]
+    	},
+    	"hitReceivedEffect" : {
+        	"increaseCurrentHP": {
+                "min": 1,
+                "max": 1
+            },
+            "increaseCurrentAP": {
+                "min": 1,
+                "max": 1
+            },
+            "increaseAttackerCurrentHP": {
+                "min": 1,
+                "max": 1
+            },
+            "increaseAttackerCurrentAP": {
+                "min": 1,
+                "max": 1
+            },
+            "conditionsSource":[
+            	{
+                "condition":"crit_aware",
+                "magnitude": 2,
+                "duration": 5,
+                "chance":"50"
+            	}
+        	],
+            "conditionsTarget":[
+            	{
+                "condition":"def",
+                "magnitude": 2,
+                "duration": 5,
+                "chance":"80"
+            	},
+            	{
+                "condition":"regen2",
+                "magnitude":3,
+                "duration":4,
+                "chance":"50"
+            	}
+        	]
+        }
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/values-v10/ui_listviewstyle.xml b/AndorsTrail/res/values-v10/ui_listviewstyle.xml
index 7c11f488a..458c7d7ec 100644
--- a/AndorsTrail/res/values-v10/ui_listviewstyle.xml
+++ b/AndorsTrail/res/values-v10/ui_listviewstyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="ConversationListView" parent="@android:style/Widget.ListView">
+	<style name="ConversationListView" parent="@style/AndorsTrail_Style_ListView">
 		<!-- See http://community.developer.motorola.com/t5/MOTODEV-Blog/Why-Does-My-ListView-Look-Different/ba-p/17462 -->
 		<item name="android:listSelector">@null</item>
 		<item name="android:overScrollFooter">@null</item>
diff --git a/AndorsTrail/res/values-v14/ui_styles.xml b/AndorsTrail/res/values-v14/ui_styles.xml
new file mode 100644
index 000000000..3c36c667d
--- /dev/null
+++ b/AndorsTrail/res/values-v14/ui_styles.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    
+	
+	<style name="AndorsTrail_Style_TextButton" parent="AndorsTrail_Style_TextButton_Base">
+	    <item name="android:textAllCaps">false</item>
+	</style>
+	
+    <style name="AndorsTrail_Style_PreferencesListHeader" parent="AndorsTrail_Style_PreferencesListHeader_Base">
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:layout_marginRight">5dp</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+	
+</resources>
\ No newline at end of file
diff --git a/AndorsTrail/res/values-v14/ui_theme.xml b/AndorsTrail/res/values-v14/ui_theme.xml
new file mode 100644
index 000000000..69b82f5c4
--- /dev/null
+++ b/AndorsTrail/res/values-v14/ui_theme.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AndorsTrailTheme_Blue_v14" parent="AndorsTrailTheme_Base">
+	    <item name="android:buttonBarStyle">@style/AndorsTrail_Style_StdFrame</item>
+	    <item name="android:dialogTheme">@style/AndorsTrailDialogTheme_Blue</item>
+	</style>
+	
+	<style name="AndorsTrailDialogTheme_Blue_v14" parent="AndorsTrailDialogTheme_Base">
+	    <item name="android:buttonBarButtonStyle">@style/AndorsTrail_Style_TextButton</item>
+	    <item name="android:buttonBarStyle">@style/AndorsTrail_Style_StdFrame</item>
+	    <item name="android:dialogTheme">@style/AndorsTrailDialogTheme_Blue</item>
+	</style>
+	
+    <style name="AndorsTrailTheme_Green_v14" parent="AndorsTrailTheme_Green_Base">
+	    <item name="android:dialogTheme">@style/AndorsTrailDialogTheme_Green</item>
+	</style>
+	
+	<style name="AndorsTrailDialogTheme_Green_v14" parent="AndorsTrailDialogTheme_Green_Base">
+	    <item name="android:dialogTheme">@style/AndorsTrailDialogTheme_Green</item>
+	</style>
+	
+    <style name="AndorsTrailTheme_Charcoal_v14" parent="AndorsTrailTheme_Charcoal_Base">
+	    <item name="android:dialogTheme">@style/AndorsTrailDialogTheme_Charcoal</item>
+	</style>
+	
+	<style name="AndorsTrailDialogTheme_Charcoal_v14" parent="AndorsTrailDialogTheme_Charcoal_Base">
+	    <item name="android:dialogTheme">@style/AndorsTrailDialogTheme_Charcoal</item>
+	</style>
+</resources>
diff --git a/AndorsTrail/res/values-v17/ui_styles.xml b/AndorsTrail/res/values-v17/ui_styles.xml
new file mode 100644
index 000000000..4a3472dad
--- /dev/null
+++ b/AndorsTrail/res/values-v17/ui_styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    
+	<style name="AndorsTrail_Style_RadioButton" parent="android:style/Widget.CompoundButton.RadioButton">
+	    <item name="android:button">?attr/ui_theme_radiobutton_drawable</item>
+	    <item name="android:paddingStart">10dp</item>
+	</style>
+</resources>
diff --git a/AndorsTrail/res/values/arrays.xml b/AndorsTrail/res/values/arrays.xml
index 6a7c65b3f..e7c3ec4eb 100644
--- a/AndorsTrail/res/values/arrays.xml
+++ b/AndorsTrail/res/values/arrays.xml
@@ -1,165 +1,177 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-
-	<string-array name="questlog_includecompleted">
-		<item>@string/questlog_includecompleted_hidecompleted</item>
-		<item>@string/questlog_includecompleted_includecompleted</item>
-		<item>@string/questlog_includecompleted_onlycompleted</item>
-	</string-array>
-
-	<!-- Order is hardcoded within HeroInfoActivity_inventory-->
-	<string-array name="inventorylist_category_filters">
-		<item>@string/inventory_category_all</item>
-		<item>@string/inventory_category_weapons</item>
-		<item>@string/inventory_category_armor</item>
-		<item>@string/inventory_category_usable</item>
-		<item>@string/inventory_category_quest</item>
-		<item>@string/inventory_category_other</item>
-	</string-array>
-
-	<!-- Order is hardcoded within ItemContainerAdapter method-->
-	<string-array name="inventorylist_sort_filters">
-		<item>@string/inventory_sort_custom</item>
-		<item>@string/inventory_sort_name</item>
-		<item>@string/inventory_sort_price</item>
-		<item>@string/inventory_sort_quantity</item>
-		<item>@string/inventory_sort_rarity</item>
-		<item>@string/inventory_sort_type</item>
-	</string-array>
-
-	<!--  the categories need to be in the same order as SkillList.SkillCategory-->
-	<string-array name="skill_category_filters">
-		<item>@string/skill_category_all</item>
-		<item>@string/skill_category_offense</item>
-		<item>@string/skill_category_defense</item>
-		<item>@string/skill_category_criticals</item>
-		<item>@string/skill_category_immunity</item>
-		<item>@string/skill_category_utility</item>
-		<item>@string/skill_category_speciality</item>
-		<item>@string/skill_category_proficiency</item>
-	</string-array>
-
-	<!-- order is hardcoded in HeroInfoActivity_skills method -->
-	<string-array name="skill_sort_filters">
-		<item>@string/skill_sort_unsorted</item>
-		<item>@string/skill_sort_name</item>
-		<item>@string/skill_sort_points</item>
-		<item>@string/skill_sort_unlocked</item>
-	</string-array>
-
-	<!-- order hardcoded similar to skills adapter -->
-	<string-array name="shoplist_sort_filters">
-		<item>@string/shoplist_sort_custom</item>
-		<item>@string/shoplist_sort_name</item>
-		<item>@string/shoplist_sort_price</item>
-		<item>@string/shoplist_sort_quantity</item>
-		<item>@string/shoplist_sort_rarity</item>
-		<item>@string/shoplist_sort_type</item>
-	</string-array>
-
-	<string-array name="preferences_display_loot">
-		<item>@string/preferences_display_loot_dialog</item>
-		<item>@string/preferences_display_loot_dialog_on_items</item>
-		<item>@string/preferences_display_loot_dialog_on_items_or_toast</item>
-		<item>@string/preferences_display_loot_toast</item>
-		<item>@string/preferences_display_loot_toast_on_items</item>
-		<item>@string/preferences_display_loot_never</item>
-	</string-array>
-	<string-array name="preferences_display_loot_values">
-		<item>0</item>
-		<item>3</item>
-		<item>4</item>
-		<item>1</item>
-		<item>5</item>
-		<item>2</item>
-	</string-array>
-
-	<string-array name="preferences_attackspeed">
-		<item>@string/preferences_attackspeed_instant</item>
-		<item>@string/preferences_attackspeed_fast</item>
-		<item>@string/preferences_attackspeed_normal</item>
-		<item>@string/preferences_attackspeed_slow</item>
-	</string-array>
-	<string-array name="preferences_attackspeed_values">
-		<item>0</item>
-		<item>400</item>
-		<item>1000</item>
-		<item>1500</item>
-	</string-array>
-
-	<string-array name="preferences_movementmethods">
-		<item>@string/preferences_movementmethods_straight</item>
-		<item>@string/preferences_movementmethods_avoid</item>
-	</string-array>
-	<string-array name="preferences_movementmethod_values">
-		<item>0</item>
-		<item>1</item>
-	</string-array>
-
-
-	<string-array name="preferences_display_scaling_factor">
-		<item>@string/preferences_display_scaling_factor_normal</item>
-		<item>@string/preferences_display_scaling_factor_50_percent_larger</item>
-		<item>@string/preferences_display_scaling_factor_double</item>
-	</string-array>
-	<string-array name="preferences_display_scaling_factor_values">
-		<item>1.0f</item>
-		<item>1.5f</item>
-		<item>2.0f</item>
-	</string-array>
-
-	<string-array name="preferences_movement_dpad_positions">
-		<item>@string/preferences_movement_dpad_positions_disabled</item>
-		<item>@string/preferences_movement_dpad_positions_lower_right</item>
-		<item>@string/preferences_movement_dpad_positions_lower_left</item>
-		<item>@string/preferences_movement_dpad_positions_center_bottom</item>
-		<item>@string/preferences_movement_dpad_positions_center_left</item>
-		<item>@string/preferences_movement_dpad_positions_center_right</item>
-		<item>@string/preferences_movement_dpad_positions_upper_left</item>
-		<item>@string/preferences_movement_dpad_positions_upper_right</item>
-		<item>@string/preferences_movement_dpad_positions_center_top</item>
-	</string-array>
-	<string-array name="preferences_movement_dpad_positions_values">
-		<item>0</item>
-		<item>1</item>
-		<item>2</item>
-		<item>3</item>
-		<item>4</item>
-		<item>5</item>
-		<item>6</item>
-		<item>7</item>
-		<item>8</item>
-	</string-array>
-
-	<string-array name="preferences_display_overwrite_savegame_entries">
-		<item>@string/preferences_display_overwrite_savegame_entries_always_confirm</item>
-		<item>@string/preferences_display_overwrite_savegame_entries_confirm_overwrite</item>
-		<item>@string/preferences_display_overwrite_savegame_entries_never_confirm</item>
-	</string-array>
-	<string-array name="preferences_display_overwrite_savegame_values">
-		<item>0</item>
-		<item>1</item>
-		<item>2</item>
-	</string-array>
-
-	<string-array name="preferences_quickslots_placements">
-		<item>@string/preferences_quickslots_placements_horizontal_center_bottom</item>
-		<item>@string/preferences_quickslots_placements_vertical_center_left</item>
-		<item>@string/preferences_quickslots_placements_vertical_center_right</item>
-		<item>@string/preferences_quickslots_placements_vertical_bottom_left</item>
-		<item>@string/preferences_quickslots_placements_horizontal_bottom_left</item>
-		<item>@string/preferences_quickslots_placements_horizontal_bottom_right</item>
-		<item>@string/preferences_quickslots_placements_vertical_bottom_right</item>
-	</string-array>
-	<string-array name="preferences_quickslots_placements_values">
-		<item>0</item>
-		<item>1</item>
-		<item>2</item>
-		<item>3</item>
-		<item>4</item>
-		<item>5</item>
-		<item>6</item>
-	</string-array>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+
+	<string-array name="questlog_includecompleted">
+		<item>@string/questlog_includecompleted_hidecompleted</item>
+		<item>@string/questlog_includecompleted_includecompleted</item>
+		<item>@string/questlog_includecompleted_onlycompleted</item>
+	</string-array>
+
+	<!-- Order is hardcoded within HeroInfoActivity_inventory-->
+	<string-array name="inventorylist_category_filters">
+		<item>@string/inventory_category_all</item>
+		<item>@string/inventory_category_weapons</item>
+		<item>@string/inventory_category_armor</item>
+		<item>@string/inventory_category_usable</item>
+		<item>@string/inventory_category_quest</item>
+		<item>@string/inventory_category_other</item>
+	</string-array>
+
+	<!-- Order is hardcoded within ItemContainerAdapter method-->
+	<string-array name="inventorylist_sort_filters">
+		<item>@string/inventory_sort_custom</item>
+		<item>@string/inventory_sort_name</item>
+		<item>@string/inventory_sort_price</item>
+		<item>@string/inventory_sort_quantity</item>
+		<item>@string/inventory_sort_rarity</item>
+		<item>@string/inventory_sort_type</item>
+	</string-array>
+
+	<!--  the categories need to be in the same order as SkillList.SkillCategory-->
+	<string-array name="skill_category_filters">
+		<item>@string/skill_category_all</item>
+		<item>@string/skill_category_offense</item>
+		<item>@string/skill_category_defense</item>
+		<item>@string/skill_category_criticals</item>
+		<item>@string/skill_category_immunity</item>
+		<item>@string/skill_category_utility</item>
+		<item>@string/skill_category_speciality</item>
+		<item>@string/skill_category_proficiency</item>
+	</string-array>
+
+	<!-- order is hardcoded in HeroInfoActivity_skills method -->
+	<string-array name="skill_sort_filters">
+		<item>@string/skill_sort_unsorted</item>
+		<item>@string/skill_sort_name</item>
+		<item>@string/skill_sort_points</item>
+		<item>@string/skill_sort_unlocked</item>
+	</string-array>
+
+	<!-- order hardcoded similar to skills adapter -->
+	<string-array name="shoplist_sort_filters">
+		<item>@string/shoplist_sort_custom</item>
+		<item>@string/shoplist_sort_name</item>
+		<item>@string/shoplist_sort_price</item>
+		<item>@string/shoplist_sort_quantity</item>
+		<item>@string/shoplist_sort_rarity</item>
+		<item>@string/shoplist_sort_type</item>
+	</string-array>
+
+	<string-array name="preferences_display_loot">
+		<item>@string/preferences_display_loot_dialog</item>
+		<item>@string/preferences_display_loot_dialog_on_items</item>
+		<item>@string/preferences_display_loot_dialog_on_items_or_toast</item>
+		<item>@string/preferences_display_loot_toast</item>
+		<item>@string/preferences_display_loot_toast_on_items</item>
+		<item>@string/preferences_display_loot_never</item>
+	</string-array>
+	<string-array name="preferences_display_loot_values">
+		<item>0</item>
+		<item>3</item>
+		<item>4</item>
+		<item>1</item>
+		<item>5</item>
+		<item>2</item>
+	</string-array>
+
+	<string-array name="preferences_attackspeed">
+		<item>@string/preferences_attackspeed_instant</item>
+		<item>@string/preferences_attackspeed_fast</item>
+		<item>@string/preferences_attackspeed_normal</item>
+		<item>@string/preferences_attackspeed_slow</item>
+	</string-array>
+	<string-array name="preferences_attackspeed_values">
+		<item>0</item>
+		<item>400</item>
+		<item>1000</item>
+		<item>1500</item>
+	</string-array>
+
+	<string-array name="preferences_movementmethods">
+		<item>@string/preferences_movementmethods_straight</item>
+		<item>@string/preferences_movementmethods_avoid</item>
+	</string-array>
+	<string-array name="preferences_movementmethod_values">
+		<item>0</item>
+		<item>1</item>
+	</string-array>
+
+
+	<string-array name="preferences_display_theme">
+		<item>@string/preferences_display_theme_blue</item>
+		<item>@string/preferences_display_theme_green</item>
+		<item>@string/preferences_display_theme_charcoal</item>
+	</string-array>
+	<string-array name="preferences_display_theme_values">
+		<item>0</item>
+		<item>1</item>
+		<item>2</item>
+	</string-array>
+	
+	
+	<string-array name="preferences_display_scaling_factor">
+		<item>@string/preferences_display_scaling_factor_normal</item>
+		<item>@string/preferences_display_scaling_factor_50_percent_larger</item>
+		<item>@string/preferences_display_scaling_factor_double</item>
+	</string-array>
+	<string-array name="preferences_display_scaling_factor_values">
+		<item>1.0f</item>
+		<item>1.5f</item>
+		<item>2.0f</item>
+	</string-array>
+
+	<string-array name="preferences_movement_dpad_positions">
+		<item>@string/preferences_movement_dpad_positions_disabled</item>
+		<item>@string/preferences_movement_dpad_positions_lower_right</item>
+		<item>@string/preferences_movement_dpad_positions_lower_left</item>
+		<item>@string/preferences_movement_dpad_positions_center_bottom</item>
+		<item>@string/preferences_movement_dpad_positions_center_left</item>
+		<item>@string/preferences_movement_dpad_positions_center_right</item>
+		<item>@string/preferences_movement_dpad_positions_upper_left</item>
+		<item>@string/preferences_movement_dpad_positions_upper_right</item>
+		<item>@string/preferences_movement_dpad_positions_center_top</item>
+	</string-array>
+	<string-array name="preferences_movement_dpad_positions_values">
+		<item>0</item>
+		<item>1</item>
+		<item>2</item>
+		<item>3</item>
+		<item>4</item>
+		<item>5</item>
+		<item>6</item>
+		<item>7</item>
+		<item>8</item>
+	</string-array>
+
+	<string-array name="preferences_display_overwrite_savegame_entries">
+		<item>@string/preferences_display_overwrite_savegame_entries_always_confirm</item>
+		<item>@string/preferences_display_overwrite_savegame_entries_confirm_overwrite</item>
+		<item>@string/preferences_display_overwrite_savegame_entries_never_confirm</item>
+	</string-array>
+	<string-array name="preferences_display_overwrite_savegame_values">
+		<item>0</item>
+		<item>1</item>
+		<item>2</item>
+	</string-array>
+
+	<string-array name="preferences_quickslots_placements">
+		<item>@string/preferences_quickslots_placements_horizontal_center_bottom</item>
+		<item>@string/preferences_quickslots_placements_vertical_center_left</item>
+		<item>@string/preferences_quickslots_placements_vertical_center_right</item>
+		<item>@string/preferences_quickslots_placements_vertical_bottom_left</item>
+		<item>@string/preferences_quickslots_placements_horizontal_bottom_left</item>
+		<item>@string/preferences_quickslots_placements_horizontal_bottom_right</item>
+		<item>@string/preferences_quickslots_placements_vertical_bottom_right</item>
+	</string-array>
+	<string-array name="preferences_quickslots_placements_values">
+		<item>0</item>
+		<item>1</item>
+		<item>2</item>
+		<item>3</item>
+		<item>4</item>
+		<item>5</item>
+		<item>6</item>
+	</string-array>
+
+</resources>
diff --git a/AndorsTrail/res/values/attrs.xml b/AndorsTrail/res/values/attrs.xml
new file mode 100644
index 000000000..51f96d252
--- /dev/null
+++ b/AndorsTrail/res/values/attrs.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <attr name="single" format="boolean" />
+    <attr name="vertical" format="boolean" />
+    <attr name="horizontal" format="boolean" />
+    <attr name="first" format="boolean" />
+    <attr name="last" format="boolean" />
+    <attr name="reverse" format="boolean" />
+
+</resources>
\ No newline at end of file
diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml
index c3748aeee..b4dc857fe 100644
--- a/AndorsTrail/res/values/authors.xml
+++ b/AndorsTrail/res/values/authors.xml
@@ -3,10 +3,13 @@
 <resources>
 
 	<!-- Do not translate this. -->
-	<string name="about_copyright">Copyright © 2010–2013 Oskar Wiksten&lt;br /&gt;&lt;br /&gt;</string>
+	<string name="about_copyright">Copyright © 2010–2013 Oskar Wiksten&lt;br /&gt;
+	    Copyright © 2013–2017 The Andor\'s Trail development team&lt;br /&gt;
+	    &lt;br /&gt;</string>
 	<string name="about_authors">
-		Programming by Oskar Wiksten&lt;br /&gt;
+		Created &amp; originally programmed by Oskar Wiksten&lt;br /&gt;
 		&lt;a href="http://andorstrail.com/"&gt;Web site provided by Scott Devaney&lt;/a&gt;&lt;br /&gt;
+		Programming &amp; tools by &lt;a href="https://github.com/Zukero"&gt;Kevin Pochat&lt;/a&gt;&lt;br /&gt;
 		Additional maps done by Michael Schmid&lt;br /&gt;
 		Additional maps done by Pete Wheeler&lt;br /&gt;
 		Additional maps done by Ian Haase&lt;br /&gt;
@@ -15,7 +18,6 @@
 		Additional programming by Olivier Samyn&lt;br /&gt;
 		Additional programming by Ethan Wessel&lt;br /&gt;
 		Additional programming by Scott Lund&lt;br /&gt;
-		Additional programming by &lt;a href="https://github.com/Zukero"&gt;Kevin Pochat&lt;/a&gt;&lt;br /&gt;
 		Additional programming by Lucas Delvallet&lt;br /&gt;
 		Additional programming by Florian Doublet&lt;br /&gt;
 		Additional programming by M.H. Alkotob&lt;br /&gt;
@@ -42,9 +44,12 @@
 		Additional content and ideas by Stan &quot;Meirerion&quot;&lt;br /&gt;
 		Additional content by Richard Jackson (rijackson741)&lt;br /&gt;
 		&lt;br /&gt;
+		&lt;a href="http://pixeljoint.com/p/101133.htm"&gt;Original hero sprites by Maksiu&lt;/a&gt;&lt;br /&gt;
+		&lt;a href="http://redknight91.deviantart.com/art/Arena-Game-Sprites-154661559"&gt;Hero graphics by RedKnight91&lt;/a&gt;&lt;br /&gt;
+		&lt;a href="https://opengameart.org/content/ui-pack-0"&gt;UI based on graphics by Shadow3097&lt;/a&gt;&lt;br /&gt;
+		&lt;a href="http://www.mansgreback.com"&gt;Typography by Måns Grebäck&lt;/a&gt;&lt;br /&gt;
 		&lt;a href="http://telles0808.deviantart.com/art/RPG-Maker-VX-RTP-Tileset-159218223"&gt;Map tilesets graphics by telles0808&lt;/a&gt;&lt;br /&gt;
 		&lt;a href="http://ails.deviantart.com/art/420-Pixel-Art-Icons-for-RPG-129892453"&gt;Item tilesets graphics by Ails&lt;/a&gt;&lt;br /&gt;
-		&lt;a href="http://redknight91.deviantart.com/art/Arena-Game-Sprites-154661559"&gt;Hero graphics by RedKnight91&lt;/a&gt;&lt;br /&gt;
 		&lt;a href="http://nacred.deviantart.com/art/Sprite-Sheet-171751308"&gt;Additional monster graphics by nacred&lt;/a&gt;&lt;br /&gt;
 		&lt;a href="http://opengameart.org/content/whispers-of-avalon-item-icons"&gt;Additional graphics by Meway, Len Pabin, Auran, Silviyius&lt;/a&gt;&lt;br /&gt;
 		&lt;a href="http://opengameart.org/content/10-basic-rpg-enemies"&gt;Additional graphics by Stephen Challener (Redshrike)&lt;/a&gt; &lt;a href="http://opengameart.org/content/more-rpg-enemies"&gt;(more)&lt;/a&gt;&lt;br /&gt;
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 4ed923678..56a561478 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -1,687 +1,706 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-	<string name="app_name">Andor\'s Trail</string>
-	<string name="app_description">Quest-driven fantasy RPG</string>
-
-	<string name="exit_to_menu">Exit to menu</string>
-	<string name="menu_settings">Preferences</string>
-	<string name="menu_save">Save</string>
-	<string name="menu_save_gamesaved">Game was saved to slot %1$d</string>
-	<string name="menu_save_failed">Failed to save game! Is the SD card mounted and writable?</string>
-
-	<string name="loadsave_title_save">Save game</string>
-	<string name="loadsave_title_load">Load saved game</string>
-	<string name="loadsave_selectslot">Select slot</string>
-	<string name="savegame_currenthero_displayinfo">level %1$d, %2$d exp, %3$d gold</string>
-
-	<string name="dialog_loading_message">Loading resources…</string>
-	<string name="dialog_loading_failed_title">Load Failed</string>
-	<string name="dialog_loading_failed_message">Andor\'s Trail was unable to load the savegame file.\n\n:(\n\nThe file may be damaged or incomplete.</string>
-	<string name="dialog_loading_failed_incorrectversion">Andor\'s Trail was unable to load the savegame file. This savegame file is created with a newer version than what is currently running.</string>
-
-	<string name="dialog_close">Close</string>
-
-	<string name="dialog_monsterencounter_title">Encounter</string>
-	<string name="dialog_monsterencounter_message">Do you want to attack?\nDifficulty: %1$s</string>
-	<string name="dialog_monsterencounter_info">Info</string>
-	<string name="dialog_monsterencounter_conditions">Conditions</string>
-
-	<string name="status_hp">HP:</string>
-	<string name="status_ap">AP:</string>
-	<string name="status_exp">Level:</string>
-
-	<string name="heroinfo_char">Overview</string>
-	<string name="heroinfo_inv">Items</string>
-	<string name="heroinfo_skill">Skills</string>
-	<string name="heroinfo_skill_categories">Category</string>
-	<string name="heroinfo_skill_sort">Sort</string>
-	<string name="heroinfo_levelup">Level up</string>
-	<string name="heroinfo_level">Level</string>
-	<string name="heroinfo_totalexperience">Total experience</string>
-	<string name="heroinfo_wornequipment">Worn equipment</string>
-	<string name="heroinfo_inventory">Inventory</string>
-	<string name="heroinfo_inventory_categories">Category</string>
-	<string name="heroinfo_inventory_sort">Sort By</string>
-	<string name="heroinfo_gold">Gold: %1$d</string>
-	<string name="heroinfo_actionpoints">Action points (AP):</string>
-	<string name="heroinfo_quests">Quests</string>
-
-	<string name="combat_attack">Attack (%1$d AP)</string>
-	<string name="combat_move">Move (%1$d AP)</string>
-	<string name="combat_use">Use item</string>
-	<string name="combat_endturn">End turn</string>
-	<!-- <string name="combat_endcombat">End combat</string>-->
-	<string name="combat_flee">Flee</string>
-	<string name="combat_begin_flee">You can now flee combat by clicking in the direction you want to move.</string>
-	<string name="combat_flee_failed">You failed to flee!</string>
-	<string name="combat_status_ap">AP: %1$d</string>
-	<string name="combat_monsterhealth">HP:</string>
-	<string name="combat_monsteraction">%1$s is attacking.</string>
-	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string> -->
-	<string name="combat_result_monstermiss">%1$s misses!</string>
-	<string name="combat_result_monsterhit">%1$s hits you for %2$d hp!</string>
-	<string name="combat_result_monsterhitcritical">%1$s gets a critical hit for %2$d hp!</string>
-	<string name="combat_result_heromiss">Your attack misses.</string>
-	<string name="combat_result_herohit">You hit %1$s for %2$d hp!</string>
-	<string name="combat_result_herohitcritical">You get a critical hit on %1$s for %2$d hp!</string>
-	<string name="combat_result_herokillsmonster">%1$s dies!</string>
-	<string name="combat_not_enough_ap">Not enough AP left this round.</string>
-	<string name="combat_hero_dies">You fall unconscious, but fortunately wake up alive, dazed and fatigued. You lost %1$d experience.</string>
-	<string name="combat_miss_animation_message">MISS</string>
-	<string name="combat_taunt_monster">You taunt %1$s!</string>
-	<string name="combat_condition_player_apply">You are affected by %1$s.</string>
-	<string name="combat_condition_player_clear">You are cleared of %1$s.</string>
-	<string name="combat_condition_player_immune">You are now immunized against %1$s.</string>
-	<string name="combat_condition_monster_apply">%1$s is affected by %2$s.</string>
-	<string name="combat_condition_monster_clear">%1$s is cleared of %2$s.</string>
-	<string name="combat_condition_monster_immune">%1$s is now immunized against %2$s.</string>
-	
-	
-	<string name="inventory_info">Info</string>
-	<string name="inventory_equip">Equip</string>
-	<string name="inventory_unequip">Unequip</string>
-	<string name="inventory_use">Use</string>
-	<string name="inventory_drop">Drop</string>
-	<string name="inventory_item_used">You used %1$s.</string>
-	<string name="inventory_item_dropped">%1$s was dropped.</string>
-	<string name="inventory_item_equipped">You equipped %1$s.</string>
-
-	<string name="dialog_loot_pickall">Pick up all</string>
-	<string name="dialog_loot_foundgold">You found %1$d gold. </string>
-	<string name="dialog_loot_pickedupitem">You picked up an item. </string>
-	<string name="dialog_loot_pickedupitems">You picked up %1$d items. </string>
-	<string name="dialog_groundloot_title">Items</string>
-	<string name="dialog_groundloot_message">You found some items. </string>
-	<string name="dialog_monsterloot_title">Victory</string>
-	<string name="dialog_monsterloot_message">You survived the encounter. </string>
-	<string name="dialog_monsterloot_gainedexp">You gained %1$d experience. </string>
-
-	<string name="monster_difficulty_veryeasy">Very easy</string>
-	<string name="monster_difficulty_easy">Easy</string>
-	<string name="monster_difficulty_normal">Normal</string>
-	<string name="monster_difficulty_hard">Hard</string>
-	<string name="monster_difficulty_veryhard">Very hard</string>
-	<string name="monster_difficulty_impossible">Impossible</string>
-
-	<string name="actorinfo_class">Class:</string>
-	<string name="actorinfo_difficulty">Difficulty:</string>
-	<string name="actorinfo_health">Health:</string>
-	<string name="actorinfo_attack">Attack:</string>
-	<string name="actorinfo_defense">Defense:</string>
-	<string name="actorinfo_movecost">Move cost (AP):</string>
-	<string name="actorinfo_basetraits">Base combat statistics (without equipment and skills)</string>
-	<string name="actorinfo_currenttraits">Combat statistics (current)</string>
-
-	<string name="traitsinfo_attack_cost">Attack cost (AP):</string>
-	<string name="traitsinfo_attack_chance">Attack chance:</string>
-	<string name="traitsinfo_attack_damage">Attack damage:</string>
-	<string name="traitsinfo_criticalhit_skill">Critical hit skill:</string>
-	<string name="traitsinfo_criticalhit_multiplier">Critical multiplier:</string>
-	<string name="traitsinfo_defense_chance">Block chance:</string>
-	<string name="traitsinfo_defense_damageresist">Damage resistance:</string>
-
-	<!-- <string name="key_required">A specific key is required to pass.</string> -->
-
-	<string name="iteminfo_category">Category: </string>
-	<string name="iteminfo_action_use">Use</string>
-	<string name="iteminfo_action_equip">Equip</string>
-	<string name="iteminfo_action_unequip">Unequip</string>
-	<string name="iteminfo_action_use_ap">Use (%1$d AP)</string>
-	<string name="iteminfo_action_equip_ap">Equip (%1$d AP)</string>
-	<string name="iteminfo_action_unequip_ap">Unequip (%1$d AP)</string>
-
-	<string name="startscreen_continue">Continue current game</string>
-	<string name="startscreen_newgame">New game</string>
-	<string name="startscreen_newgame_confirm">You will lose your current game and your current character, are you sure you want to start a new game?</string>
-	<string name="startscreen_about">About/help</string>
-	<string name="startscreen_enterheroname">Enter hero name</string>
-	<string name="startscreen_load">Load</string>
-
-	<!-- <string name="conversation_title">%1$s says</string> -->
-	<string name="conversation_rewardexp"> [You gained %1$d experience]</string>
-	<string name="conversation_rewardgold"> [You gained %1$d gold]</string>
-	<string name="conversation_lostgold"> [You lost %1$d gold]</string>
-	<string name="conversation_rewarditem"> [You gained an item]</string>
-	<string name="conversation_rewarditems"> [You gained %1$d items]</string>
-	<string name="conversation_next">Next</string>
-	<string name="conversation_leave">Leave</string>
-
-	<string name="shop_buy">Buy</string>
-	<string name="shop_sell">Sell</string>
-	<string name="shop_infoitem">Info</string>
-	<string name="shop_buyitem">Buy (%1$d gold)</string>
-	<string name="shop_sellitem">Sell (%1$d gold)</string>
-	<string name="shop_yourgold">Your gold: %1$d</string>
-	<string name="shop_item_bought">%1$s bought.</string>
-	<string name="shop_item_sold">%1$s sold.</string>
-	<string name="shop_item_sort">Sort</string>
-
-	<string name="levelup_title">Level up</string>
-	<string name="levelup_description">Welcome to level %1$d!</string>
-	<string name="levelup_buttontext">Level up</string>
-	<string name="levelup_add_health">Increase health (+%1$d HP)</string>
-	<string name="levelup_add_health_description">Adds %1$d to your maximum health.</string>
-	<string name="levelup_add_attackchance">Increase attack chance (+%1$d)</string>
-	<string name="levelup_add_attackchance_description">Adds %1$d to your base attack chance.</string>
-	<string name="levelup_add_attackdamage">Increase attack damage (+%1$d)</string>
-	<string name="levelup_add_attackdamage_description">Adds %1$d to your base attack damage.</string>
-	<string name="levelup_add_blockchance">Increase block chance (+%1$d)</string>
-	<string name="levelup_add_blockchance_description">Adds %1$d to your base block chance.</string>
-
-	<string name="dialog_rest_title">Rest</string>
-	<string name="dialog_rest_confirm_message">Do you want to rest here?</string>
-	<string name="dialog_rest_message">You have rested and regained your full health.</string>
-
-	<string name="about_button1">Help</string>
-	<string name="about_button2">Authors</string>
-	<string name="about_button3">License</string>
-	<string name="about_contents1">
-		Welcome to Andor\'s Trail, an open-source roguelike RPG on Android.&lt;br /&gt;
-		&lt;br /&gt;
-		&lt;a href="http://andorstrail.com/"&gt;Game forums on andorstrail.com for questions and gameplay discussions.&lt;/a&gt;&lt;br /&gt;
-		&lt;br /&gt;
-		&lt;a href="http://andorstrail.com/wiki"&gt;Game wiki for info about the Andor\'s Trail world, among other things.&lt;/a&gt;&lt;br /&gt;
-		&lt;br /&gt;
-		&lt;a href="https://github.com/Zukero/andors-trail/"&gt;Project source code on github.com for developers.&lt;/a&gt;&lt;br /&gt;
-		&lt;br /&gt;
-		Please visit the forums to discuss the game with other players.&lt;br /&gt;
-	</string>
-
-	<!--
-		This is the GNU GPL v2 text, originally from
-			http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-		For translation of this text, you might be able to find a version in your language here:
-			http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
-	-->
-	<string name="about_contents3">
-		This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.&lt;br /&gt;
-		&lt;br /&gt;
-		This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&lt;br /&gt;
-		&lt;br /&gt;
-		You should have received a copy of the GNU General Public License along with this program; if not, see &lt;a href="http://www.gnu.org/licenses"&gt;http://www.gnu.org/licenses&lt;/a&gt;&lt;br /&gt;
-		&lt;br /&gt;
-		For source code and feature requests, please visit the project page at &lt;a href="https://github.com/Zukero/andors-trail/"&gt;https://github.com/Zukero/andors-trail/&lt;/a&gt;&lt;br /&gt;
-	</string>
-	<string name="about_interface"><![CDATA[
-
-<div><b>Game Settings</b> can be found by pressing your device\'s Menu Button.</div>
-
-<p>________________</p>
-<h1>Interface Icons</h1>
-
-<div><b>The Chest</b><img alt="chest" src="chest.png" /></div>
-<p>Quickslots [Long press the pouches inside to assign items for instant use]</p>
-
-<div><b>The Hero</b><img alt="hero" src="char_hero.png" /></div>
-<p>Menu [Overview, Quests, Skills &amp; Inventory *]</p>
-<p>* (While in inventory, "press" an item for information &amp; "long press" for more options)</p>
-
-<div><b>The Enemy</b><img alt="monster" src="monster.png" /></div>
-<p>Information [Appears during Combat]</p>
-
-
-
-<p>________________</p>
-<h1>Combat</h1>
-
-<p>Actions taken during battle cost AP...</p>
-
-<div><b>Attacking</b> - [3AP] *</div>
-<img alt="attacking" src="doubleattackexample.png" />
-<p>* (Equipping Gear &amp; Using Items may alter AP &amp; usage cost)</p>
-
-<div><b>Using Items</b> - [5AP]</div>
-<div><b>Fleeing</b> - [6AP]</div>
-
-
-
-<p>________________</p>
-<h1>Advanced Combat</h1>
-
-<div>During Combat, long press a tile adjacent to the Hero...</div>
-
-<div><b>To Flee</b></div>
-<p>(chosen tile is highlighted - Attack Button changes to Move)</p>
-<img alt="flee" src="flee_example.png" />
-<p>[flee mode activated - Long press enemy to re-enter combat]</p>
-
-<div><b>To Change Targets</b></div>
-<p>(the red target highlight shifts between enemies)</p>
-<p>[the target has been changed]</p>
-
-]]></string>
-
-	<string name="dialog_newversion_title">Welcome</string>
-	<string name="dialog_newversion_message">
-		Thank you for downloading Andor\'s Trail!\n\n
-		Please note that this version of Andor\'s Trail is a WORK IN PROGRESS, which means that all maps are not yet complete.\n
-		Please visit the project forums to discuss the game with other players or to help make the game even better (see "about").\n
-		\n
-		Thanks for all the feedback!
-	</string>
-
-	<string name="questlog_includecompleted_prompt">Select quests to show</string>
-	<string name="questlog_includecompleted_hidecompleted">Hide completed quests</string>
-	<string name="questlog_includecompleted_includecompleted">Include completed quests</string>
-	<string name="questlog_includecompleted_onlycompleted">Only completed quests</string>
-	<string name="questlog_queststatus">Status: %1$s</string>
-	<string name="questlog_queststatus_inprogress">In progress</string>
-	<string name="questlog_queststatus_completed">Completed</string>
-
-	<string name="preferences_display_category">Display</string>
-	<string name="preferences_display_fullscreen_title">Fullscreen</string>
-	<string name="preferences_display_fullscreen">Displays the game in fullscreen mode. (Requires restart)</string>
-	<string name="preferences_dialog_category">Dialog confirmation</string>
-	<string name="preferences_dialog_confirmrest_title">Confirm rest</string>
-	<string name="preferences_dialog_confirmrest">Gives a question about whether you want to rest when entering a bed. Otherwise, you will always automatically rest.</string>
-	<string name="preferences_dialog_confirmattack_title">Confirm attack</string>
-	<string name="preferences_dialog_confirmattack">Enables the \'Do you want to attack..?\' dialog box when attacking a monster.</string>
-	<string name="preferences_dialog_monsterloot_title">Display monster loot</string>
-	<string name="preferences_dialog_monsterloot">Choose how you want to show the results of a fight to be shown (gold, experience, items).</string>
-	<string name="preferences_combat_category">Combat</string>
-	<string name="preferences_combat_speed_title">Combat speed</string>
-	<string name="preferences_combat_speed">Determines how fast monsters attack.</string>
-
-	<string name="preferences_display_loot_dialog">Always show loot dialog box</string>
-	<string name="preferences_display_loot_dialog_on_items">Show loot dialog box when finding items</string>
-	<string name="preferences_display_loot_dialog_on_items_or_toast">Dialog for items, notif. otherwise</string>
-	<string name="preferences_display_loot_toast">Show short notification</string>
-	<string name="preferences_display_loot_toast_on_items">Show notification only when finding items</string>
-	<string name="preferences_display_loot_never">Do not display</string>
-
-	<string name="preferences_attackspeed_instant">Instant (no animations)</string>
-	<string name="preferences_attackspeed_fast">Fast</string>
-	<string name="preferences_attackspeed_normal">Normal</string>
-	<string name="preferences_attackspeed_slow">Slow</string>
-
-	<string name="preferences_movement_category">Movement</string>
-	<string name="preferences_movementmethod_title">Movement method</string>
-	<string name="preferences_movementmethod">Type of movement method and handling of obstacles.</string>
-	<string name="preferences_movementmethods_straight">Straight (original)</string>
-	<string name="preferences_movementmethods_avoid">Avoiding obstacles</string>
-
-
-	<!-- =========================================== -->
-	<!-- Added in v0.6.9 -->
-
-	<string name="actorinfo_currentconditions">Active conditions</string> <!-- Translated as: affliction / statuseffect / temporary effect -->
-	<string name="actorcondition_info_removes_all">Removes all %1$s</string>
-	<string name="actorcondition_info_immunity">Immune to %1$s</string>
-	<string name="iteminfo_effect_chance_of">%1$s chance of %2$s</string>
-	<string name="iteminfo_effect_duration">(%1$d rounds)</string>
-
-	<string name="iteminfo_effect_works_on_source">On source</string>
-	<string name="iteminfo_effect_works_on_target">On target</string>
-	<string name="iteminfo_effect_works_on_attacker">On attacker</string>
-	<string name="iteminfo_effect_works_when_hitting_target">When hitting target</string>
-	<string name="iteminfo_effect_works_when_killing_target">On every kill</string>
-	<string name="iteminfo_effect_works_when_used">When used</string>
-	<string name="iteminfo_effect_works_when_equipped">When equipped</string>
-	<string name="iteminfo_effect_works_when_hit_by_attacker">When hit by attacker</string>
-	<string name="iteminfo_effect_works_when_killed_by_attacker">When killed by attacker</string>
-	
-	<string name="iteminfo_effect_decrease_current_hp">Drains %1$s HP</string>
-	<string name="iteminfo_effect_increase_current_hp">Restores %1$s HP</string>
-	<string name="iteminfo_effect_decrease_current_ap">Drains %1$s AP</string>
-	<string name="iteminfo_effect_increase_current_ap">Restores %1$s AP</string>
-
-	<string name="iteminfo_effect_increase_max_hp">Raises max HP +%1$d</string>
-	<string name="iteminfo_effect_decrease_max_hp">Lowers max HP by %1$d</string>
-	<string name="iteminfo_effect_increase_max_ap">Raises max AP +%1$d</string>
-	<string name="iteminfo_effect_decrease_max_ap">Lowers max AP by %1$d</string>
-	<string name="iteminfo_effect_increase_movecost">Move cost penalty +%1$d AP</string>
-	<string name="iteminfo_effect_decrease_movecost">Lowers move cost %1$d AP</string>
-
-	<string name="preferences_display_scaling_factor_title">Scaling factor</string>
-	<string name="preferences_display_scaling_factor">Makes the game view display everything larger.</string>
-	<string name="preferences_display_scaling_factor_normal">Normal size</string>
-	<string name="preferences_display_scaling_factor_50_percent_larger">1.5x size</string>
-	<string name="preferences_display_scaling_factor_double">Double size</string>
-
-	<string name="inventory_assign">Assign quick slot</string>
-	<string name="inventory_selectitem">Select item to assign</string>
-	<string name="inventory_assign_slot1">Slot 1</string>
-	<string name="inventory_assign_slot2">Slot 2</string>
-	<string name="inventory_assign_slot3">Slot 3</string>
-	<string name="inventory_unassign">Un-assign quick slot</string>
-
-	<!-- =========================================== -->
-	<!-- Added in v0.6.10 -->
-
-	<string name="preferences_movement_dpad_position_title">Virtual d-pad</string>
-	<string name="preferences_movement_dpad_position">Enables a virtual on-screen directional pad to guide movement.</string>
-	<string name="preferences_movement_dpad_minimizeable_title">Minimizable d-pad</string>
-	<string name="preferences_movement_dpad_minimizeable">If the virtual d-pad is enabled, this setting allows the d-pad to be minimized by pressing its center.</string>
-
-	<string name="preferences_movement_dpad_positions_disabled">Disabled</string>
-	<string name="preferences_movement_dpad_positions_lower_right">Lower right corner</string>
-	<string name="preferences_movement_dpad_positions_lower_left">Lower left corner</string>
-	<string name="preferences_movement_dpad_positions_center_bottom">Center bottom</string>
-	<string name="preferences_movement_dpad_positions_center_left">Center left</string>
-	<string name="preferences_movement_dpad_positions_center_right">Center right</string>
-	<string name="preferences_movement_dpad_positions_upper_left">Upper left corner</string>
-	<string name="preferences_movement_dpad_positions_upper_right">Upper right corner</string>
-	<string name="preferences_movement_dpad_positions_center_top">Center top</string>
-
-	<string name="actorconditioninfo_constant_effect">Constant effect</string>
-	<string name="actorconditioninfo_effect_every_round">Every round</string>
-	<string name="actorconditioninfo_effect_every_full_round">Every full round</string>
-	<string name="bulkselection_totalcost_buy">Total cost: %1$d gold</string>
-	<string name="bulkselection_totalcost_sell">Total cost: %1$d gold</string>
-	<string name="bulkselection_select_all">All</string>
-	<string name="bulkselection_sell_confirmation_title">Are you sure?</string>
-	<string name="bulkselection_sell_confirmation">Are you sure you want to sell %1$s? This item is %2$s and you might not be able to recover it.</string>
-
-	<string name="skill_title_weapon_chance">Weapon Accuracy</string>
-	<string name="skill_title_weapon_dmg">Hard Hit</string>
-	<string name="skill_title_barter">Merchant</string>
-	<string name="skill_title_dodge">Dodge</string>
-	<string name="skill_title_barkskin">Bark Skin</string>
-	<string name="skill_title_more_criticals">More Criticals</string>
-	<string name="skill_title_better_criticals">Better Criticals</string>
-	<string name="skill_title_speed">Combat Speed</string>
-	<string name="skill_title_coinfinder">Treasure Hunter</string>
-	<string name="skill_title_more_exp">Quick Learner</string>
-	<string name="skill_title_cleave">Cleave</string>
-	<string name="skill_title_eater">Corpse Eater</string>
-	<string name="skill_title_fortitude">Increased Fortitude</string>
-	<string name="skill_title_evasion">Evasion</string>
-	<string name="skill_title_regeneration">Regeneration</string>
-	<string name="skill_title_lower_exploss">Failure Mastery</string>
-	<string name="skill_title_magicfinder">Magic Finder</string>
-	<string name="skill_title_resistance_mental">Strong Mind</string>
-	<string name="skill_title_resistance_physical_capacity">Enduring Body</string>
-	<string name="skill_title_resistance_blood_disorder">Pure Blood</string>
-
-	<string name="skill_shortdescription_weapon_chance">Increased attack chance</string>
-	<string name="skill_shortdescription_weapon_dmg">Increased attack damage</string>
-	<string name="skill_shortdescription_barter">Better shop prices</string>
-	<string name="skill_shortdescription_dodge">Increased block chance</string>
-	<string name="skill_shortdescription_barkskin">Damage resistance</string>
-	<string name="skill_shortdescription_more_criticals">Increased critical skill</string>
-	<string name="skill_shortdescription_better_criticals">Increased critical damage</string>
-	<string name="skill_shortdescription_speed">Increased maximum action points</string>
-	<string name="skill_shortdescription_coinfinder">Higher chance of finding gold</string>
-	<string name="skill_shortdescription_more_exp">More experience from monster kills</string>
-	<string name="skill_shortdescription_cleave">Recover action points on every kill</string>
-	<string name="skill_shortdescription_eater">Recover health points on every kill</string>
-	<string name="skill_shortdescription_fortitude">Gain health on each level up</string>
-	<string name="skill_shortdescription_evasion">Increased chance of fleeing</string>
-	<string name="skill_shortdescription_regeneration">Gain health every round</string>
-	<string name="skill_shortdescription_lower_exploss">Decrease amount of lost experience when dying</string>
-	<string name="skill_shortdescription_magicfinder">Increased chance of finding magic items</string>
-	<string name="skill_shortdescription_resistance_mental">Resistance against mental conditions</string>
-	<string name="skill_shortdescription_resistance_physical_capacity">Resistance against physical capacity conditions</string>
-	<string name="skill_shortdescription_resistance_blood_disorder">Resistance against blood disorders</string>
-
-	<string name="skill_longdescription_weapon_chance">Increases attack chance by %1$d percentage points for each skill level.</string>
-	<string name="skill_longdescription_weapon_dmg">Increases max damage by %1$d for each skill level.</string>
-	<string name="skill_longdescription_barter">For every skill level, decreases the buying and selling gold penalty by %1$d percentage points.</string>
-	<string name="skill_longdescription_dodge">Increases block chance by %1$d percentage points for each skill level.</string>
-	<string name="skill_longdescription_barkskin">Increases damage resistance by %1$d for each skill level.</string>
-	<string name="skill_longdescription_more_criticals">Increases any existing critical skill given by equipment by %1$d %% for each skill level.</string>
-	<string name="skill_longdescription_better_criticals">Increases any existing critical multiplier given by equipment by %1$d %% for each skill level.</string>
-	<string name="skill_longdescription_speed">Increases maximum action points (AP) by %1$d for each skill level.</string>
-	<string name="skill_longdescription_coinfinder">Increases chance of finding gold in monster drops by %1$d %%, and increases amount of gold in drops by %2$d %% for each skill level (up to the maximum amount that the monster drops).</string>
-	<string name="skill_longdescription_more_exp">Increases amount of exp given by defeating monsters by %1$d %% for each skill level.</string>
-	<string name="skill_longdescription_cleave">Gives +%1$d action points (AP) on every kill per skill level.</string>
-	<string name="skill_longdescription_eater">Gives +%1$d health points (HP) on every kill per skill level.</string>
-	<string name="skill_longdescription_fortitude">On every subsequent level-up, maximum health points (HP) will be raised by %1$d per skill level. This is not applied retroactively, only subsequent level-ups will be affected.</string>
-	<string name="skill_longdescription_evasion">For every skill level, reduces both the chance of failed flee attempts by %1$d %% and the chance that an adjacent monster will attack by %2$d %%.</string>
-	<string name="skill_longdescription_regeneration">Gain +%1$d health points (HP) on every round per skill level when no monsters are directly adjacent.</string>
-	<string name="skill_longdescription_lower_exploss">For every skill level, reduces the amount of lost experience caused by death by %1$d %% (percentage of existing exp loss value, not percentage points). %2$d levels will remove all experience loss caused by death.</string>
-	<string name="skill_longdescription_magicfinder">Increases the chance of finding non-ordinary items by %1$d %% for every skill level.</string>
-	<string name="skill_longdescription_resistance_mental">Lowers the chance of being afflicted with mental conditions by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Dazed or Weapon Feebleness.</string>
-	<string name="skill_longdescription_resistance_physical_capacity">Lowers the chance of being afflicted with conditions affecting your physical capacity by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Fatigue.</string>
-	<string name="skill_longdescription_resistance_blood_disorder">Lowers the chance of being afflicted with disorders of the blood by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Poison or bleeding wounds.</string>
-
-	<string name="skillinfo_action_levelup">Level up</string>
-	<string name="skill_current_level">Current level: %1$d</string>
-	<string name="skill_current_level_with_maximum">Current level: %1$d / %2$d</string>
-	<string name="skill_prerequisite_other_skill">To level up this skill, you need at least level %1$d of the %2$s skill.</string>
-	<string name="skill_prerequisite_level">To level up this skill, you need at least experience level %1$d.</string>
-	<string name="skill_prerequisite_stat">To level up this skill, you need at least %1$d %2$s (base stats).</string>
-	<string name="skill_number_of_increases_one">You may select one skill to increase.</string>
-	<string name="skill_number_of_increases_several">You may select %1$d skills to increase.</string>
-	<string name="levelup_adds_new_skillpoint">This level also gives you a new skill point to spend!</string>
-
-	<string name="loadsave_save_to_new_slot">Create new savegame slot</string>
-	<string name="loadsave_save_overwrite_confirmation_title">Overwrite savegame?</string>
-	<string name="loadsave_save_overwrite_confirmation">This savegame contains a different player name (%1$s) than your current player name (%2$s). Are you sure you want to overwrite this savegame?</string>
-
-	<string name="iteminfo_displaytypes_ordinary">Ordinary</string>
-	<string name="iteminfo_displaytypes_quest">Quest item</string>
-	<string name="iteminfo_displaytypes_legendary">Legendary</string>
-	<string name="iteminfo_displaytypes_extraordinary">Extraordinary</string>
-	<string name="iteminfo_displaytypes_rare">Rare</string>
-
-	<string name="actorconditioninfo_category">Condition category: %1$s</string>
-	<string name="actorcondition_categories_spiritual">Spiritual</string>
-	<string name="actorcondition_categories_mental">Mental</string>
-	<string name="actorcondition_categories_physical">Physical Capacity</string>
-	<string name="actorcondition_categories_blood">Blood Disorder</string>
-
-	<string name="traitsinfo_base_max_hp">Max HP:</string>
-	<string name="traitsinfo_base_max_ap">Max AP:</string>
-	<string name="menu_save_saving_not_allowed_in_combat">Cannot save the game while in combat.</string>
-
-	<string name="preferences_optimized_drawing_title">Optimized drawing</string>
-	<string name="preferences_optimized_drawing">Disable this if you see graphical artifacts. Enabling this option will make the game only redraw changed parts of the screen every frame.</string>
-
-	<!-- =========================================== -->
-	<!-- Added in v0.6.11 -->
-
-	<string name="skill_title_shadow_bless">Dark blessing of the Shadow</string>
-	<string name="skill_shortdescription_shadow_bless">Resistance against all types of conditions</string>
-	<string name="skill_longdescription_shadow_bless">Lowers the chance of being afflicted with all types of conditions by %1$d %%. This includes all types of conditions caused by monster attacks such as Poison, Dazed or Fatigue.</string>
-
-	<string name="inventory_movetop">Move to top</string>
-	<string name="inventory_movebottom">Move to bottom</string>
-	<string name="actorinfo_immune_criticals">Immune to critical hits</string>
-	<string name="traitsinfo_criticalhit_effectivechance">Effective critical chance:</string>
-
-	<string name="skill_title_crit1">Internal bleeding</string>
-	<string name="skill_shortdescription_crit1">Chance of internal bleeding</string>
-	<string name="skill_longdescription_crit1">For every critical hit made, there is a %1$d %% chance that the hit will cause internal bleeding on the target, effectively causing the \'Internal bleeding\' condition on the target. Internal bleeding severely lowers offensive combat abilities, making the target less able to land successful attacks.</string>
-	<string name="skill_title_crit2">Fracture</string>
-	<string name="skill_shortdescription_crit2">Chance of bone fracture</string>
-	<string name="skill_longdescription_crit2">For every critical hit made, there is a %1$d %% chance that the hit will fracture some of the target\'s bones, effectively causing the \'Fracture\' condition on the target. This will severely lower the target\'s defensive combat abilities, making it less able to defend itself in subsequent attacks.</string>
-	<string name="skill_title_rejuvenation">Rejuvenation</string>
-	<string name="skill_shortdescription_rejuvenation">Chance of effect removal</string>
-	<string name="skill_longdescription_rejuvenation">Every round (6 seconds), there is a %1$d %% chance that one of the active negative actor conditions will be lowered by one magnitude. This applies to all temporary effect types that affect the body; mental conditions such as Dazed, physical capacity conditions such as Fatigue and also blood disorders such as poison.</string>
-	<string name="skill_title_taunt">Taunt</string>
-	<string name="skill_shortdescription_taunt">Attacker loses AP on miss</string>
-	<string name="skill_longdescription_taunt">When an attacker makes an attack that misses, there is a %1$d %% chance that the attacker loses %2$d action points (AP). This applies to all types of melee attacks against you.</string>
-	<string name="skill_title_concussion">Concussion</string>
-	<string name="skill_shortdescription_concussion">Chance of concussion</string>
-	<string name="skill_longdescription_concussion">When making an attack on a target whose block chance (BC) is at least %1$d lower than your attack chance (AC), there is a %2$d %% chance that the hit will cause a concussion on the target. A concussion will severely lower the target\'s offensive combat abilities, making the target less able to land successful attacks.</string>
-
-	<string name="about_button4">About</string>
-
-	<!-- =========================================== -->
-	<!-- Added in v0.6.12 -->
-
-	<string name="preferences_ui_category">Interface</string>
-	<string name="preferences_ui_enable_animations_title">Enable animations</string>
-	<string name="preferences_ui_enable_animations">Show animations for various interface elements, such as the combat bar.</string>
-	<string name="menu_button_worldmap">Map</string>
-	<string name="menu_button_worldmap_failed">Map cannot be displayed.</string>
-	<string name="display_worldmap_not_available">The map cannot be displayed from this location.</string>
-	<string name="display_worldmap_title">Map</string>
-
-	<string name="inventory_equip_offhand">Equip (offhand)</string>
-
-	<string name="iteminfo_effect_weapon_attack_cost">Attack cost: %1$d AP</string>
-	<string name="iteminfo_effect_increase_attack_cost">Increases attack cost by %1$d AP</string>
-	<string name="iteminfo_effect_decrease_attack_cost">Lowers attack cost by %1$d AP</string>
-	<string name="iteminfo_effect_weapon_attack_chance">Attack chance: %1$d</string>
-	<string name="iteminfo_effect_increase_attack_chance">Increases attack chance by %1$d</string>
-	<string name="iteminfo_effect_decrease_attack_chance">Lowers attack chance by %1$d</string>
-	<string name="iteminfo_effect_weapon_attack_damage">Attack damage: %1$d</string>
-	<string name="iteminfo_effect_weapon_attack_damage_minmax">Attack damage: %1$d-%2$d</string>
-	<string name="iteminfo_effect_increase_attack_damage">Increases attack damage by %1$d</string>
-	<string name="iteminfo_effect_increase_attack_damage_minmax">Increases attack damage by %1$d-%2$d</string>
-	<string name="iteminfo_effect_decrease_attack_damage">Lowers attack damage by %1$d</string>
-	<string name="iteminfo_effect_decrease_attack_damage_minmax">Lowers attack damage by %1$d-%2$d</string>
-	<string name="iteminfo_effect_increase_critical_skill">Increases critical skill by %1$d</string>
-	<string name="iteminfo_effect_decrease_critical_skill">Lowers critical skill by %1$d</string>
-	<string name="iteminfo_effect_critical_multiplier">Enables critical hits with a multiplier of x%1$.1f</string>
-	<string name="iteminfo_effect_increase_block_chance">Increases block chance by %1$d</string>
-	<string name="iteminfo_effect_decrease_block_chance">Lowers block chance by %1$d</string>
-	<string name="iteminfo_effect_increase_damage_resistance">Raises damage resistance by %1$d</string>
-	<string name="iteminfo_effect_decrease_damage_resistance">Lowers damage resistance by %1$d</string>
-	<string name="iteminfo_effect_increase_use_cost">Increases AP cost of using items in combat by %1$d AP</string>
-	<string name="iteminfo_effect_decrease_use_cost">Lowers AP cost of using items in combat by %1$d AP</string>
-	<string name="iteminfo_effect_increase_reequip_cost">Increases AP cost of equipping items in combat by %1$d AP</string>
-	<string name="iteminfo_effect_decrease_reequip_cost">Lowers AP cost of equipping items in combat by %1$d AP</string>
-
-	<string name="loadsave_save_overwrite_confirmation_all">Are you sure you want to overwrite this savegame?</string>
-	<string name="loadsave_save_overwrite_confirmation_slot">(slot %1$d)</string>
-	<string name="preferences_display_overwrite_savegame_entries_always_confirm">Always show confirmation dialog box</string>
-	<string name="preferences_display_overwrite_savegame_entries_confirm_overwrite">Only show when overwriting a different playername</string>
-	<string name="preferences_display_overwrite_savegame_entries_never_confirm">Never display confirmation dialog box</string>
-	<string name="preferences_dialog_overwrite_savegame_title">Confirm overwriting savegames</string>
-	<string name="preferences_dialog_overwrite_savegame">Gives a question about whether you want to overwrite when saving to a savegame slot that already contains a savegame.</string>
-
-	<!-- =========================================== -->
-	<!-- Added in v0.7.0 -->
-
-	<string name="heroinfo_reequip_cost">Re-equip cost (AP):</string>
-	<string name="heroinfo_useitem_cost">Use item cost (AP):</string>
-	<string name="combat_result_monstermoved">%1$s moves.</string>
-	<string name="combat_log_title">Combat log</string>
-	<string name="localize_resources_from_mo_filename"></string>
-	<string name="conversation_reward_quest_finished">[Quest completed: \"%1$s\"]</string>
-	<string name="conversation_reward_quest_updated">[Quest updated: \"%1$s\"]</string>
-
-	<string name="skill_title_weapon_prof_dagger">Dagger proficiency</string>
-	<string name="skill_title_weapon_prof_1hsword">One-handed sword proficiency</string>
-	<string name="skill_title_weapon_prof_2hsword">Two-handed sword proficiency</string>
-	<string name="skill_title_weapon_prof_axe">Axe proficiency</string>
-	<string name="skill_title_weapon_prof_blunt">Bludgeoning weapon proficiency</string>
-	<string name="skill_title_weapon_prof_unarmed">Unarmed fighting</string>
-	<string name="skill_title_armor_prof_shield">Shield proficiency</string>
-	<string name="skill_title_armor_prof_unarmored">Unarmored fighting</string>
-	<string name="skill_title_armor_prof_light">Light armor proficiency</string>
-	<string name="skill_title_armor_prof_heavy">Heavy armor proficiency</string>
-	<string name="skill_title_fightstyle_dualwield">Fighting style: Dual wield</string>
-	<string name="skill_title_fightstyle_2hand">Fighting style: Two-handed weapon</string>
-	<string name="skill_title_fightstyle_weapon_shield">Fighting style: Weapon and shield</string>
-	<string name="skill_title_specialization_dualwield">Specialization: Dual wield</string>
-	<string name="skill_title_specialization_2hand">Specialization: Two-handed weapon</string>
-	<string name="skill_title_specialization_weapon_shield">Specialization: Weapon and shield</string>
-
-	<string name="skill_shortdescription_weapon_prof_dagger">Better at fighting with daggers</string>
-	<string name="skill_shortdescription_weapon_prof_1hsword">Better at fighting with one-handed swords</string>
-	<string name="skill_shortdescription_weapon_prof_2hsword">Better at fighting with two-handed swords</string>
-	<string name="skill_shortdescription_weapon_prof_axe">Better at fighting with axes</string>
-	<string name="skill_shortdescription_weapon_prof_blunt">Better at fighting with bludgeoning weapons</string>
-	<string name="skill_shortdescription_weapon_prof_unarmed">Better at fighting without weapons</string>
-	<string name="skill_shortdescription_armor_prof_shield">Make better use of shields</string>
-	<string name="skill_shortdescription_armor_prof_unarmored">Better at fighting without armor</string>
-	<string name="skill_shortdescription_armor_prof_light">Make better use of light armor</string>
-	<string name="skill_shortdescription_armor_prof_heavy">Make better use of heavy armor</string>
-	<string name="skill_shortdescription_fightstyle_dualwield">Wield two weapons at the same time</string>
-	<string name="skill_shortdescription_fightstyle_2hand">Make better use of weapons that require both hands</string>
-	<string name="skill_shortdescription_fightstyle_weapon_shield">Better at fighting with weapon and shield</string>
-	<string name="skill_shortdescription_specialization_dualwield">Expert at dual wielding</string>
-	<string name="skill_shortdescription_specialization_2hand">Expert at two-handed weapons</string>
-	<string name="skill_shortdescription_specialization_weapon_shield">Expert at fighting with weapon and shield</string>
-
-	<string name="skill_longdescription_weapon_prof_dagger">For each skill level, increases attack chance when using daggers and shortswords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
-	<string name="skill_longdescription_weapon_prof_1hsword">For each skill level, increases attack chance of rapiers, longswords and broadswords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
-	<string name="skill_longdescription_weapon_prof_2hsword">For each skill level, increases attack chance of two-handed swords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
-	<string name="skill_longdescription_weapon_prof_axe">For each skill level, increases attack chance of axes and greataxes by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
-	<string name="skill_longdescription_weapon_prof_blunt">For each skill level, increases attack chance of bludgeoning weapons by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill. This includes clubs, quarterstaves, maces, scepters, warhammers and giant hammers.</string>
-	<string name="skill_longdescription_weapon_prof_unarmed">When fighting without a weapon and shield, gain %1$d attack chance, %2$d damage potential and %3$d block chance per skill level.</string>
-	<string name="skill_longdescription_armor_prof_shield">Increase damage resistance by %1$d per skill level while having a shield equipped.</string>
-	<string name="skill_longdescription_armor_prof_unarmored">While fighting without having any piece of armor equipped, gain %1$d block chance per skill level. Items made of cloth are not considered as being armor.</string>
-	<string name="skill_longdescription_armor_prof_light">For every skill level, increases the block chance of every piece of light armor being worn by %1$d %% of their original block chances. Light armors include leather, light metal and hide armors.</string>
-	<string name="skill_longdescription_armor_prof_heavy">For every skill level, increases the block chance of every piece of heavy armor being worn by %1$d %% of their original block chances. Pieces of heavy armor have their movement penalties reduced by %2$d %% per skill level, and their attack speed penalties reduced by %3$d %% per skill level. Heavy armors include metal armors, chain mail and plate mail.</string>
-	<string name="skill_longdescription_fightstyle_dualwield">"Gives benefits when fighting with two weapons at the same time, one in the main hand and one in the off-hand.
-
-Without this skill, only %1$d %% of a weapon\'s qualities may be used when equipped in the off-hand. This includes attack chance, critical skill, damage potential and block chance. Without this skill, attack speed (AP cost) of making an attack is the sum of the attack speed of the main weapon and that of the weapon used in the off-hand.
-
-With one level of this skill, %2$d %% of the off-hand\'s weapon\'s qualities may be used, and the attack speed is the highest attack speed of both weapons plus %3$d %% of the lowest attack speed of both weapons.
-
-With two levels of this skill, %4$d %% of the off-hand\'s weapon\'s qualities may be used, and the attack speed equals the highest of the attack speeds of the two equipped weapons."</string>
-	<string name="skill_longdescription_fightstyle_2hand">"Gives benefits when using weapons that require both hands to wield, such as two-handed swords, greataxes or giant hammers.
-
-Every skill level increases damage potential of two-handed weapons with %1$d %% of the original damage potential."</string>
-	<string name="skill_longdescription_fightstyle_weapon_shield">"Gives benefits when fighting with a weapon in the main hand and having a shield equipped in the off-hand.
-
-Every skill level increases the attack chance of weapons with %1$d %% of their original attack chances, and the block chance of shields by %2$d %% of their original block chances."</string>
-	<string name="skill_longdescription_specialization_dualwield">Increases the attack chance of both wielded weapons by an additional %1$d %% of their original attack chances, in addition to the benefits given by the weapon style skill. The block chances of both wielded weapons are also increased by %2$d %% of their original block chances.</string>
-	<string name="skill_longdescription_specialization_2hand">Increases damage potential of two-handed weapons by an additional %1$d %% of the original damage potential, in addition to the benefits given by the weapon style skill. The attack chances of two-handed weapons are also increased by %2$d %% of their original attack chances.</string>
-	<string name="skill_longdescription_specialization_weapon_shield">Increases both attack chances and damage potential of weapons. The attack chance is increased by %1$d %% of the original attack chance, and the damage potential is increased by %2$d %% of the original damage potential.</string>
-
-	<string name="preferences_quickslots_placement">Quickslot position</string>
-	<string name="preferences_quickslots_placement_summary">Where to place the quickslots</string>
-	<string name="preferences_quickslots_placements_horizontal_center_bottom">Center bottom</string>
-	<string name="preferences_quickslots_placements_vertical_center_left">Middle left</string>
-	<string name="preferences_quickslots_placements_vertical_center_right">Middle right</string>
-	<string name="preferences_quickslots_placements_vertical_bottom_left">Bottom left, along left border</string>
-	<string name="preferences_quickslots_placements_horizontal_bottom_left">Bottom left, along bottom border</string>
-	<string name="preferences_quickslots_placements_horizontal_bottom_right">Bottom right, along bottom border</string>
-	<string name="preferences_quickslots_placements_vertical_bottom_right">Bottom right, along right border</string>
-	<string name="preferences_ui_show_quickslots_when_toolbox_is_visible_title">Show quickslots when toolbox is opened</string>
-	<string name="preferences_ui_show_quickslots_when_toolbox_is_visible">Makes the quickslot buttons be displayed as soon as the toolbox is opened</string>
-	<string name="startscreen_incompatible_savegames">This is a development version of Andor\'s Trail. Savegames produced by this version are incompatible with the release version.</string>
-	<string name="startscreen_non_release_version">This is a prerelease version of Andor\'s Trail. Savegames produced by this version might not be compatible with the release version.</string>
-	<string name="heroinfo_gamestats">Game statistics</string>
-	<string name="heroinfo_gamestats_quests">Completed quests</string>
-	<string name="heroinfo_gamestats_deaths">Times fallen unconscious</string>
-	<string name="heroinfo_gamestats_spent_gold">Gold spent in shops</string>
-	<string name="heroinfo_gamestats_bonemeals">Bonemeal potions used</string>
-	<string name="heroinfo_gamestats_num_used_items">Items used</string>
-	<string name="heroinfo_gamestats_visited_maps">Places visited</string>
-	<string name="heroinfo_gamestats_fav_item">Most commonly used item</string>
-	<string name="heroinfo_gamestats_num_killed_monsters">Monsters killed</string>
-	<string name="heroinfo_gamestats_top_boss">Most powerful monster killed</string>
-	<string name="heroinfo_gamestats_fav_monsters">Most commonly killed monsters</string>
-	<string name="heroinfo_gamestats_name_and_qty">%1$s (%2$d)</string>
-
-	<!-- =========================================== -->
-	<!-- Added in v0.7.1 -->
-
-	<string name="preferences_ui_use_localized_resources_title">Use localized resources</string>
-	<string name="preferences_ui_use_localized_resources">Use translation of interface and content, where available. (requires restart)</string>
-	<string name="change_locale_requires_restart">Changing locale requires restart. Andor\'s Trail has been closed.</string>
-
-	<string name="inventory_category_all">All</string>
-	<string name="inventory_category_favorites">Favorites</string>
-	<string name="inventory_category_weapons">Weapon</string>
-	<string name="inventory_category_armor">Armor</string>
-	<string name="inventory_category_usable">Consumable</string>
-	<string name="inventory_category_quest">Quest Item</string>
-	<string name="inventory_category_other">Other</string>
-
-	<string name="inventory_sort_custom">Unsorted</string>
-	<string name="inventory_sort_name">Name</string>
-	<string name="inventory_sort_price">Price</string>
-	<string name="inventory_sort_quantity">Quantity</string>
-	<string name="inventory_sort_rarity">Rarity</string>
-	<string name="inventory_sort_type">Type</string>
-
-	<string name="shoplist_sort_custom">Unsorted</string>
-	<string name="shoplist_sort_name">Name</string>
-	<string name="shoplist_sort_price">Price</string>
-	<string name="shoplist_sort_quantity">Quantity</string>
-	<string name="shoplist_sort_rarity">Rarity</string>
-	<string name="shoplist_sort_type">Type</string>
-
-	<string name="skill_category_all">All</string>
-	<string name="skill_category_offense"> Offense</string>
-	<string name="skill_category_defense">Defense</string>
-	<string name="skill_category_criticals">Criticals</string>
-	<string name="skill_category_immunity">Immunity</string>
-	<string name="skill_category_utility">Utility</string>
-	<string name="skill_category_speciality">Speciality</string>
-	<string name="skill_category_proficiency">Proficiency</string>
-
-	<string name="skill_sort_unsorted">Unsorted</string>
-	<string name="skill_sort_name">Name</string>
-	<string name="skill_sort_points">Points</string>
-	<string name="skill_sort_unlocked">Unlocked</string>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+	<string name="app_name">Andor\'s Trail</string>
+	<string name="app_description">Quest-driven fantasy RPG</string>
+
+	<string name="exit_to_menu">Exit to menu</string>
+	<string name="menu_settings">Preferences</string>
+	<string name="menu_save">Save</string>
+	<string name="menu_save_gamesaved">Game was saved to slot %1$d</string>
+	<string name="menu_save_failed">Failed to save game! Is the SD card mounted and writable?</string>
+
+	<string name="loadsave_title_save">Save game</string>
+	<string name="loadsave_title_load">Load saved game</string>
+	<string name="loadsave_selectslot">Select slot</string>
+	<string name="savegame_currenthero_displayinfo">level %1$d, %2$d exp, %3$d gold</string>
+
+	<string name="dialog_loading_message">Loading resources…</string>
+	<string name="dialog_loading_failed_title">Load Failed</string>
+	<string name="dialog_loading_failed_message">Andor\'s Trail was unable to load the savegame file.\n\n:(\n\nThe file may be damaged or incomplete.</string>
+	<string name="dialog_loading_failed_incorrectversion">Andor\'s Trail was unable to load the savegame file. This savegame file is created with a newer version than what is currently running.</string>
+
+	<string name="dialog_recenter">Recenter</string>
+	<string name="dialog_close">Close</string>
+	<string name="dialog_more">More</string>
+
+	<string name="dialog_monsterencounter_title">Encounter</string>
+	<string name="dialog_monsterencounter_message">Do you want to attack?\nDifficulty: %1$s</string>
+	<string name="dialog_monsterencounter_info">Info</string>
+	<string name="dialog_monsterencounter_conditions">Conditions</string>
+
+	<string name="status_hp">HP:</string>
+	<string name="status_ap">AP:</string>
+	<string name="status_exp">XP:</string>
+
+	<string name="heroinfo_char">Overview</string>
+	<string name="heroinfo_inv">Items</string>
+	<string name="heroinfo_skill">Skills</string>
+	<string name="heroinfo_skill_categories">Category</string>
+	<string name="heroinfo_skill_sort">Sort</string>
+	<string name="heroinfo_levelup">Level up</string>
+	<string name="heroinfo_level">Level</string>
+	<string name="heroinfo_totalexperience">Total experience</string>
+	<string name="heroinfo_wornequipment">Worn equipment</string>
+	<string name="heroinfo_inventory">Inventory</string>
+	<string name="heroinfo_inventory_categories">Category</string>
+	<string name="heroinfo_inventory_sort">Sort By</string>
+	<string name="heroinfo_gold">Gold: %1$d</string>
+	<string name="heroinfo_healthpoints">Health points (HP):</string>
+	<string name="heroinfo_experiencepoints">Experience points (XP):</string>
+	<string name="heroinfo_actionpoints">Action points (AP):</string>
+	<string name="heroinfo_quests">Quests</string>
+
+	<string name="combat_attack">Attack (%1$d AP)</string>
+	<string name="combat_move">Move (%1$d AP)</string>
+	<string name="combat_use">Use item</string>
+	<string name="combat_endturn">End turn</string>
+	<!-- <string name="combat_endcombat">End combat</string>-->
+	<string name="combat_flee">Flee</string>
+	<string name="combat_begin_flee">You can now flee combat by clicking in the direction you want to move.</string>
+	<string name="combat_flee_failed">You failed to flee!</string>
+	<string name="combat_status_ap">AP: %1$d</string>
+	<string name="combat_monsterhealth">HP:</string>
+	<string name="combat_monsteraction">%1$s is attacking.</string>
+	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string> -->
+	<string name="combat_result_monstermiss">%1$s misses!</string>
+	<string name="combat_result_monsterhit">%1$s hits you for %2$d hp!</string>
+	<string name="combat_result_monsterhitcritical">%1$s gets a critical hit for %2$d hp!</string>
+	<string name="combat_result_heromiss">Your attack misses.</string>
+	<string name="combat_result_herohit">You hit %1$s for %2$d hp!</string>
+	<string name="combat_result_herohitcritical">You get a critical hit on %1$s for %2$d hp!</string>
+	<string name="combat_result_herokillsmonster">%1$s dies!</string>
+	<string name="combat_not_enough_ap">Not enough AP left this round.</string>
+	<string name="combat_hero_dies">You fall unconscious, but fortunately wake up alive, dazed and fatigued. You lost %1$d experience.</string>
+	<string name="combat_miss_animation_message">MISS</string>
+	<string name="combat_taunt_monster">You taunt %1$s!</string>
+	<string name="combat_condition_player_apply">You are affected by %1$s.</string>
+	<string name="combat_condition_player_clear">You are cleared of %1$s.</string>
+	<string name="combat_condition_player_immune">You are now immunized against %1$s.</string>
+	<string name="combat_condition_monster_apply">%1$s is affected by %2$s.</string>
+	<string name="combat_condition_monster_clear">%1$s is cleared of %2$s.</string>
+	<string name="combat_condition_monster_immune">%1$s is now immunized against %2$s.</string>
+	
+	
+	<string name="inventory_info">Info</string>
+	<string name="inventory_equip">Equip</string>
+	<string name="inventory_unequip">Unequip</string>
+	<string name="inventory_use">Use</string>
+	<string name="inventory_drop">Drop</string>
+	<string name="inventory_item_used">You used %1$s.</string>
+	<string name="inventory_item_dropped">%1$s was dropped.</string>
+	<string name="inventory_item_equipped">You equipped %1$s.</string>
+
+	<string name="dialog_loot_pickall">Pick up all</string>
+	<string name="dialog_loot_foundgold">You found %1$d gold. </string>
+	<string name="dialog_loot_pickedupitem">You picked up an item. </string>
+	<string name="dialog_loot_pickedupitems">You picked up %1$d items. </string>
+	<string name="dialog_groundloot_title">Items</string>
+	<string name="dialog_groundloot_message">You found some items. </string>
+	<string name="dialog_monsterloot_title">Victory</string>
+	<string name="dialog_monsterloot_message">You survived the encounter. </string>
+	<string name="dialog_monsterloot_gainedexp">You gained %1$d experience. </string>
+
+	<string name="monster_difficulty_veryeasy">Very easy</string>
+	<string name="monster_difficulty_easy">Easy</string>
+	<string name="monster_difficulty_normal">Normal</string>
+	<string name="monster_difficulty_hard">Hard</string>
+	<string name="monster_difficulty_veryhard">Very hard</string>
+	<string name="monster_difficulty_impossible">Impossible</string>
+
+	<string name="actorinfo_class">Class:</string>
+	<string name="actorinfo_difficulty">Difficulty:</string>
+	<string name="actorinfo_health">Health:</string>
+	<string name="actorinfo_attack">Attack:</string>
+	<string name="actorinfo_defense">Defense:</string>
+	<string name="actorinfo_movecost">Move cost (AP):</string>
+	<string name="actorinfo_basetraits">Base combat statistics (without equipment and skills)</string>
+	<string name="actorinfo_currenttraits">Combat statistics (current)</string>
+
+	<string name="traitsinfo_attack_cost">Attack cost (AP):</string>
+	<string name="traitsinfo_attack_chance">Attack chance:</string>
+	<string name="traitsinfo_attack_damage">Attack damage:</string>
+	<string name="traitsinfo_criticalhit_skill">Critical hit skill:</string>
+	<string name="traitsinfo_criticalhit_multiplier">Critical multiplier:</string>
+	<string name="traitsinfo_defense_chance">Block chance:</string>
+	<string name="traitsinfo_defense_damageresist">Damage resistance:</string>
+
+	<!-- <string name="key_required">A specific key is required to pass.</string> -->
+
+	<string name="iteminfo_category">Category: </string>
+	<string name="iteminfo_action_use">Use</string>
+	<string name="iteminfo_action_equip">Equip</string>
+	<string name="iteminfo_action_unequip">Unequip</string>
+	<string name="iteminfo_action_use_ap">Use (%1$d AP)</string>
+	<string name="iteminfo_action_equip_ap">Equip (%1$d AP)</string>
+	<string name="iteminfo_action_unequip_ap">Unequip (%1$d AP)</string>
+
+	<string name="startscreen_continue">Continue current game</string>
+	<string name="startscreen_newgame">New game</string>
+	<string name="startscreen_newgame_start">Start game</string>
+	<string name="startscreen_newgame_confirm">You will lose your current game and your current character, are you sure you want to start a new game?</string>
+	<string name="startscreen_about">About/help</string>
+	<string name="startscreen_selectherosprite">Choose your hero</string>
+	<string name="startscreen_enterheroname">Enter hero name</string>
+	<string name="startscreen_load">Load</string>
+
+	<!-- <string name="conversation_title">%1$s says</string> -->
+	<string name="conversation_rewardexp"> [You gained %1$d experience]</string>
+	<string name="conversation_rewardgold"> [You gained %1$d gold]</string>
+	<string name="conversation_lostgold"> [You lost %1$d gold]</string>
+	<string name="conversation_rewarditem"> [You gained an item]</string>
+	<string name="conversation_rewarditems"> [You gained %1$d items]</string>
+	<string name="conversation_next">Next</string>
+	<string name="conversation_leave">Leave</string>
+
+	<string name="shop_buy">Buy</string>
+	<string name="shop_sell">Sell</string>
+	<string name="shop_infoitem">Info</string>
+	<string name="shop_buyitem">Buy (%1$d gold)</string>
+	<string name="shop_sellitem">Sell (%1$d gold)</string>
+	<string name="shop_yourgold">Your gold: %1$d</string>
+	<string name="shop_item_bought">%1$s bought.</string>
+	<string name="shop_item_sold">%1$s sold.</string>
+	<string name="shop_item_sort">Sort</string>
+
+	<string name="levelup_title">Level up</string>
+	<string name="levelup_description">Welcome to level %1$d!</string>
+	<string name="levelup_buttontext">Level up</string>
+	<string name="levelup_add_health">Increase health (+%1$d HP)</string>
+	<string name="levelup_add_health_description">Adds %1$d to your maximum health.</string>
+	<string name="levelup_add_attackchance">Increase attack chance (+%1$d)</string>
+	<string name="levelup_add_attackchance_description">Adds %1$d to your base attack chance.</string>
+	<string name="levelup_add_attackdamage">Increase attack damage (+%1$d)</string>
+	<string name="levelup_add_attackdamage_description">Adds %1$d to your base attack damage.</string>
+	<string name="levelup_add_blockchance">Increase block chance (+%1$d)</string>
+	<string name="levelup_add_blockchance_description">Adds %1$d to your base block chance.</string>
+
+	<string name="dialog_rest_title">Rest</string>
+	<string name="dialog_rest_confirm_message">Do you want to rest here?</string>
+	<string name="dialog_rest_message">You have rested and regained your full health.</string>
+
+	<string name="about_button1">Help</string>
+	<string name="about_button2">Authors</string>
+	<string name="about_button3">License</string>
+	<string name="about_contents1">
+		Welcome to Andor\'s Trail, an open-source roguelike RPG on Android.&lt;br /&gt;
+		&lt;br /&gt;
+		&lt;a href="http://andorstrail.com/"&gt;Game forums on andorstrail.com for questions and gameplay discussions.&lt;/a&gt;&lt;br /&gt;
+		&lt;br /&gt;
+		&lt;a href="http://andorstrail.com/wiki"&gt;Game wiki for info about the Andor\'s Trail world, among other things.&lt;/a&gt;&lt;br /&gt;
+		&lt;br /&gt;
+		&lt;a href="https://github.com/Zukero/andors-trail/"&gt;Project source code on github.com for developers.&lt;/a&gt;&lt;br /&gt;
+		&lt;br /&gt;
+		Please visit the forums to discuss the game with other players.&lt;br /&gt;
+	</string>
+
+	<!--
+		This is the GNU GPL v2 text, originally from
+			http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+		For translation of this text, you might be able to find a version in your language here:
+			http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
+	-->
+	<string name="about_contents3">
+		This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.&lt;br /&gt;
+		&lt;br /&gt;
+		This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&lt;br /&gt;
+		&lt;br /&gt;
+		You should have received a copy of the GNU General Public License along with this program; if not, see &lt;a href="http://www.gnu.org/licenses"&gt;http://www.gnu.org/licenses&lt;/a&gt;&lt;br /&gt;
+		&lt;br /&gt;
+		For source code and feature requests, please visit the project page at &lt;a href="https://github.com/Zukero/andors-trail/"&gt;https://github.com/Zukero/andors-trail/&lt;/a&gt;&lt;br /&gt;
+	</string>
+	<string name="about_interface"><![CDATA[
+
+<div><b>Game Settings</b> can be found by pressing your device\'s Menu Button.</div>
+
+<p>________________</p>
+<h1>Interface Icons</h1>
+
+<div><b>The Chest</b><img alt="chest" src="chest.png" /></div>
+<p>Quickslots [Long press the pouches inside to assign items for instant use]</p>
+
+<div><b>The Hero</b><img alt="hero" src="char_hero.png" /></div>
+<p>Menu [Overview, Quests, Skills &amp; Inventory *]</p>
+<p>* (While in inventory, "press" an item for information &amp; "long press" for more options)</p>
+
+<div><b>The Enemy</b><img alt="monster" src="monster.png" /></div>
+<p>Information [Appears during Combat]</p>
+
+
+
+<p>________________</p>
+<h1>Combat</h1>
+
+<p>Actions taken during battle cost AP...</p>
+
+<div><b>Attacking</b> - [3AP] *</div>
+<img alt="attacking" src="doubleattackexample.png" />
+<p>* (Equipping Gear &amp; Using Items may alter AP &amp; usage cost)</p>
+
+<div><b>Using Items</b> - [5AP]</div>
+<div><b>Fleeing</b> - [6AP]</div>
+
+
+
+<p>________________</p>
+<h1>Advanced Combat</h1>
+
+<div>During Combat, long press a tile adjacent to the Hero...</div>
+
+<div><b>To Flee</b></div>
+<p>(chosen tile is highlighted - Attack Button changes to Move)</p>
+<img alt="flee" src="flee_example.png" />
+<p>[flee mode activated - Long press enemy to re-enter combat]</p>
+
+<div><b>To Change Targets</b></div>
+<p>(the red target highlight shifts between enemies)</p>
+<p>[the target has been changed]</p>
+
+]]></string>
+
+	<string name="dialog_newversion_title">Welcome</string>
+	<string name="dialog_newversion_message">
+		Thank you for downloading Andor\'s Trail!\n\n
+		Please note that this version of Andor\'s Trail is a WORK IN PROGRESS, which means that all maps are not yet complete.\n
+		Please visit the project forums to discuss the game with other players or to help make the game even better (see "about").\n
+		\n
+		Thanks for all the feedback!
+	</string>
+
+	<string name="questlog_includecompleted_prompt">Select quests to show</string>
+	<string name="questlog_includecompleted_hidecompleted">Hide completed quests</string>
+	<string name="questlog_includecompleted_includecompleted">Include completed quests</string>
+	<string name="questlog_includecompleted_onlycompleted">Only completed quests</string>
+	<string name="questlog_queststatus">Status: %1$s</string>
+	<string name="questlog_queststatus_inprogress">In progress</string>
+	<string name="questlog_queststatus_completed">Completed</string>
+
+	<string name="preferences_display_category">Display</string>
+	<string name="preferences_display_fullscreen_title">Fullscreen</string>
+	<string name="preferences_display_fullscreen">Displays the game in fullscreen mode. (Requires restart)</string>
+	<string name="preferences_dialog_category">Dialog confirmation</string>
+	<string name="preferences_dialog_confirmrest_title">Confirm rest</string>
+	<string name="preferences_dialog_confirmrest">Gives a question about whether you want to rest when entering a bed. Otherwise, you will always automatically rest.</string>
+	<string name="preferences_dialog_confirmattack_title">Confirm attack</string>
+	<string name="preferences_dialog_confirmattack">Enables the \'Do you want to attack..?\' dialog box when attacking a monster.</string>
+	<string name="preferences_dialog_monsterloot_title">Display monster loot</string>
+	<string name="preferences_dialog_monsterloot">Choose how you want to show the results of a fight to be shown (gold, experience, items).</string>
+	<string name="preferences_combat_category">Combat</string>
+	<string name="preferences_combat_speed_title">Combat speed</string>
+	<string name="preferences_combat_speed">Determines how fast monsters attack.</string>
+
+	<string name="preferences_display_loot_dialog">Always show loot dialog box</string>
+	<string name="preferences_display_loot_dialog_on_items">Show loot dialog box when finding items</string>
+	<string name="preferences_display_loot_dialog_on_items_or_toast">Dialog for items, notif. otherwise</string>
+	<string name="preferences_display_loot_toast">Show short notification</string>
+	<string name="preferences_display_loot_toast_on_items">Show notification only when finding items</string>
+	<string name="preferences_display_loot_never">Do not display</string>
+
+	<string name="preferences_attackspeed_instant">Instant (no animations)</string>
+	<string name="preferences_attackspeed_fast">Fast</string>
+	<string name="preferences_attackspeed_normal">Normal</string>
+	<string name="preferences_attackspeed_slow">Slow</string>
+
+	<string name="preferences_movement_category">Movement</string>
+	<string name="preferences_movementmethod_title">Movement method</string>
+	<string name="preferences_movementmethod">Type of movement method and handling of obstacles.</string>
+	<string name="preferences_movementmethods_straight">Straight (original)</string>
+	<string name="preferences_movementmethods_avoid">Avoiding obstacles</string>
+
+
+	<!-- =========================================== -->
+	<!-- Added in v0.6.9 -->
+
+	<string name="actorinfo_currentconditions">Active conditions</string> <!-- Translated as: affliction / statuseffect / temporary effect -->
+	<string name="actorcondition_info_removes_all">Removes all %1$s</string>
+	<string name="actorcondition_info_immunity">Immune to %1$s</string>
+	<string name="iteminfo_effect_chance_of">%1$s chance of %2$s</string>
+	<string name="iteminfo_effect_duration">(%1$d rounds)</string>
+
+	<string name="iteminfo_effect_works_on_source">On source</string>
+	<string name="iteminfo_effect_works_on_target">On target</string>
+	<string name="iteminfo_effect_works_on_attacker">On attacker</string>
+	<string name="iteminfo_effect_works_when_hitting_target">When hitting target</string>
+	<string name="iteminfo_effect_works_when_killing_target">On every kill</string>
+	<string name="iteminfo_effect_works_when_used">When used</string>
+	<string name="iteminfo_effect_works_when_equipped">When equipped</string>
+	<string name="iteminfo_effect_works_when_hit_by_attacker">When hit by attacker</string>
+	<string name="iteminfo_effect_works_when_killed_by_attacker">When killed by attacker</string>
+	
+	<string name="iteminfo_effect_decrease_current_hp">Drains %1$s HP</string>
+	<string name="iteminfo_effect_increase_current_hp">Restores %1$s HP</string>
+	<string name="iteminfo_effect_decrease_current_ap">Drains %1$s AP</string>
+	<string name="iteminfo_effect_increase_current_ap">Restores %1$s AP</string>
+
+	<string name="iteminfo_effect_increase_max_hp">Raises max HP +%1$d</string>
+	<string name="iteminfo_effect_decrease_max_hp">Lowers max HP by %1$d</string>
+	<string name="iteminfo_effect_increase_max_ap">Raises max AP +%1$d</string>
+	<string name="iteminfo_effect_decrease_max_ap">Lowers max AP by %1$d</string>
+	<string name="iteminfo_effect_increase_movecost">Move cost penalty +%1$d AP</string>
+	<string name="iteminfo_effect_decrease_movecost">Lowers move cost %1$d AP</string>
+
+	<string name="preferences_display_scaling_factor_title">Scaling factor</string>
+	<string name="preferences_display_scaling_factor">Makes the game view display everything larger.</string>
+	<string name="preferences_display_scaling_factor_normal">Normal size</string>
+	<string name="preferences_display_scaling_factor_50_percent_larger">1.5x size</string>
+	<string name="preferences_display_scaling_factor_double">Double size</string>
+
+	<string name="inventory_assign">Assign quick slot</string>
+	<string name="inventory_selectitem">Select item to assign</string>
+	<string name="inventory_assign_slot1">Slot 1</string>
+	<string name="inventory_assign_slot2">Slot 2</string>
+	<string name="inventory_assign_slot3">Slot 3</string>
+	<string name="inventory_unassign">Un-assign quick slot</string>
+
+	<!-- =========================================== -->
+	<!-- Added in v0.6.10 -->
+
+	<string name="preferences_movement_dpad_position_title">Virtual d-pad</string>
+	<string name="preferences_movement_dpad_position">Enables a virtual on-screen directional pad to guide movement.</string>
+	<string name="preferences_movement_dpad_minimizeable_title">Minimizable d-pad</string>
+	<string name="preferences_movement_dpad_minimizeable">If the virtual d-pad is enabled, this setting allows the d-pad to be minimized by pressing its center.</string>
+
+	<string name="preferences_movement_dpad_positions_disabled">Disabled</string>
+	<string name="preferences_movement_dpad_positions_lower_right">Lower right corner</string>
+	<string name="preferences_movement_dpad_positions_lower_left">Lower left corner</string>
+	<string name="preferences_movement_dpad_positions_center_bottom">Center bottom</string>
+	<string name="preferences_movement_dpad_positions_center_left">Center left</string>
+	<string name="preferences_movement_dpad_positions_center_right">Center right</string>
+	<string name="preferences_movement_dpad_positions_upper_left">Upper left corner</string>
+	<string name="preferences_movement_dpad_positions_upper_right">Upper right corner</string>
+	<string name="preferences_movement_dpad_positions_center_top">Center top</string>
+
+	<string name="actorconditioninfo_constant_effect">Constant effect</string>
+	<string name="actorconditioninfo_effect_every_round">Every round</string>
+	<string name="actorconditioninfo_effect_every_full_round">Every full round</string>
+	<string name="bulkselection_totalcost_buy">Total cost: %1$d gold</string>
+	<string name="bulkselection_totalcost_sell">Total cost: %1$d gold</string>
+	<string name="bulkselection_select_all">All</string>
+	<string name="bulkselection_sell_confirmation_title">Are you sure?</string>
+	<string name="bulkselection_sell_confirmation">Are you sure you want to sell %1$s? This item is %2$s and you might not be able to recover it.</string>
+
+	<string name="skill_title_weapon_chance">Weapon Accuracy</string>
+	<string name="skill_title_weapon_dmg">Hard Hit</string>
+	<string name="skill_title_barter">Merchant</string>
+	<string name="skill_title_dodge">Dodge</string>
+	<string name="skill_title_barkskin">Bark Skin</string>
+	<string name="skill_title_more_criticals">More Criticals</string>
+	<string name="skill_title_better_criticals">Better Criticals</string>
+	<string name="skill_title_speed">Combat Speed</string>
+	<string name="skill_title_coinfinder">Treasure Hunter</string>
+	<string name="skill_title_more_exp">Quick Learner</string>
+	<string name="skill_title_cleave">Cleave</string>
+	<string name="skill_title_eater">Corpse Eater</string>
+	<string name="skill_title_fortitude">Increased Fortitude</string>
+	<string name="skill_title_evasion">Evasion</string>
+	<string name="skill_title_regeneration">Regeneration</string>
+	<string name="skill_title_lower_exploss">Failure Mastery</string>
+	<string name="skill_title_magicfinder">Magic Finder</string>
+	<string name="skill_title_resistance_mental">Strong Mind</string>
+	<string name="skill_title_resistance_physical_capacity">Enduring Body</string>
+	<string name="skill_title_resistance_blood_disorder">Pure Blood</string>
+
+	<string name="skill_shortdescription_weapon_chance">Increased attack chance</string>
+	<string name="skill_shortdescription_weapon_dmg">Increased attack damage</string>
+	<string name="skill_shortdescription_barter">Better shop prices</string>
+	<string name="skill_shortdescription_dodge">Increased block chance</string>
+	<string name="skill_shortdescription_barkskin">Damage resistance</string>
+	<string name="skill_shortdescription_more_criticals">Increased critical skill</string>
+	<string name="skill_shortdescription_better_criticals">Increased critical damage</string>
+	<string name="skill_shortdescription_speed">Increased maximum action points</string>
+	<string name="skill_shortdescription_coinfinder">Higher chance of finding gold</string>
+	<string name="skill_shortdescription_more_exp">More experience from monster kills</string>
+	<string name="skill_shortdescription_cleave">Recover action points on every kill</string>
+	<string name="skill_shortdescription_eater">Recover health points on every kill</string>
+	<string name="skill_shortdescription_fortitude">Gain health on each level up</string>
+	<string name="skill_shortdescription_evasion">Increased chance of fleeing</string>
+	<string name="skill_shortdescription_regeneration">Gain health every round</string>
+	<string name="skill_shortdescription_lower_exploss">Decrease amount of lost experience when dying</string>
+	<string name="skill_shortdescription_magicfinder">Increased chance of finding magic items</string>
+	<string name="skill_shortdescription_resistance_mental">Resistance against mental conditions</string>
+	<string name="skill_shortdescription_resistance_physical_capacity">Resistance against physical capacity conditions</string>
+	<string name="skill_shortdescription_resistance_blood_disorder">Resistance against blood disorders</string>
+
+	<string name="skill_longdescription_weapon_chance">Increases attack chance by %1$d percentage points for each skill level.</string>
+	<string name="skill_longdescription_weapon_dmg">Increases max damage by %1$d for each skill level.</string>
+	<string name="skill_longdescription_barter">For every skill level, decreases the buying and selling gold penalty by %1$d percentage points.</string>
+	<string name="skill_longdescription_dodge">Increases block chance by %1$d percentage points for each skill level.</string>
+	<string name="skill_longdescription_barkskin">Increases damage resistance by %1$d for each skill level.</string>
+	<string name="skill_longdescription_more_criticals">Increases any existing critical skill given by equipment by %1$d %% for each skill level.</string>
+	<string name="skill_longdescription_better_criticals">Increases any existing critical multiplier given by equipment by %1$d %% for each skill level.</string>
+	<string name="skill_longdescription_speed">Increases maximum action points (AP) by %1$d for each skill level.</string>
+	<string name="skill_longdescription_coinfinder">Increases chance of finding gold in monster drops by %1$d %%, and increases amount of gold in drops by %2$d %% for each skill level (up to the maximum amount that the monster drops).</string>
+	<string name="skill_longdescription_more_exp">Increases amount of exp given by defeating monsters by %1$d %% for each skill level.</string>
+	<string name="skill_longdescription_cleave">Gives +%1$d action points (AP) on every kill per skill level.</string>
+	<string name="skill_longdescription_eater">Gives +%1$d health points (HP) on every kill per skill level.</string>
+	<string name="skill_longdescription_fortitude">On every subsequent level-up, maximum health points (HP) will be raised by %1$d per skill level. This is not applied retroactively, only subsequent level-ups will be affected.</string>
+	<string name="skill_longdescription_evasion">For every skill level, reduces both the chance of failed flee attempts by %1$d %% and the chance that an adjacent monster will attack by %2$d %%.</string>
+	<string name="skill_longdescription_regeneration">Gain +%1$d health points (HP) on every round per skill level when no monsters are directly adjacent.</string>
+	<string name="skill_longdescription_lower_exploss">For every skill level, reduces the amount of lost experience caused by death by %1$d %% (percentage of existing exp loss value, not percentage points). %2$d levels will remove all experience loss caused by death.</string>
+	<string name="skill_longdescription_magicfinder">Increases the chance of finding non-ordinary items by %1$d %% for every skill level.</string>
+	<string name="skill_longdescription_resistance_mental">Lowers the chance of being afflicted with mental conditions by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Dazed or Weapon Feebleness.</string>
+	<string name="skill_longdescription_resistance_physical_capacity">Lowers the chance of being afflicted with conditions affecting your physical capacity by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Fatigue.</string>
+	<string name="skill_longdescription_resistance_blood_disorder">Lowers the chance of being afflicted with disorders of the blood by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Poison or bleeding wounds.</string>
+
+	<string name="skillinfo_action_levelup">Level up</string>
+	<string name="skill_current_level">Current level: %1$d</string>
+	<string name="skill_current_level_with_maximum">Current level: %1$d / %2$d</string>
+	<string name="skill_prerequisite_other_skill">To level up this skill, you need at least level %1$d of the %2$s skill.</string>
+	<string name="skill_prerequisite_level">To level up this skill, you need at least experience level %1$d.</string>
+	<string name="skill_prerequisite_stat">To level up this skill, you need at least %1$d %2$s (base stats).</string>
+	<string name="skill_number_of_increases_one">You may select one skill to increase.</string>
+	<string name="skill_number_of_increases_several">You may select %1$d skills to increase.</string>
+	<string name="levelup_adds_new_skillpoint">This level also gives you a new skill point to spend!</string>
+
+	<string name="loadsave_save_to_new_slot">Create new savegame slot</string>
+	<string name="loadsave_save_overwrite_confirmation_title">Overwrite savegame?</string>
+	<string name="loadsave_save_overwrite_confirmation">This savegame contains a different player name (%1$s) than your current player name (%2$s). Are you sure you want to overwrite this savegame?</string>
+
+	<string name="iteminfo_displaytypes_ordinary">Ordinary</string>
+	<string name="iteminfo_displaytypes_quest">Quest item</string>
+	<string name="iteminfo_displaytypes_legendary">Legendary</string>
+	<string name="iteminfo_displaytypes_extraordinary">Extraordinary</string>
+	<string name="iteminfo_displaytypes_rare">Rare</string>
+
+	<string name="actorconditioninfo_category">Condition category: %1$s</string>
+	<string name="actorcondition_categories_spiritual">Spiritual</string>
+	<string name="actorcondition_categories_mental">Mental</string>
+	<string name="actorcondition_categories_physical">Physical Capacity</string>
+	<string name="actorcondition_categories_blood">Blood Disorder</string>
+
+	<string name="traitsinfo_base_max_hp">Max HP:</string>
+	<string name="traitsinfo_base_max_ap">Max AP:</string>
+	<string name="menu_save_saving_not_allowed_in_combat">Cannot save the game while in combat.</string>
+
+	<string name="preferences_optimized_drawing_title">Optimized drawing</string>
+	<string name="preferences_optimized_drawing">Disable this if you see graphical artifacts. Enabling this option will make the game only redraw changed parts of the screen every frame.</string>
+
+	<!-- =========================================== -->
+	<!-- Added in v0.6.11 -->
+
+	<string name="skill_title_shadow_bless">Dark blessing of the Shadow</string>
+	<string name="skill_shortdescription_shadow_bless">Resistance against all types of conditions</string>
+	<string name="skill_longdescription_shadow_bless">Lowers the chance of being afflicted with all types of conditions by %1$d %%. This includes all types of conditions caused by monster attacks such as Poison, Dazed or Fatigue.</string>
+
+	<string name="inventory_movetop">Move to top</string>
+	<string name="inventory_movebottom">Move to bottom</string>
+	<string name="actorinfo_immune_criticals">Immune to critical hits</string>
+	<string name="traitsinfo_criticalhit_effectivechance">Effective critical chance:</string>
+
+	<string name="skill_title_crit1">Internal bleeding</string>
+	<string name="skill_shortdescription_crit1">Chance of internal bleeding</string>
+	<string name="skill_longdescription_crit1">For every critical hit made, there is a %1$d %% chance that the hit will cause internal bleeding on the target, effectively causing the \'Internal bleeding\' condition on the target. Internal bleeding severely lowers offensive combat abilities, making the target less able to land successful attacks.</string>
+	<string name="skill_title_crit2">Fracture</string>
+	<string name="skill_shortdescription_crit2">Chance of bone fracture</string>
+	<string name="skill_longdescription_crit2">For every critical hit made, there is a %1$d %% chance that the hit will fracture some of the target\'s bones, effectively causing the \'Fracture\' condition on the target. This will severely lower the target\'s defensive combat abilities, making it less able to defend itself in subsequent attacks.</string>
+	<string name="skill_title_rejuvenation">Rejuvenation</string>
+	<string name="skill_shortdescription_rejuvenation">Chance of effect removal</string>
+	<string name="skill_longdescription_rejuvenation">Every round (6 seconds), there is a %1$d %% chance that one of the active negative actor conditions will be lowered by one magnitude. This applies to all temporary effect types that affect the body; mental conditions such as Dazed, physical capacity conditions such as Fatigue and also blood disorders such as poison.</string>
+	<string name="skill_title_taunt">Taunt</string>
+	<string name="skill_shortdescription_taunt">Attacker loses AP on miss</string>
+	<string name="skill_longdescription_taunt">When an attacker makes an attack that misses, there is a %1$d %% chance that the attacker loses %2$d action points (AP). This applies to all types of melee attacks against you.</string>
+	<string name="skill_title_concussion">Concussion</string>
+	<string name="skill_shortdescription_concussion">Chance of concussion</string>
+	<string name="skill_longdescription_concussion">When making an attack on a target whose block chance (BC) is at least %1$d lower than your attack chance (AC), there is a %2$d %% chance that the hit will cause a concussion on the target. A concussion will severely lower the target\'s offensive combat abilities, making the target less able to land successful attacks.</string>
+
+	<string name="about_button4">About</string>
+
+	<!-- =========================================== -->
+	<!-- Added in v0.6.12 -->
+
+	<string name="preferences_ui_category">Interface</string>
+	<string name="preferences_ui_enable_animations_title">Enable animations</string>
+	<string name="preferences_ui_enable_animations">Show animations for various interface elements, such as the combat bar.</string>
+	<string name="menu_button_worldmap">Map</string>
+	<string name="menu_button_worldmap_failed">Map cannot be displayed.</string>
+	<string name="display_worldmap_not_available">The map cannot be displayed from this location.</string>
+	<string name="display_worldmap_title">Map</string>
+
+	<string name="inventory_equip_offhand">Equip (offhand)</string>
+
+	<string name="iteminfo_effect_weapon_attack_cost">Attack cost: %1$d AP</string>
+	<string name="iteminfo_effect_increase_attack_cost">Increases attack cost by %1$d AP</string>
+	<string name="iteminfo_effect_decrease_attack_cost">Lowers attack cost by %1$d AP</string>
+	<string name="iteminfo_effect_weapon_attack_chance">Attack chance: %1$d</string>
+	<string name="iteminfo_effect_increase_attack_chance">Increases attack chance by %1$d</string>
+	<string name="iteminfo_effect_decrease_attack_chance">Lowers attack chance by %1$d</string>
+	<string name="iteminfo_effect_weapon_attack_damage">Attack damage: %1$d</string>
+	<string name="iteminfo_effect_weapon_attack_damage_minmax">Attack damage: %1$d-%2$d</string>
+	<string name="iteminfo_effect_increase_attack_damage">Increases attack damage by %1$d</string>
+	<string name="iteminfo_effect_increase_attack_damage_minmax">Increases attack damage by %1$d-%2$d</string>
+	<string name="iteminfo_effect_decrease_attack_damage">Lowers attack damage by %1$d</string>
+	<string name="iteminfo_effect_decrease_attack_damage_minmax">Lowers attack damage by %1$d-%2$d</string>
+	<string name="iteminfo_effect_increase_critical_skill">Increases critical skill by %1$d</string>
+	<string name="iteminfo_effect_decrease_critical_skill">Lowers critical skill by %1$d</string>
+	<string name="iteminfo_effect_critical_multiplier">Enables critical hits with a multiplier of x%1$.1f</string>
+	<string name="iteminfo_effect_increase_block_chance">Increases block chance by %1$d</string>
+	<string name="iteminfo_effect_decrease_block_chance">Lowers block chance by %1$d</string>
+	<string name="iteminfo_effect_increase_damage_resistance">Raises damage resistance by %1$d</string>
+	<string name="iteminfo_effect_decrease_damage_resistance">Lowers damage resistance by %1$d</string>
+	<string name="iteminfo_effect_increase_use_cost">Increases AP cost of using items in combat by %1$d AP</string>
+	<string name="iteminfo_effect_decrease_use_cost">Lowers AP cost of using items in combat by %1$d AP</string>
+	<string name="iteminfo_effect_increase_reequip_cost">Increases AP cost of equipping items in combat by %1$d AP</string>
+	<string name="iteminfo_effect_decrease_reequip_cost">Lowers AP cost of equipping items in combat by %1$d AP</string>
+
+	<string name="loadsave_save_overwrite_confirmation_all">Are you sure you want to overwrite this savegame?</string>
+	<string name="loadsave_save_overwrite_confirmation_slot">(slot %1$d)</string>
+	<string name="preferences_display_overwrite_savegame_entries_always_confirm">Always show confirmation dialog box</string>
+	<string name="preferences_display_overwrite_savegame_entries_confirm_overwrite">Only show when overwriting a different playername</string>
+	<string name="preferences_display_overwrite_savegame_entries_never_confirm">Never display confirmation dialog box</string>
+	<string name="preferences_dialog_overwrite_savegame_title">Confirm overwriting savegames</string>
+	<string name="preferences_dialog_overwrite_savegame">Gives a question about whether you want to overwrite when saving to a savegame slot that already contains a savegame.</string>
+
+	<!-- =========================================== -->
+	<!-- Added in v0.7.0 -->
+
+	<string name="heroinfo_reequip_cost">Re-equip cost (AP):</string>
+	<string name="heroinfo_useitem_cost">Use item cost (AP):</string>
+	<string name="combat_result_monstermoved">%1$s moves.</string>
+	<string name="combat_log_title">Combat log</string>
+	<string name="combat_log_noentries">No entries yet.</string>
+	<string name="localize_resources_from_mo_filename"></string>
+	<string name="conversation_reward_quest_finished">[Quest completed: \"%1$s\"]</string>
+	<string name="conversation_reward_quest_updated">[Quest updated: \"%1$s\"]</string>
+
+	<string name="skill_title_weapon_prof_dagger">Dagger proficiency</string>
+	<string name="skill_title_weapon_prof_1hsword">One-handed sword proficiency</string>
+	<string name="skill_title_weapon_prof_2hsword">Two-handed sword proficiency</string>
+	<string name="skill_title_weapon_prof_axe">Axe proficiency</string>
+	<string name="skill_title_weapon_prof_blunt">Bludgeoning weapon proficiency</string>
+	<string name="skill_title_weapon_prof_unarmed">Unarmed fighting</string>
+	<string name="skill_title_armor_prof_shield">Shield proficiency</string>
+	<string name="skill_title_armor_prof_unarmored">Unarmored fighting</string>
+	<string name="skill_title_armor_prof_light">Light armor proficiency</string>
+	<string name="skill_title_armor_prof_heavy">Heavy armor proficiency</string>
+	<string name="skill_title_fightstyle_dualwield">Fighting style: Dual wield</string>
+	<string name="skill_title_fightstyle_2hand">Fighting style: Two-handed weapon</string>
+	<string name="skill_title_fightstyle_weapon_shield">Fighting style: Weapon and shield</string>
+	<string name="skill_title_specialization_dualwield">Specialization: Dual wield</string>
+	<string name="skill_title_specialization_2hand">Specialization: Two-handed weapon</string>
+	<string name="skill_title_specialization_weapon_shield">Specialization: Weapon and shield</string>
+
+	<string name="skill_shortdescription_weapon_prof_dagger">Better at fighting with daggers</string>
+	<string name="skill_shortdescription_weapon_prof_1hsword">Better at fighting with one-handed swords</string>
+	<string name="skill_shortdescription_weapon_prof_2hsword">Better at fighting with two-handed swords</string>
+	<string name="skill_shortdescription_weapon_prof_axe">Better at fighting with axes</string>
+	<string name="skill_shortdescription_weapon_prof_blunt">Better at fighting with bludgeoning weapons</string>
+	<string name="skill_shortdescription_weapon_prof_unarmed">Better at fighting without weapons</string>
+	<string name="skill_shortdescription_armor_prof_shield">Make better use of shields</string>
+	<string name="skill_shortdescription_armor_prof_unarmored">Better at fighting without armor</string>
+	<string name="skill_shortdescription_armor_prof_light">Make better use of light armor</string>
+	<string name="skill_shortdescription_armor_prof_heavy">Make better use of heavy armor</string>
+	<string name="skill_shortdescription_fightstyle_dualwield">Wield two weapons at the same time</string>
+	<string name="skill_shortdescription_fightstyle_2hand">Make better use of weapons that require both hands</string>
+	<string name="skill_shortdescription_fightstyle_weapon_shield">Better at fighting with weapon and shield</string>
+	<string name="skill_shortdescription_specialization_dualwield">Expert at dual wielding</string>
+	<string name="skill_shortdescription_specialization_2hand">Expert at two-handed weapons</string>
+	<string name="skill_shortdescription_specialization_weapon_shield">Expert at fighting with weapon and shield</string>
+
+	<string name="skill_longdescription_weapon_prof_dagger">For each skill level, increases attack chance when using daggers and shortswords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
+	<string name="skill_longdescription_weapon_prof_1hsword">For each skill level, increases attack chance of rapiers, longswords and broadswords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
+	<string name="skill_longdescription_weapon_prof_2hsword">For each skill level, increases attack chance of two-handed swords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
+	<string name="skill_longdescription_weapon_prof_axe">For each skill level, increases attack chance of axes and greataxes by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
+	<string name="skill_longdescription_weapon_prof_blunt">For each skill level, increases attack chance of bludgeoning weapons by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill. This includes clubs, quarterstaves, maces, scepters, warhammers and giant hammers.</string>
+	<string name="skill_longdescription_weapon_prof_unarmed">When fighting without a weapon and shield, gain %1$d attack chance, %2$d damage potential and %3$d block chance per skill level.</string>
+	<string name="skill_longdescription_armor_prof_shield">Increase damage resistance by %1$d per skill level while having a shield equipped.</string>
+	<string name="skill_longdescription_armor_prof_unarmored">While fighting without having any piece of armor equipped, gain %1$d block chance per skill level. Items made of cloth are not considered as being armor.</string>
+	<string name="skill_longdescription_armor_prof_light">For every skill level, increases the block chance of every piece of light armor being worn by %1$d %% of their original block chances. Light armors include leather, light metal and hide armors.</string>
+	<string name="skill_longdescription_armor_prof_heavy">For every skill level, increases the block chance of every piece of heavy armor being worn by %1$d %% of their original block chances. Pieces of heavy armor have their movement penalties reduced by %2$d %% per skill level, and their attack speed penalties reduced by %3$d %% per skill level. Heavy armors include metal armors, chain mail and plate mail.</string>
+	<string name="skill_longdescription_fightstyle_dualwield">"Gives benefits when fighting with two weapons at the same time, one in the main hand and one in the off-hand.
+
+Without this skill, only %1$d %% of a weapon\'s qualities may be used when equipped in the off-hand. This includes attack chance, critical skill, damage potential and block chance. Without this skill, attack speed (AP cost) of making an attack is the sum of the attack speed of the main weapon and that of the weapon used in the off-hand.
+
+With one level of this skill, %2$d %% of the off-hand\'s weapon\'s qualities may be used, and the attack speed is the highest attack speed of both weapons plus %3$d %% of the lowest attack speed of both weapons.
+
+With two levels of this skill, %4$d %% of the off-hand\'s weapon\'s qualities may be used, and the attack speed equals the highest of the attack speeds of the two equipped weapons."</string>
+	<string name="skill_longdescription_fightstyle_2hand">"Gives benefits when using weapons that require both hands to wield, such as two-handed swords, greataxes or giant hammers.
+
+Every skill level increases damage potential of two-handed weapons with %1$d %% of the original damage potential."</string>
+	<string name="skill_longdescription_fightstyle_weapon_shield">"Gives benefits when fighting with a weapon in the main hand and having a shield equipped in the off-hand.
+
+Every skill level increases the attack chance of weapons with %1$d %% of their original attack chances, and the block chance of shields by %2$d %% of their original block chances."</string>
+	<string name="skill_longdescription_specialization_dualwield">Increases the attack chance of both wielded weapons by an additional %1$d %% of their original attack chances, in addition to the benefits given by the weapon style skill. The block chances of both wielded weapons are also increased by %2$d %% of their original block chances.</string>
+	<string name="skill_longdescription_specialization_2hand">Increases damage potential of two-handed weapons by an additional %1$d %% of the original damage potential, in addition to the benefits given by the weapon style skill. The attack chances of two-handed weapons are also increased by %2$d %% of their original attack chances.</string>
+	<string name="skill_longdescription_specialization_weapon_shield">Increases both attack chances and damage potential of weapons. The attack chance is increased by %1$d %% of the original attack chance, and the damage potential is increased by %2$d %% of the original damage potential.</string>
+
+	<string name="preferences_quickslots_placement">Quickslot position</string>
+	<string name="preferences_quickslots_placement_summary">Where to place the quickslots</string>
+	<string name="preferences_quickslots_placements_horizontal_center_bottom">Center bottom</string>
+	<string name="preferences_quickslots_placements_vertical_center_left">Middle left</string>
+	<string name="preferences_quickslots_placements_vertical_center_right">Middle right</string>
+	<string name="preferences_quickslots_placements_vertical_bottom_left">Bottom left, along left border</string>
+	<string name="preferences_quickslots_placements_horizontal_bottom_left">Bottom left, along bottom border</string>
+	<string name="preferences_quickslots_placements_horizontal_bottom_right">Bottom right, along bottom border</string>
+	<string name="preferences_quickslots_placements_vertical_bottom_right">Bottom right, along right border</string>
+	<string name="preferences_ui_show_quickslots_when_toolbox_is_visible_title">Show quickslots when toolbox is opened</string>
+	<string name="preferences_ui_show_quickslots_when_toolbox_is_visible">Makes the quickslot buttons be displayed as soon as the toolbox is opened</string>
+	<string name="startscreen_incompatible_savegames">This is a development version of Andor\'s Trail. Savegames produced by this version are incompatible with the release version.</string>
+	<string name="startscreen_non_release_version">This is a prerelease version of Andor\'s Trail. Savegames produced by this version might not be compatible with the release version.</string>
+	<string name="heroinfo_gamestats">Game statistics</string>
+	<string name="heroinfo_gamestats_quests">Completed quests</string>
+	<string name="heroinfo_gamestats_deaths">Times fallen unconscious</string>
+	<string name="heroinfo_gamestats_spent_gold">Gold spent in shops</string>
+	<string name="heroinfo_gamestats_bonemeals">Bonemeal potions used</string>
+	<string name="heroinfo_gamestats_num_used_items">Items used</string>
+	<string name="heroinfo_gamestats_visited_maps">Places visited</string>
+	<string name="heroinfo_gamestats_fav_item">Most commonly used item</string>
+	<string name="heroinfo_gamestats_num_killed_monsters">Monsters killed</string>
+	<string name="heroinfo_gamestats_top_boss">Most powerful monster killed</string>
+	<string name="heroinfo_gamestats_fav_monsters">Most commonly killed monsters</string>
+	<string name="heroinfo_gamestats_name_and_qty">%1$s (%2$d)</string>
+
+	<!-- =========================================== -->
+	<!-- Added in v0.7.1 -->
+
+	<string name="preferences_ui_use_localized_resources_title">Use localized resources</string>
+	<string name="preferences_ui_use_localized_resources">Use translation of interface and content, where available. (requires restart)</string>
+	<string name="change_locale_requires_restart">Changing locale requires restart. Andor\'s Trail has been closed.</string>
+
+	<!-- =========================================== -->
+	<!-- Added in v0.7.2 -->
+	
+	<string name="inventory_category_all">All</string>
+	<string name="inventory_category_favorites">Favorites</string>
+	<string name="inventory_category_weapons">Weapon</string>
+	<string name="inventory_category_armor">Armor</string>
+	<string name="inventory_category_usable">Consumable</string>
+	<string name="inventory_category_quest">Quest Item</string>
+	<string name="inventory_category_other">Other</string>
+
+	<string name="inventory_sort_custom">Unsorted</string>
+	<string name="inventory_sort_name">Name</string>
+	<string name="inventory_sort_price">Price</string>
+	<string name="inventory_sort_quantity">Quantity</string>
+	<string name="inventory_sort_rarity">Rarity</string>
+	<string name="inventory_sort_type">Type</string>
+
+	<string name="shoplist_sort_custom">Unsorted</string>
+	<string name="shoplist_sort_name">Name</string>
+	<string name="shoplist_sort_price">Price</string>
+	<string name="shoplist_sort_quantity">Quantity</string>
+	<string name="shoplist_sort_rarity">Rarity</string>
+	<string name="shoplist_sort_type">Type</string>
+
+	<string name="skill_category_all">All</string>
+	<string name="skill_category_offense"> Offense</string>
+	<string name="skill_category_defense">Defense</string>
+	<string name="skill_category_criticals">Criticals</string>
+	<string name="skill_category_immunity">Immunity</string>
+	<string name="skill_category_utility">Utility</string>
+	<string name="skill_category_speciality">Speciality</string>
+	<string name="skill_category_proficiency">Proficiency</string>
+
+	<string name="skill_sort_unsorted">Unsorted</string>
+	<string name="skill_sort_name">Name</string>
+	<string name="skill_sort_points">Points</string>
+	<string name="skill_sort_unlocked">Unlocked</string>
+	
+	<string name="preferences_display_theme_title">Theme</string>
+	<string name="preferences_display_theme">Choose the UI theme. (requires restart)</string>
+	<string name="preferences_display_theme_blue">Cobalt</string>
+	<string name="preferences_display_theme_green">Malachite</string>
+	<string name="preferences_display_theme_charcoal">Obsidian</string>
+	<string name="change_theme_requires_restart">Changing UI theme requires restart. Andor\'s Trail has been closed.</string>
+	
+	
+</resources>
diff --git a/AndorsTrail/res/values/styles.xml b/AndorsTrail/res/values/styles.xml
index 881cadcb1..e149ba945 100644
--- a/AndorsTrail/res/values/styles.xml
+++ b/AndorsTrail/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 	<style name="actorinfo_sectionheader">
 		<item name="android:layout_marginTop">@dimen/section_margin</item>
 	</style>
diff --git a/AndorsTrail/res/values/ui_colors.xml b/AndorsTrail/res/values/ui_colors.xml
deleted file mode 100644
index 098cbc9c2..000000000
--- a/AndorsTrail/res/values/ui_colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<color name="displayworldmap_background">#423921</color>
-</resources>
diff --git a/AndorsTrail/res/values/ui_dimen.xml b/AndorsTrail/res/values/ui_dimen.xml
index 322b4246c..1dc4b91c2 100644
--- a/AndorsTrail/res/values/ui_dimen.xml
+++ b/AndorsTrail/res/values/ui_dimen.xml
@@ -1,25 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<dimen name="smalltext">10sp</dimen>
-	<dimen name="smalltext_buttonheight">35sp</dimen>
-	<dimen name="titletext">20sp</dimen>
-
-	<dimen name="healthbar_height">12sp</dimen>
-
-	<dimen name="dialog_margin">10sp</dimen>
-
-	<dimen name="dialog_iconpadding_right">10sp</dimen>
-	<dimen name="dialog_iconpadding_bottom">10sp</dimen>
-
-	<dimen name="boxshape_margin">5dp</dimen>
-	<dimen name="boxshape_width">100dp</dimen>
-
-	<dimen name="section_margin">10dp</dimen>
-
-	<dimen name="conversation_statementpadding">5dp</dimen>
-	<dimen name="conversation_textsize">16sp</dimen>
-
-	<dimen name="actionbar_text">12sp</dimen>
-	<dimen name="statusbar_text">11sp</dimen>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="smalltext">12sp</dimen>
+	<dimen name="smalltext_buttonheight">35sp</dimen>
+	<dimen name="titletext">20sp</dimen>
+
+	<dimen name="healthbar_height">12sp</dimen>
+
+	<dimen name="dialog_margin">10sp</dimen>
+
+	<dimen name="dialog_iconpadding_right">10sp</dimen>
+	<dimen name="dialog_iconpadding_bottom">10sp</dimen>
+
+	<dimen name="boxshape_margin">5dp</dimen>
+	<dimen name="boxshape_width">100dp</dimen>
+
+	<dimen name="section_margin">10dp</dimen>
+
+	<dimen name="conversation_statementpadding">5dp</dimen>
+	<dimen name="conversation_textsize">16sp</dimen>
+	<dimen name="conversation_replyseparator_margintop">5dp</dimen>
+	<dimen name="conversation_replyseparator_marginbottom">5dp</dimen>
+
+	<dimen name="actionbar_text">12sp</dimen>
+	<dimen name="statusbar_text">11sp</dimen>
+
+	<dimen name="rangebar_labelwidth_small">30dp</dimen>
+	<dimen name="rangebar_labelwidth_large">120dp</dimen>
+	
+</resources>
diff --git a/AndorsTrail/res/values/ui_listviewstyle.xml b/AndorsTrail/res/values/ui_listviewstyle.xml
index d87c65154..411ba4678 100644
--- a/AndorsTrail/res/values/ui_listviewstyle.xml
+++ b/AndorsTrail/res/values/ui_listviewstyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="ConversationListView" parent="@android:style/Widget.ListView">
+	<style name="ConversationListView" parent="@style/AndorsTrail_Style_ListView">
 		<!-- Not used here. Overridden in values-v10/ -->
 	</style>
 </resources>
diff --git a/AndorsTrail/res/values/ui_styles.xml b/AndorsTrail/res/values/ui_styles.xml
index 4d42183e4..45cf31f6b 100644
--- a/AndorsTrail/res/values/ui_styles.xml
+++ b/AndorsTrail/res/values/ui_styles.xml
@@ -1,57 +1,190 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="Theme.NoBackground" parent="android:Theme">
-		<item name="android:windowBackground">@null</item>
-	</style>
-
-	<style name="textWithIcon" parent="android:Widget.TextView">
-		<item name="android:drawablePadding">@dimen/dialog_iconpadding_right</item>
-		<item name="android:gravity">center_vertical</item>
-	</style>
-
-	<style name="titleWithIcon" parent="@style/textWithIcon">
-		<item name="android:textSize">@dimen/titletext</item>
-		<item name="android:paddingBottom">@dimen/dialog_iconpadding_bottom</item>
-	</style>
-
-	<style name="statsBoxStyle" parent="android:Widget.TextView">
-		<item name="android:background">@drawable/ui_boxshape</item>
-		<item name="android:drawablePadding">@dimen/boxshape_margin</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:layout_margin">@dimen/boxshape_margin</item>
-		<item name="android:padding">@dimen/boxshape_margin</item>
-		<item name="android:textSize">@dimen/smalltext</item>
-	</style>
-
-	<style name="quickButton">
-		<item name="android:longClickable">true</item>
-		<item name="android:textSize">@dimen/actionbar_text</item>
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">@dimen/smalltext_buttonheight</item>
-		<item name="android:scaleType">fitCenter</item>
-		<item name="android:adjustViewBounds">true</item>
-		<item name="android:padding">5dp</item>
-	</style>
-
-	<style name="toolboxButtonTile">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-	</style>
-
-	<style name="toolboxButtonDrawable">
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:padding">0dp</item>
-	</style>
-
-	<style name="traitsinfo_label" parent="android:Widget.TextView">
-		<item name="android:layout_marginRight">10sp</item>
-	</style>
-
-	<style name="traitsinfo_2linelabel" parent="android:Widget.TextView">
-	</style>
-
-	<style name="traitsinfo_2linevalue" parent="android:Widget.TextView">
-		<item name="android:layout_marginLeft">30sp</item>
-	</style>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="AndorsTrail_Style_ListView" parent="android:style/Widget.ListView">
+        <item name="android:background">?attr/ui_theme_stdframe_bitmap</item>
+        <item name="android:divider">?attr/ui_theme_listseparator_drawable</item>
+    </style>
+
+    <style name="AndorsTrail_Style_ListView_Frameless" parent="android:style/Widget.ListView">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:divider">?attr/ui_theme_listseparator_drawable</item>
+    </style>
+
+    <style name="AndorsTrail_Style_TextButton_Base" parent="android:style/Widget.Button">
+        <item name="android:background">?attr/ui_theme_textbutton_drawable</item>
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingLeft">5dp</item>
+        <item name="android:paddingRight">5dp</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+    </style>
+    
+    <style name="AndorsTrail_Style_TextButton_Quickslots" parent="android:style/Widget.Button">
+        <item name="android:background">?attr/ui_theme_textbutton_drawable</item>
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+        <item name="android:paddingTop">2dp</item>
+        <item name="android:paddingBottom">2dp</item>
+    </style>
+    
+    <style name="AndorsTrail_Style_TextButton" parent="AndorsTrail_Style_TextButton_Base" />
+
+    <style name="AndorsTrail_Style_ImageButton" parent="android:style/Widget.ImageButton">
+        <item name="android:background">?attr/ui_theme_textbutton_drawable</item>
+    </style>
+
+    <style name="AndorsTrail_Style_ToggleButton" parent="android:style/Widget.Button.Toggle">
+        <item name="android:background">?attr/ui_theme_togglebutton_drawable</item>
+        <item name="android:textOn">@null</item>
+        <item name="android:textOff">@null</item>
+    </style>
+
+    <style name="AndorsTrail_Style_RadioButton" parent="android:style/Widget.CompoundButton.RadioButton">
+        <item name="android:button">?attr/ui_theme_radiobutton_drawable</item>
+        <item name="android:paddingLeft">22dp</item>
+    </style>
+
+    <style name="AndorsTrail_Style_Checkbox" parent="android:style/Widget.CompoundButton.CheckBox">
+        <item name="android:button">?attr/ui_theme_radiobutton_drawable</item>
+    </style>
+
+    <style name="AndorsTrail_Style_SpinnerEmulator" parent="android:style/Widget.Button">
+        <item name="android:background">?attr/ui_theme_spinner_drawable</item>
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+    </style>
+
+    <style name="AndorsTrail_Style_ExpandableListView" parent="android:style/Widget.ExpandableListView">
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+        <item name="android:textAppearanceLarge">@style/AndorsTrail_Style_TextAppearance_ListItemTitle</item>
+        <item name="android:textAppearanceSmall">@style/AndorsTrail_Style_TextAppearance.ListItemSubtitle</item>
+        <item name="android:groupIndicator">?attr/ui_theme_groupindicator_drawable</item>
+        <item name="android:divider">?attr/ui_theme_listseparator_drawable</item>
+        <item name="android:childDivider">?attr/ui_theme_listseparator_drawable</item>
+    </style>
+
+    <style name="AndorsTrail_Style_PreferencesListHeader_Base">
+        <item name="android:background">?attr/ui_theme_lightframe_bitmap</item>
+        <item name="android:paddingLeft">10dp</item>
+        <item name="android:paddingRight">10dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?attr/ui_theme_palette_text_gray_mid_color</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+    </style>
+    
+    <style name="AndorsTrail_Style_PreferencesListHeader" parent="AndorsTrail_Style_PreferencesListHeader_Base" />
+
+    <style name="AndorsTrail_Style_TextAppearance_ListItemTitle" parent="android:style/TextAppearance.Large.Inverse">
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+        <item name="android:textSize">22sp</item>
+    </style>
+
+    <style name="AndorsTrail_Style_TextAppearance.ListItemSubtitle" parent="android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="AndorsTrail_Style_RichFrame">
+        <item name="android:background">?attr/ui_theme_richframe_bitmap</item>
+    </style>
+
+    <style name="AndorsTrail_Style_StdFrame">
+        <item name="android:background">?attr/ui_theme_stdframe_bitmap</item>
+    </style>
+
+    <style name="AndorsTrail_Style_LightFrame">
+        <item name="android:background">?attr/ui_theme_lightframe_bitmap</item>
+    </style>
+    
+    <style name="AndorsTrail_Style_TabFrame">
+        <item name="android:background">?attr/ui_theme_tabframe_bitmap</item>
+    </style>
+
+    <style name="textView" parent="android:Widget.TextView">
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+    </style>
+
+    <style name="autoScrollingText" parent="android:Widget.TextView">
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+    </style>
+
+    <style name="textWithIcon" parent="android:Widget.TextView">
+        <item name="android:drawablePadding">@dimen/dialog_iconpadding_right</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+    </style>
+
+    <style name="textWithIconInList" parent="android:Widget.TextView">
+        <item name="android:drawablePadding">@dimen/dialog_iconpadding_right</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+    </style>
+
+    <style name="contextMenuText" parent="android:Widget.TextView">
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+        <item name="android:textSize">@dimen/titletext</item>
+    </style>
+
+    <style name="titleWithIcon" parent="@style/textWithIcon">
+        <item name="android:textSize">@dimen/titletext</item>
+        <item name="android:paddingBottom">@dimen/dialog_iconpadding_bottom</item>
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+    </style>
+
+    <style name="checkedListItem" parent="android:style/Widget.TextView">
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+        <item name="android:textSize">@dimen/titletext</item>
+    </style>
+
+    <style name="statsBoxStyle" parent="android:Widget.TextView">
+        <item name="android:background">?attr/ui_theme_richframe_bitmap</item>
+        <item name="android:drawablePadding">@dimen/boxshape_margin</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_margin">@dimen/boxshape_margin</item>
+        <item name="android:padding">@dimen/boxshape_margin</item>
+        <item name="android:textSize">@dimen/smalltext</item>
+        <item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
+    </style>
+
+    <style name="quickButton" parent="@style/AndorsTrail_Style_TextButton">
+        <item name="android:longClickable">true</item>
+        <item name="android:textSize">@dimen/actionbar_text</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">@dimen/smalltext_buttonheight</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:adjustViewBounds">true</item>
+        <item name="android:padding">5dp</item>
+    </style>
+
+    <style name="toolboxButtonTile" parent="@style/AndorsTrail_Style_TextButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="toolboxButtonDrawable" parent="@style/AndorsTrail_Style_TextButton">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:padding">0dp</item>
+    </style>
+
+    <style name="traitsinfo_label" parent="android:Widget.TextView">
+        <item name="android:layout_marginRight">10sp</item>
+    </style>
+
+    <style name="traitsinfo_2linelabel" parent="android:Widget.TextView"></style>
+
+    <style name="traitsinfo_2linevalue" parent="android:Widget.TextView">
+        <item name="android:layout_marginLeft">30sp</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/AndorsTrail/res/values/ui_theme.xml b/AndorsTrail/res/values/ui_theme.xml
new file mode 100644
index 000000000..b79fa248b
--- /dev/null
+++ b/AndorsTrail/res/values/ui_theme.xml
@@ -0,0 +1,463 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AndorsTrailTheme_Base" parent="android:Theme">
+        <item name="android:buttonStyle">@style/AndorsTrail_Style_TextButton</item>
+        <item name="android:buttonStyleToggle">@style/AndorsTrail_Style_ToggleButton</item>
+        <item name="android:imageButtonStyle">@style/AndorsTrail_Style_ImageButton</item>
+        <item name="android:checkboxStyle">@style/AndorsTrail_Style_Checkbox</item>
+        <item name="android:radioButtonStyle">@style/AndorsTrail_Style_RadioButton</item>
+        <item name="android:listViewStyle">@style/AndorsTrail_Style_ListView</item>
+        <item name="android:expandableListViewStyle">@style/AndorsTrail_Style_ExpandableListView</item>
+        <item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Style_PreferencesListHeader</item>
+        <item name="buttonQuickslotsButtonStyle">@style/AndorsTrail_Style_TextButton_Quickslots</item>
+        <!-- XML drawables -->
+        <item name="ui_theme_buttonbar_bg_drawable">@drawable/ui_blue_buttonbar_bg</item>
+        <item name="ui_theme_buttonbar_drawable">@drawable/ui_blue_buttonbar</item>
+        <item name="ui_theme_buttonbar_frame_drawable">@drawable/ui_blue_buttonbar_frame</item>
+        <item name="ui_theme_groupindicator_drawable">@drawable/ui_blue_groupindicator</item>
+        <item name="ui_theme_listseparator_drawable">@drawable/ui_blue_listseparator</item>
+        <item name="ui_theme_radiobutton_drawable">@drawable/ui_blue_radiobutton</item>
+        <item name="ui_theme_spinner_drawable">@drawable/ui_blue_spinner</item>
+        <item name="ui_theme_spinner_bg_drawable">@drawable/ui_blue_spinner_bg</item>
+        <item name="ui_theme_spinner_list_bg_drawable">@drawable/ui_blue_spinner_list_bg</item>
+        <item name="ui_theme_tabwidget_drawable">@drawable/ui_blue_tabwidget</item>
+        <item name="ui_theme_textbutton_drawable">@drawable/ui_blue_textbutton</item>
+        <item name="ui_theme_togglebutton_drawable">@drawable/ui_blue_togglebutton</item>
+        <!-- Bitmaps -->
+        <item name="ui_theme_buttonbar_bg_disabled_pressed_bitmap">@drawable/ui_blue_buttonbar_bg_disabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap">@drawable/ui_blue_buttonbar_bg_disabled_unpressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_pressed_bitmap">@drawable/ui_blue_buttonbar_bg_enabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap">@drawable/ui_blue_buttonbar_bg_enabled_unpressed</item>
+        <item name="ui_theme_buttonbar_frame_hleft_bitmap">@drawable/ui_blue_buttonbar_frame_hleft</item>
+        <item name="ui_theme_buttonbar_frame_hmid_bitmap">@drawable/ui_blue_buttonbar_frame_hmid</item>
+        <item name="ui_theme_buttonbar_frame_hright_bitmap">@drawable/ui_blue_buttonbar_frame_hright</item>
+        <item name="ui_theme_buttonbar_frame_solo_bitmap">@drawable/ui_blue_buttonbar_frame_solo</item>
+        <item name="ui_theme_buttonbar_frame_vbottom_bitmap">@drawable/ui_blue_buttonbar_frame_vbottom</item>
+        <item name="ui_theme_buttonbar_frame_vmid_bitmap">@drawable/ui_blue_buttonbar_frame_vmid</item>
+        <item name="ui_theme_buttonbar_frame_vtop_bitmap">@drawable/ui_blue_buttonbar_frame_vtop</item>
+        <item name="ui_theme_lightframe_bitmap">@drawable/ui_blue_lightframe</item>
+        <item name="ui_theme_lightframe_highlight_bitmap">@drawable/ui_blue_lightframe_highlight</item>
+        <item name="ui_theme_radiobutton_disabled_checked_bitmap">@drawable/ui_blue_radiobutton_disabled_checked</item>
+        <item name="ui_theme_radiobutton_disabled_unchecked_bitmap">@drawable/ui_blue_radiobutton_disabled_unchecked</item>
+        <item name="ui_theme_radiobutton_enabled_checked_bitmap">@drawable/ui_blue_radiobutton_enabled_checked</item>
+        <item name="ui_theme_radiobutton_enabled_unchecked_bitmap">@drawable/ui_blue_radiobutton_enabled_unchecked</item>
+        <item name="ui_theme_richframe_bitmap">@drawable/ui_blue_richframe</item>
+        <item name="ui_theme_spinner_arrow_bitmap">@drawable/ui_blue_spinner_arrow</item>
+        <item name="ui_theme_spinner_disabled_pressed_bitmap">@drawable/ui_blue_spinner_disabled_pressed</item>
+        <item name="ui_theme_spinner_disabled_unpressed_bitmap">@drawable/ui_blue_spinner_disabled_unpressed</item>
+        <item name="ui_theme_spinner_enabled_pressed_bitmap">@drawable/ui_blue_spinner_enabled_pressed</item>
+        <item name="ui_theme_spinner_enabled_unpressed_bitmap">@drawable/ui_blue_spinner_enabled_unpressed</item>
+        <item name="ui_theme_stdframe_bitmap">@drawable/ui_blue_stdframe</item>
+        <item name="ui_theme_submenu_indicator_bitmap">@drawable/ui_blue_submenu_indicator</item>
+        <item name="ui_theme_tabframe_bitmap">@drawable/ui_blue_tabframe</item>
+        <item name="ui_theme_tabwidget_disabled_selected_bitmap">@drawable/ui_blue_tabwidget_disabled_selected</item>
+        <item name="ui_theme_tabwidget_disabled_unselected_bitmap">@drawable/ui_blue_tabwidget_disabled_unselected</item>
+        <item name="ui_theme_tabwidget_enabled_selected_bitmap">@drawable/ui_blue_tabwidget_enabled_selected</item>
+        <item name="ui_theme_tabwidget_enabled_unselected_bitmap">@drawable/ui_blue_tabwidget_enabled_unselected</item>
+        <item name="ui_theme_textbutton_disabled_pressed_bitmap">@drawable/ui_blue_textbutton_disabled_pressed</item>
+        <item name="ui_theme_textbutton_disabled_unpressed_bitmap">@drawable/ui_blue_textbutton_disabled_unpressed</item>
+        <item name="ui_theme_textbutton_enabled_pressed_bitmap">@drawable/ui_blue_textbutton_enabled_pressed</item>
+        <item name="ui_theme_textbutton_enabled_unpressed_bitmap">@drawable/ui_blue_textbutton_enabled_unpressed</item>
+       	<!-- Color palette -->
+        <item name="ui_theme_stdframe_bg_color">@color/ui_blue_palette_blue_dark</item>
+        <item name="ui_theme_buttonbar_bg_color">@color/ui_blue_palette_blue_mid</item>
+		<item name="ui_theme_displayworldmap_bg_color">@color/ui_blue_palette_blue_dark</item>
+       	<item name="ui_theme_palette_text_gray_darker_color">@color/ui_blue_palette_text_gray_darker</item>
+        <item name="ui_theme_palette_text_gray_light_color">@color/ui_blue_palette_text_gray_light</item>
+        <item name="ui_theme_palette_text_gray_mid_color">@color/ui_blue_palette_text_gray_mid</item>
+        <item name="ui_theme_textbutton_textcolor_color">@color/ui_blue_textbutton_textcolor</item>
+	    <!-- Player name in convo -->
+		<item name="ui_theme_playername_dark_color">@color/ui_blue_palette_orange_dark</item>
+		<item name="ui_theme_playername_light_color">@color/ui_blue_palette_orange_light</item>
+		<!-- NPC name in convo -->
+		<item name="ui_theme_npcname_dark_color">@color/ui_blue_palette_mustard_dark</item>
+		<item name="ui_theme_npcname_light_color">@color/ui_blue_palette_mustard_light</item>
+		<!-- Rewards in convo -->
+		<item name="ui_theme_reward_dark_color">@color/ui_blue_palette_cyan_dark</item>
+		<item name="ui_theme_reward_light_color">@color/ui_blue_palette_cyan_light</item>
+		<!-- Actual dialogue text in convo -->
+		<item name="ui_theme_dialogue_dark_color">@color/ui_blue_palette_text_gray_mid</item>
+		<item name="ui_theme_dialogue_light_color">@color/ui_blue_palette_text_gray_light</item>
+    </style>
+
+	<style name="AndorsTrailDialogTheme_Base" parent="android:Theme.Dialog">
+        <item name="android:buttonStyle">@style/AndorsTrail_Style_TextButton</item>
+        <item name="android:imageButtonStyle">@style/AndorsTrail_Style_ImageButton</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:background">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:checkboxStyle">@style/AndorsTrail_Style_Checkbox</item>
+        <item name="android:radioButtonStyle">@style/AndorsTrail_Style_RadioButton</item>
+        <item name="android:listViewStyle">@style/AndorsTrail_Style_ListView</item>
+        <item name="android:expandableListViewStyle">@style/AndorsTrail_Style_ExpandableListView</item>
+        <item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Style_PreferencesListHeader</item>
+        <item name="buttonQuickslotsButtonStyle">@style/AndorsTrail_Style_TextButton_Quickslots</item>
+        
+        <!-- XML drawables -->
+        <item name="ui_theme_buttonbar_bg_drawable">@drawable/ui_blue_buttonbar_bg</item>
+        <item name="ui_theme_buttonbar_drawable">@drawable/ui_blue_buttonbar</item>
+        <item name="ui_theme_buttonbar_frame_drawable">@drawable/ui_blue_buttonbar_frame</item>
+        <item name="ui_theme_groupindicator_drawable">@drawable/ui_blue_groupindicator</item>
+        <item name="ui_theme_listseparator_drawable">@drawable/ui_blue_listseparator</item>
+        <item name="ui_theme_radiobutton_drawable">@drawable/ui_blue_radiobutton</item>
+        <item name="ui_theme_spinner_drawable">@drawable/ui_blue_spinner</item>
+        <item name="ui_theme_spinner_bg_drawable">@drawable/ui_blue_spinner_bg</item>
+        <item name="ui_theme_spinner_list_bg_drawable">@drawable/ui_blue_spinner_list_bg</item>
+        <item name="ui_theme_tabwidget_drawable">@drawable/ui_blue_tabwidget</item>
+        <item name="ui_theme_textbutton_drawable">@drawable/ui_blue_textbutton</item>
+        <item name="ui_theme_togglebutton_drawable">@drawable/ui_blue_togglebutton</item>
+        <!-- Bitmaps -->
+        <item name="ui_theme_buttonbar_bg_disabled_pressed_bitmap">@drawable/ui_blue_buttonbar_bg_disabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap">@drawable/ui_blue_buttonbar_bg_disabled_unpressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_pressed_bitmap">@drawable/ui_blue_buttonbar_bg_enabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap">@drawable/ui_blue_buttonbar_bg_enabled_unpressed</item>
+        <item name="ui_theme_buttonbar_frame_hleft_bitmap">@drawable/ui_blue_buttonbar_frame_hleft</item>
+        <item name="ui_theme_buttonbar_frame_hmid_bitmap">@drawable/ui_blue_buttonbar_frame_hmid</item>
+        <item name="ui_theme_buttonbar_frame_hright_bitmap">@drawable/ui_blue_buttonbar_frame_hright</item>
+        <item name="ui_theme_buttonbar_frame_solo_bitmap">@drawable/ui_blue_buttonbar_frame_solo</item>
+        <item name="ui_theme_buttonbar_frame_vbottom_bitmap">@drawable/ui_blue_buttonbar_frame_vbottom</item>
+        <item name="ui_theme_buttonbar_frame_vmid_bitmap">@drawable/ui_blue_buttonbar_frame_vmid</item>
+        <item name="ui_theme_buttonbar_frame_vtop_bitmap">@drawable/ui_blue_buttonbar_frame_vtop</item>
+        <item name="ui_theme_lightframe_bitmap">@drawable/ui_blue_lightframe</item>
+        <item name="ui_theme_lightframe_highlight_bitmap">@drawable/ui_blue_lightframe_highlight</item>
+        <item name="ui_theme_radiobutton_disabled_checked_bitmap">@drawable/ui_blue_radiobutton_disabled_checked</item>
+        <item name="ui_theme_radiobutton_disabled_unchecked_bitmap">@drawable/ui_blue_radiobutton_disabled_unchecked</item>
+        <item name="ui_theme_radiobutton_enabled_checked_bitmap">@drawable/ui_blue_radiobutton_enabled_checked</item>
+        <item name="ui_theme_radiobutton_enabled_unchecked_bitmap">@drawable/ui_blue_radiobutton_enabled_unchecked</item>
+        <item name="ui_theme_richframe_bitmap">@drawable/ui_blue_richframe</item>
+        <item name="ui_theme_spinner_arrow_bitmap">@drawable/ui_blue_spinner_arrow</item>
+        <item name="ui_theme_spinner_disabled_pressed_bitmap">@drawable/ui_blue_spinner_disabled_pressed</item>
+        <item name="ui_theme_spinner_disabled_unpressed_bitmap">@drawable/ui_blue_spinner_disabled_unpressed</item>
+        <item name="ui_theme_spinner_enabled_pressed_bitmap">@drawable/ui_blue_spinner_enabled_pressed</item>
+        <item name="ui_theme_spinner_enabled_unpressed_bitmap">@drawable/ui_blue_spinner_enabled_unpressed</item>
+        <item name="ui_theme_stdframe_bitmap">@drawable/ui_blue_stdframe</item>
+        <item name="ui_theme_submenu_indicator_bitmap">@drawable/ui_blue_submenu_indicator</item>
+        <item name="ui_theme_tabframe_bitmap">@drawable/ui_blue_tabframe</item>
+        <item name="ui_theme_tabwidget_disabled_selected_bitmap">@drawable/ui_blue_tabwidget_disabled_selected</item>
+        <item name="ui_theme_tabwidget_disabled_unselected_bitmap">@drawable/ui_blue_tabwidget_disabled_unselected</item>
+        <item name="ui_theme_tabwidget_enabled_selected_bitmap">@drawable/ui_blue_tabwidget_enabled_selected</item>
+        <item name="ui_theme_tabwidget_enabled_unselected_bitmap">@drawable/ui_blue_tabwidget_enabled_unselected</item>
+        <item name="ui_theme_textbutton_disabled_pressed_bitmap">@drawable/ui_blue_textbutton_disabled_pressed</item>
+        <item name="ui_theme_textbutton_disabled_unpressed_bitmap">@drawable/ui_blue_textbutton_disabled_unpressed</item>
+        <item name="ui_theme_textbutton_enabled_pressed_bitmap">@drawable/ui_blue_textbutton_enabled_pressed</item>
+        <item name="ui_theme_textbutton_enabled_unpressed_bitmap">@drawable/ui_blue_textbutton_enabled_unpressed</item>
+       	<!-- Color palette -->
+        <item name="ui_theme_stdframe_bg_color">@color/ui_blue_palette_blue_dark</item>
+        <item name="ui_theme_buttonbar_bg_color">@color/ui_blue_palette_blue_mid</item>
+		<item name="ui_theme_displayworldmap_bg_color">@color/ui_blue_palette_blue_dark</item>
+       	<item name="ui_theme_palette_text_gray_darker_color">@color/ui_blue_palette_text_gray_darker</item>
+        <item name="ui_theme_palette_text_gray_light_color">@color/ui_blue_palette_text_gray_light</item>
+        <item name="ui_theme_palette_text_gray_mid_color">@color/ui_blue_palette_text_gray_mid</item>
+        <item name="ui_theme_textbutton_textcolor_color">@color/ui_blue_textbutton_textcolor</item>
+	    <!-- Player name in convo -->
+		<item name="ui_theme_playername_dark_color">@color/ui_blue_palette_orange_dark</item>
+		<item name="ui_theme_playername_light_color">@color/ui_blue_palette_orange_light</item>
+		<!-- NPC name in convo -->
+		<item name="ui_theme_npcname_dark_color">@color/ui_blue_palette_mustard_dark</item>
+		<item name="ui_theme_npcname_light_color">@color/ui_blue_palette_mustard_light</item>
+		<!-- Rewards in convo -->
+		<item name="ui_theme_reward_dark_color">@color/ui_blue_palette_cyan_dark</item>
+		<item name="ui_theme_reward_light_color">@color/ui_blue_palette_cyan_light</item>
+		<!-- Actual dialogue text in convo -->
+		<item name="ui_theme_dialogue_dark_color">@color/ui_blue_palette_text_gray_mid</item>
+		<item name="ui_theme_dialogue_light_color">@color/ui_blue_palette_text_gray_light</item>
+    </style>
+    
+	
+	<!-- ui_blue concrete palette -->
+	
+	<!-- Backgrounds -->
+	<color name="ui_blue_palette_blue_dark">#122438</color>
+	<color name="ui_blue_palette_blue_mid">#2e4464</color>
+	<color name="ui_blue_palette_blue_light">#4a6390</color>
+	<!-- Highlights -->
+	<color name="ui_blue_palette_highlight_gray_dark">#5e5e5e</color>
+	<color name="ui_blue_palette_highlight_gray_mid">#8c8c8c</color>
+	<color name="ui_blue_palette_highlight_gray_light">#b9b9b9</color>
+	<!-- Text grays -->
+	<color name="ui_blue_palette_text_gray_darker">#b0b0b0</color>
+	<color name="ui_blue_palette_text_gray_dark">#dadada</color>
+	<color name="ui_blue_palette_text_gray_mid">#ededed</color>
+	<color name="ui_blue_palette_text_gray_light">#fcfcfc</color>
+	<!-- Bright high-contrasts accents & player name in convo -->
+	<color name="ui_blue_palette_orange_dark">#c98e00</color>
+	<color name="ui_blue_palette_orange_light">#ffb400</color>
+	<!-- Washy accents & NPC name in convo -->
+	<color name="ui_blue_palette_mustard_dark">#a2a21d</color>
+	<color name="ui_blue_palette_mustard_light">#bbbb22</color>
+	<!-- Bright low-contrast accents & rewards in convo -->
+	<color name="ui_blue_palette_cyan_dark">#1e8f9c</color>
+	<color name="ui_blue_palette_cyan_light">#5ee3f1</color>
+    
+	<!-- Wrappers -->
+    <style name="AndorsTrailTheme_Blue_v14" parent="AndorsTrailTheme_Base" />
+    <style name="AndorsTrailTheme_Blue" parent="AndorsTrailTheme_Blue_v14" />
+    <style name="AndorsTrailDialogTheme_Blue_v14" parent="AndorsTrailDialogTheme_Base" />
+    <style name="AndorsTrailDialogTheme_Blue" parent="AndorsTrailDialogTheme_Blue_v14" />
+    <style name="AndorsTrailTheme_Blue.NoBackground" parent="AndorsTrailTheme_Blue">
+        <item name="android:windowBackground">@null</item>
+    </style>
+    
+    
+    <!-- Green style alternative -->
+    <style name="AndorsTrailTheme_Green_Base" parent="AndorsTrailTheme_Blue" >
+        <!-- XML drawables -->
+        <item name="ui_theme_buttonbar_bg_drawable">@drawable/ui_green_buttonbar_bg</item>
+        <item name="ui_theme_buttonbar_drawable">@drawable/ui_green_buttonbar</item>
+        <item name="ui_theme_buttonbar_frame_drawable">@drawable/ui_green_buttonbar_frame</item>
+        <item name="ui_theme_groupindicator_drawable">@drawable/ui_green_groupindicator</item>
+        <item name="ui_theme_listseparator_drawable">@drawable/ui_green_listseparator</item>
+        <item name="ui_theme_radiobutton_drawable">@drawable/ui_green_radiobutton</item>
+        <item name="ui_theme_spinner_drawable">@drawable/ui_green_spinner</item>
+        <item name="ui_theme_spinner_bg_drawable">@drawable/ui_green_spinner_bg</item>
+        <item name="ui_theme_spinner_list_bg_drawable">@drawable/ui_green_spinner_list_bg</item>
+        <item name="ui_theme_tabwidget_drawable">@drawable/ui_green_tabwidget</item>
+        <item name="ui_theme_textbutton_drawable">@drawable/ui_green_textbutton</item>
+        <item name="ui_theme_togglebutton_drawable">@drawable/ui_green_togglebutton</item>
+        <!-- Bitmaps -->
+        <item name="ui_theme_buttonbar_bg_disabled_pressed_bitmap">@drawable/ui_green_buttonbar_bg_disabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap">@drawable/ui_green_buttonbar_bg_disabled_unpressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_pressed_bitmap">@drawable/ui_green_buttonbar_bg_enabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap">@drawable/ui_green_buttonbar_bg_enabled_unpressed</item>
+        <item name="ui_theme_buttonbar_frame_hleft_bitmap">@drawable/ui_green_buttonbar_frame_hleft</item>
+        <item name="ui_theme_buttonbar_frame_hmid_bitmap">@drawable/ui_green_buttonbar_frame_hmid</item>
+        <item name="ui_theme_buttonbar_frame_hright_bitmap">@drawable/ui_green_buttonbar_frame_hright</item>
+        <item name="ui_theme_buttonbar_frame_solo_bitmap">@drawable/ui_green_buttonbar_frame_solo</item>
+        <item name="ui_theme_buttonbar_frame_vbottom_bitmap">@drawable/ui_green_buttonbar_frame_vbottom</item>
+        <item name="ui_theme_buttonbar_frame_vmid_bitmap">@drawable/ui_green_buttonbar_frame_vmid</item>
+        <item name="ui_theme_buttonbar_frame_vtop_bitmap">@drawable/ui_green_buttonbar_frame_vtop</item>
+        <item name="ui_theme_lightframe_bitmap">@drawable/ui_green_lightframe</item>
+        <item name="ui_theme_lightframe_highlight_bitmap">@drawable/ui_green_lightframe_highlight</item>
+        <item name="ui_theme_radiobutton_disabled_checked_bitmap">@drawable/ui_green_radiobutton_disabled_checked</item>
+        <item name="ui_theme_radiobutton_disabled_unchecked_bitmap">@drawable/ui_green_radiobutton_disabled_unchecked</item>
+        <item name="ui_theme_radiobutton_enabled_checked_bitmap">@drawable/ui_green_radiobutton_enabled_checked</item>
+        <item name="ui_theme_radiobutton_enabled_unchecked_bitmap">@drawable/ui_green_radiobutton_enabled_unchecked</item>
+        <item name="ui_theme_richframe_bitmap">@drawable/ui_green_richframe</item>
+        <item name="ui_theme_spinner_arrow_bitmap">@drawable/ui_green_spinner_arrow</item>
+        <item name="ui_theme_spinner_disabled_pressed_bitmap">@drawable/ui_green_spinner_disabled_pressed</item>
+        <item name="ui_theme_spinner_disabled_unpressed_bitmap">@drawable/ui_green_spinner_disabled_unpressed</item>
+        <item name="ui_theme_spinner_enabled_pressed_bitmap">@drawable/ui_green_spinner_enabled_pressed</item>
+        <item name="ui_theme_spinner_enabled_unpressed_bitmap">@drawable/ui_green_spinner_enabled_unpressed</item>
+        <item name="ui_theme_stdframe_bitmap">@drawable/ui_green_stdframe</item>
+        <item name="ui_theme_submenu_indicator_bitmap">@drawable/ui_green_submenu_indicator</item>
+        <item name="ui_theme_tabframe_bitmap">@drawable/ui_green_tabframe</item>
+        <item name="ui_theme_tabwidget_disabled_selected_bitmap">@drawable/ui_green_tabwidget_disabled_selected</item>
+        <item name="ui_theme_tabwidget_disabled_unselected_bitmap">@drawable/ui_green_tabwidget_disabled_unselected</item>
+        <item name="ui_theme_tabwidget_enabled_selected_bitmap">@drawable/ui_green_tabwidget_enabled_selected</item>
+        <item name="ui_theme_tabwidget_enabled_unselected_bitmap">@drawable/ui_green_tabwidget_enabled_unselected</item>
+        <item name="ui_theme_textbutton_disabled_pressed_bitmap">@drawable/ui_green_textbutton_disabled_pressed</item>
+        <item name="ui_theme_textbutton_disabled_unpressed_bitmap">@drawable/ui_green_textbutton_disabled_unpressed</item>
+        <item name="ui_theme_textbutton_enabled_pressed_bitmap">@drawable/ui_green_textbutton_enabled_pressed</item>
+        <item name="ui_theme_textbutton_enabled_unpressed_bitmap">@drawable/ui_green_textbutton_enabled_unpressed</item>
+       	<!-- Color palette -->
+        <item name="ui_theme_stdframe_bg_color">@color/ui_green_palette_green_dark</item>
+        <item name="ui_theme_buttonbar_bg_color">@color/ui_green_palette_green_mid</item>
+		<item name="ui_theme_displayworldmap_bg_color">@color/ui_green_palette_green_dark</item>
+    </style>
+    
+    
+     <style name="AndorsTrailDialogTheme_Green_Base" parent="AndorsTrailDialogTheme_Blue" >
+        <!-- XML drawables -->
+        <item name="ui_theme_buttonbar_bg_drawable">@drawable/ui_green_buttonbar_bg</item>
+        <item name="ui_theme_buttonbar_drawable">@drawable/ui_green_buttonbar</item>
+        <item name="ui_theme_buttonbar_frame_drawable">@drawable/ui_green_buttonbar_frame</item>
+        <item name="ui_theme_groupindicator_drawable">@drawable/ui_green_groupindicator</item>
+        <item name="ui_theme_listseparator_drawable">@drawable/ui_green_listseparator</item>
+        <item name="ui_theme_radiobutton_drawable">@drawable/ui_green_radiobutton</item>
+        <item name="ui_theme_spinner_drawable">@drawable/ui_green_spinner</item>
+        <item name="ui_theme_spinner_bg_drawable">@drawable/ui_green_spinner_bg</item>
+        <item name="ui_theme_spinner_list_bg_drawable">@drawable/ui_green_spinner_list_bg</item>
+        <item name="ui_theme_tabwidget_drawable">@drawable/ui_green_tabwidget</item>
+        <item name="ui_theme_textbutton_drawable">@drawable/ui_green_textbutton</item>
+        <item name="ui_theme_togglebutton_drawable">@drawable/ui_green_togglebutton</item>
+        <!-- Bitmaps -->
+        <item name="ui_theme_buttonbar_bg_disabled_pressed_bitmap">@drawable/ui_green_buttonbar_bg_disabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap">@drawable/ui_green_buttonbar_bg_disabled_unpressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_pressed_bitmap">@drawable/ui_green_buttonbar_bg_enabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap">@drawable/ui_green_buttonbar_bg_enabled_unpressed</item>
+        <item name="ui_theme_buttonbar_frame_hleft_bitmap">@drawable/ui_green_buttonbar_frame_hleft</item>
+        <item name="ui_theme_buttonbar_frame_hmid_bitmap">@drawable/ui_green_buttonbar_frame_hmid</item>
+        <item name="ui_theme_buttonbar_frame_hright_bitmap">@drawable/ui_green_buttonbar_frame_hright</item>
+        <item name="ui_theme_buttonbar_frame_solo_bitmap">@drawable/ui_green_buttonbar_frame_solo</item>
+        <item name="ui_theme_buttonbar_frame_vbottom_bitmap">@drawable/ui_green_buttonbar_frame_vbottom</item>
+        <item name="ui_theme_buttonbar_frame_vmid_bitmap">@drawable/ui_green_buttonbar_frame_vmid</item>
+        <item name="ui_theme_buttonbar_frame_vtop_bitmap">@drawable/ui_green_buttonbar_frame_vtop</item>
+        <item name="ui_theme_lightframe_bitmap">@drawable/ui_green_lightframe</item>
+        <item name="ui_theme_lightframe_highlight_bitmap">@drawable/ui_green_lightframe_highlight</item>
+        <item name="ui_theme_radiobutton_disabled_checked_bitmap">@drawable/ui_green_radiobutton_disabled_checked</item>
+        <item name="ui_theme_radiobutton_disabled_unchecked_bitmap">@drawable/ui_green_radiobutton_disabled_unchecked</item>
+        <item name="ui_theme_radiobutton_enabled_checked_bitmap">@drawable/ui_green_radiobutton_enabled_checked</item>
+        <item name="ui_theme_radiobutton_enabled_unchecked_bitmap">@drawable/ui_green_radiobutton_enabled_unchecked</item>
+        <item name="ui_theme_richframe_bitmap">@drawable/ui_green_richframe</item>
+        <item name="ui_theme_spinner_arrow_bitmap">@drawable/ui_green_spinner_arrow</item>
+        <item name="ui_theme_spinner_disabled_pressed_bitmap">@drawable/ui_green_spinner_disabled_pressed</item>
+        <item name="ui_theme_spinner_disabled_unpressed_bitmap">@drawable/ui_green_spinner_disabled_unpressed</item>
+        <item name="ui_theme_spinner_enabled_pressed_bitmap">@drawable/ui_green_spinner_enabled_pressed</item>
+        <item name="ui_theme_spinner_enabled_unpressed_bitmap">@drawable/ui_green_spinner_enabled_unpressed</item>
+        <item name="ui_theme_stdframe_bitmap">@drawable/ui_green_stdframe</item>
+        <item name="ui_theme_submenu_indicator_bitmap">@drawable/ui_green_submenu_indicator</item>
+        <item name="ui_theme_tabframe_bitmap">@drawable/ui_green_tabframe</item>
+        <item name="ui_theme_tabwidget_disabled_selected_bitmap">@drawable/ui_green_tabwidget_disabled_selected</item>
+        <item name="ui_theme_tabwidget_disabled_unselected_bitmap">@drawable/ui_green_tabwidget_disabled_unselected</item>
+        <item name="ui_theme_tabwidget_enabled_selected_bitmap">@drawable/ui_green_tabwidget_enabled_selected</item>
+        <item name="ui_theme_tabwidget_enabled_unselected_bitmap">@drawable/ui_green_tabwidget_enabled_unselected</item>
+        <item name="ui_theme_textbutton_disabled_pressed_bitmap">@drawable/ui_green_textbutton_disabled_pressed</item>
+        <item name="ui_theme_textbutton_disabled_unpressed_bitmap">@drawable/ui_green_textbutton_disabled_unpressed</item>
+        <item name="ui_theme_textbutton_enabled_pressed_bitmap">@drawable/ui_green_textbutton_enabled_pressed</item>
+        <item name="ui_theme_textbutton_enabled_unpressed_bitmap">@drawable/ui_green_textbutton_enabled_unpressed</item>
+       	<!-- Color palette -->
+        <item name="ui_theme_stdframe_bg_color">@color/ui_green_palette_green_dark</item>
+        <item name="ui_theme_buttonbar_bg_color">@color/ui_green_palette_green_mid</item>
+		<item name="ui_theme_displayworldmap_bg_color">@color/ui_green_palette_green_dark</item>
+    </style>
+    <style name="AndorsTrailTheme_Green.NoBackground" parent="AndorsTrailTheme_Green">
+        <item name="android:windowBackground">@null</item>
+    </style>
+    
+	<!-- ui_green concrete palette -->
+	
+	<!-- Backgrounds -->
+	<color name="ui_green_palette_green_dark">#142323</color>
+	<color name="ui_green_palette_green_mid">#1f3434</color>
+	<color name="ui_green_palette_green_light">#294646</color>
+    
+	<!-- Wrappers -->
+    <style name="AndorsTrailTheme_Green_v14" parent="AndorsTrailTheme_Green_Base" />
+	<style name="AndorsTrailDialogTheme_Green_v14" parent="AndorsTrailDialogTheme_Green_Base" />
+	
+    <style name="AndorsTrailTheme_Green" parent="AndorsTrailTheme_Green_v14" />
+	<style name="AndorsTrailDialogTheme_Green" parent="AndorsTrailDialogTheme_Green_v14" />
+	
+	
+	
+	<!-- Charcoal style alternative -->
+    <style name="AndorsTrailTheme_Charcoal_Base" parent="AndorsTrailTheme_Blue" >
+        <!-- XML drawables -->
+        <item name="ui_theme_buttonbar_bg_drawable">@drawable/ui_charcoal_buttonbar_bg</item>
+        <item name="ui_theme_buttonbar_drawable">@drawable/ui_charcoal_buttonbar</item>
+        <item name="ui_theme_buttonbar_frame_drawable">@drawable/ui_charcoal_buttonbar_frame</item>
+        <item name="ui_theme_groupindicator_drawable">@drawable/ui_charcoal_groupindicator</item>
+        <item name="ui_theme_listseparator_drawable">@drawable/ui_charcoal_listseparator</item>
+        <item name="ui_theme_radiobutton_drawable">@drawable/ui_charcoal_radiobutton</item>
+        <item name="ui_theme_spinner_drawable">@drawable/ui_charcoal_spinner</item>
+        <item name="ui_theme_spinner_bg_drawable">@drawable/ui_charcoal_spinner_bg</item>
+        <item name="ui_theme_spinner_list_bg_drawable">@drawable/ui_charcoal_spinner_list_bg</item>
+        <item name="ui_theme_tabwidget_drawable">@drawable/ui_charcoal_tabwidget</item>
+        <item name="ui_theme_textbutton_drawable">@drawable/ui_charcoal_textbutton</item>
+        <item name="ui_theme_togglebutton_drawable">@drawable/ui_charcoal_togglebutton</item>
+        <!-- Bitmaps -->
+        <item name="ui_theme_buttonbar_bg_disabled_pressed_bitmap">@drawable/ui_charcoal_buttonbar_bg_disabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap">@drawable/ui_charcoal_buttonbar_bg_disabled_unpressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_pressed_bitmap">@drawable/ui_charcoal_buttonbar_bg_enabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap">@drawable/ui_charcoal_buttonbar_bg_enabled_unpressed</item>
+        <item name="ui_theme_buttonbar_frame_hleft_bitmap">@drawable/ui_charcoal_buttonbar_frame_hleft</item>
+        <item name="ui_theme_buttonbar_frame_hmid_bitmap">@drawable/ui_charcoal_buttonbar_frame_hmid</item>
+        <item name="ui_theme_buttonbar_frame_hright_bitmap">@drawable/ui_charcoal_buttonbar_frame_hright</item>
+        <item name="ui_theme_buttonbar_frame_solo_bitmap">@drawable/ui_charcoal_buttonbar_frame_solo</item>
+        <item name="ui_theme_buttonbar_frame_vbottom_bitmap">@drawable/ui_charcoal_buttonbar_frame_vbottom</item>
+        <item name="ui_theme_buttonbar_frame_vmid_bitmap">@drawable/ui_charcoal_buttonbar_frame_vmid</item>
+        <item name="ui_theme_buttonbar_frame_vtop_bitmap">@drawable/ui_charcoal_buttonbar_frame_vtop</item>
+        <item name="ui_theme_lightframe_bitmap">@drawable/ui_charcoal_lightframe</item>
+        <item name="ui_theme_lightframe_highlight_bitmap">@drawable/ui_charcoal_lightframe_highlight</item>
+        <item name="ui_theme_radiobutton_disabled_checked_bitmap">@drawable/ui_charcoal_radiobutton_disabled_checked</item>
+        <item name="ui_theme_radiobutton_disabled_unchecked_bitmap">@drawable/ui_charcoal_radiobutton_disabled_unchecked</item>
+        <item name="ui_theme_radiobutton_enabled_checked_bitmap">@drawable/ui_charcoal_radiobutton_enabled_checked</item>
+        <item name="ui_theme_radiobutton_enabled_unchecked_bitmap">@drawable/ui_charcoal_radiobutton_enabled_unchecked</item>
+        <item name="ui_theme_richframe_bitmap">@drawable/ui_charcoal_richframe</item>
+        <item name="ui_theme_spinner_arrow_bitmap">@drawable/ui_charcoal_spinner_arrow</item>
+        <item name="ui_theme_spinner_disabled_pressed_bitmap">@drawable/ui_charcoal_spinner_disabled_pressed</item>
+        <item name="ui_theme_spinner_disabled_unpressed_bitmap">@drawable/ui_charcoal_spinner_disabled_unpressed</item>
+        <item name="ui_theme_spinner_enabled_pressed_bitmap">@drawable/ui_charcoal_spinner_enabled_pressed</item>
+        <item name="ui_theme_spinner_enabled_unpressed_bitmap">@drawable/ui_charcoal_spinner_enabled_unpressed</item>
+        <item name="ui_theme_stdframe_bitmap">@drawable/ui_charcoal_stdframe</item>
+        <item name="ui_theme_submenu_indicator_bitmap">@drawable/ui_charcoal_submenu_indicator</item>
+        <item name="ui_theme_tabframe_bitmap">@drawable/ui_charcoal_tabframe</item>
+        <item name="ui_theme_tabwidget_disabled_selected_bitmap">@drawable/ui_charcoal_tabwidget_disabled_selected</item>
+        <item name="ui_theme_tabwidget_disabled_unselected_bitmap">@drawable/ui_charcoal_tabwidget_disabled_unselected</item>
+        <item name="ui_theme_tabwidget_enabled_selected_bitmap">@drawable/ui_charcoal_tabwidget_enabled_selected</item>
+        <item name="ui_theme_tabwidget_enabled_unselected_bitmap">@drawable/ui_charcoal_tabwidget_enabled_unselected</item>
+        <item name="ui_theme_textbutton_disabled_pressed_bitmap">@drawable/ui_charcoal_textbutton_disabled_pressed</item>
+        <item name="ui_theme_textbutton_disabled_unpressed_bitmap">@drawable/ui_charcoal_textbutton_disabled_unpressed</item>
+        <item name="ui_theme_textbutton_enabled_pressed_bitmap">@drawable/ui_charcoal_textbutton_enabled_pressed</item>
+        <item name="ui_theme_textbutton_enabled_unpressed_bitmap">@drawable/ui_charcoal_textbutton_enabled_unpressed</item>
+       	<!-- Color palette -->
+        <item name="ui_theme_stdframe_bg_color">@color/ui_charcoal_palette_charcoal_dark</item>
+        <item name="ui_theme_buttonbar_bg_color">@color/ui_charcoal_palette_charcoal_mid</item>
+		<item name="ui_theme_displayworldmap_bg_color">@color/ui_charcoal_palette_charcoal_dark</item>
+    </style>
+    
+    
+     <style name="AndorsTrailDialogTheme_Charcoal_Base" parent="AndorsTrailDialogTheme_Blue" >
+        <!-- XML drawables -->
+        <item name="ui_theme_buttonbar_bg_drawable">@drawable/ui_charcoal_buttonbar_bg</item>
+        <item name="ui_theme_buttonbar_drawable">@drawable/ui_charcoal_buttonbar</item>
+        <item name="ui_theme_buttonbar_frame_drawable">@drawable/ui_charcoal_buttonbar_frame</item>
+        <item name="ui_theme_groupindicator_drawable">@drawable/ui_charcoal_groupindicator</item>
+        <item name="ui_theme_listseparator_drawable">@drawable/ui_charcoal_listseparator</item>
+        <item name="ui_theme_radiobutton_drawable">@drawable/ui_charcoal_radiobutton</item>
+        <item name="ui_theme_spinner_drawable">@drawable/ui_charcoal_spinner</item>
+        <item name="ui_theme_spinner_bg_drawable">@drawable/ui_charcoal_spinner_bg</item>
+        <item name="ui_theme_spinner_list_bg_drawable">@drawable/ui_charcoal_spinner_list_bg</item>
+        <item name="ui_theme_tabwidget_drawable">@drawable/ui_charcoal_tabwidget</item>
+        <item name="ui_theme_textbutton_drawable">@drawable/ui_charcoal_textbutton</item>
+        <item name="ui_theme_togglebutton_drawable">@drawable/ui_charcoal_togglebutton</item>
+        <!-- Bitmaps -->
+        <item name="ui_theme_buttonbar_bg_disabled_pressed_bitmap">@drawable/ui_charcoal_buttonbar_bg_disabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap">@drawable/ui_charcoal_buttonbar_bg_disabled_unpressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_pressed_bitmap">@drawable/ui_charcoal_buttonbar_bg_enabled_pressed</item>
+        <item name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap">@drawable/ui_charcoal_buttonbar_bg_enabled_unpressed</item>
+        <item name="ui_theme_buttonbar_frame_hleft_bitmap">@drawable/ui_charcoal_buttonbar_frame_hleft</item>
+        <item name="ui_theme_buttonbar_frame_hmid_bitmap">@drawable/ui_charcoal_buttonbar_frame_hmid</item>
+        <item name="ui_theme_buttonbar_frame_hright_bitmap">@drawable/ui_charcoal_buttonbar_frame_hright</item>
+        <item name="ui_theme_buttonbar_frame_solo_bitmap">@drawable/ui_charcoal_buttonbar_frame_solo</item>
+        <item name="ui_theme_buttonbar_frame_vbottom_bitmap">@drawable/ui_charcoal_buttonbar_frame_vbottom</item>
+        <item name="ui_theme_buttonbar_frame_vmid_bitmap">@drawable/ui_charcoal_buttonbar_frame_vmid</item>
+        <item name="ui_theme_buttonbar_frame_vtop_bitmap">@drawable/ui_charcoal_buttonbar_frame_vtop</item>
+        <item name="ui_theme_lightframe_bitmap">@drawable/ui_charcoal_lightframe</item>
+        <item name="ui_theme_lightframe_highlight_bitmap">@drawable/ui_charcoal_lightframe_highlight</item>
+        <item name="ui_theme_radiobutton_disabled_checked_bitmap">@drawable/ui_charcoal_radiobutton_disabled_checked</item>
+        <item name="ui_theme_radiobutton_disabled_unchecked_bitmap">@drawable/ui_charcoal_radiobutton_disabled_unchecked</item>
+        <item name="ui_theme_radiobutton_enabled_checked_bitmap">@drawable/ui_charcoal_radiobutton_enabled_checked</item>
+        <item name="ui_theme_radiobutton_enabled_unchecked_bitmap">@drawable/ui_charcoal_radiobutton_enabled_unchecked</item>
+        <item name="ui_theme_richframe_bitmap">@drawable/ui_charcoal_richframe</item>
+        <item name="ui_theme_spinner_arrow_bitmap">@drawable/ui_charcoal_spinner_arrow</item>
+        <item name="ui_theme_spinner_disabled_pressed_bitmap">@drawable/ui_charcoal_spinner_disabled_pressed</item>
+        <item name="ui_theme_spinner_disabled_unpressed_bitmap">@drawable/ui_charcoal_spinner_disabled_unpressed</item>
+        <item name="ui_theme_spinner_enabled_pressed_bitmap">@drawable/ui_charcoal_spinner_enabled_pressed</item>
+        <item name="ui_theme_spinner_enabled_unpressed_bitmap">@drawable/ui_charcoal_spinner_enabled_unpressed</item>
+        <item name="ui_theme_stdframe_bitmap">@drawable/ui_charcoal_stdframe</item>
+        <item name="ui_theme_submenu_indicator_bitmap">@drawable/ui_charcoal_submenu_indicator</item>
+        <item name="ui_theme_tabframe_bitmap">@drawable/ui_charcoal_tabframe</item>
+        <item name="ui_theme_tabwidget_disabled_selected_bitmap">@drawable/ui_charcoal_tabwidget_disabled_selected</item>
+        <item name="ui_theme_tabwidget_disabled_unselected_bitmap">@drawable/ui_charcoal_tabwidget_disabled_unselected</item>
+        <item name="ui_theme_tabwidget_enabled_selected_bitmap">@drawable/ui_charcoal_tabwidget_enabled_selected</item>
+        <item name="ui_theme_tabwidget_enabled_unselected_bitmap">@drawable/ui_charcoal_tabwidget_enabled_unselected</item>
+        <item name="ui_theme_textbutton_disabled_pressed_bitmap">@drawable/ui_charcoal_textbutton_disabled_pressed</item>
+        <item name="ui_theme_textbutton_disabled_unpressed_bitmap">@drawable/ui_charcoal_textbutton_disabled_unpressed</item>
+        <item name="ui_theme_textbutton_enabled_pressed_bitmap">@drawable/ui_charcoal_textbutton_enabled_pressed</item>
+        <item name="ui_theme_textbutton_enabled_unpressed_bitmap">@drawable/ui_charcoal_textbutton_enabled_unpressed</item>
+       	<!-- Color palette -->
+        <item name="ui_theme_stdframe_bg_color">@color/ui_charcoal_palette_charcoal_dark</item>
+        <item name="ui_theme_buttonbar_bg_color">@color/ui_charcoal_palette_charcoal_mid</item>
+		<item name="ui_theme_displayworldmap_bg_color">@color/ui_charcoal_palette_charcoal_dark</item>
+    </style>
+    <style name="AndorsTrailTheme_Charcoal.NoBackground" parent="AndorsTrailTheme_Charcoal">
+        <item name="android:windowBackground">@null</item>
+    </style>
+    
+	<!-- ui_charcoal concrete palette -->
+	
+	<!-- Backgrounds -->
+	<color name="ui_charcoal_palette_charcoal_dark">#161616</color>
+	<color name="ui_charcoal_palette_charcoal_mid">#2e2e2e</color>
+	<color name="ui_charcoal_palette_charcoal_light">#404040</color>
+    
+	<!-- Wrappers -->
+    <style name="AndorsTrailTheme_Charcoal_v14" parent="AndorsTrailTheme_Charcoal_Base" />
+	<style name="AndorsTrailDialogTheme_Charcoal_v14" parent="AndorsTrailDialogTheme_Charcoal_Base" />
+	
+    <style name="AndorsTrailTheme_Charcoal" parent="AndorsTrailTheme_Charcoal_v14" />
+	<style name="AndorsTrailDialogTheme_Charcoal" parent="AndorsTrailDialogTheme_Charcoal_v14" />
+	
+    
+</resources>
diff --git a/AndorsTrail/res/values/ui_theme_attrs.xml b/AndorsTrail/res/values/ui_theme_attrs.xml
new file mode 100644
index 000000000..847f30361
--- /dev/null
+++ b/AndorsTrail/res/values/ui_theme_attrs.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--  Styles -->
+    <attr name="buttonQuickslotsButtonStyle" format="reference" />
+    <!-- XML drawables -->
+    <attr name="ui_theme_buttonbar_bg_drawable" format="reference" />
+    <attr name="ui_theme_buttonbar_drawable" format="reference" />
+    <attr name="ui_theme_buttonbar_frame_drawable" format="reference" />
+    <attr name="ui_theme_groupindicator_drawable" format="reference" />
+    <attr name="ui_theme_listseparator_drawable" format="reference" />
+    <attr name="ui_theme_radiobutton_drawable" format="reference" />
+    <attr name="ui_theme_spinner_drawable" format="reference" />
+    <attr name="ui_theme_spinner_bg_drawable" format="reference" />
+    <attr name="ui_theme_spinner_list_bg_drawable" format="reference" />
+    <attr name="ui_theme_tabwidget_drawable" format="reference" />
+    <attr name="ui_theme_textbutton_drawable" format="reference" />
+    <attr name="ui_theme_togglebutton_drawable" format="reference" />
+
+    <!-- Bitmaps -->
+    <attr name="ui_theme_buttonbar_bg_disabled_pressed_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_bg_enabled_pressed_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_frame_hleft_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_frame_hmid_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_frame_hright_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_frame_solo_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_frame_vbottom_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_frame_vmid_bitmap" format="reference" />
+    <attr name="ui_theme_buttonbar_frame_vtop_bitmap" format="reference" />
+    <attr name="ui_theme_foreground_bitmap" format="reference" />
+    <attr name="ui_theme_lightframe_bitmap" format="reference" />
+    <attr name="ui_theme_lightframe_highlight_bitmap" format="reference" />
+    <attr name="ui_theme_listseparator_img_bitmap" format="reference" />
+    <attr name="ui_theme_radiobutton_disabled_checked_bitmap" format="reference" />
+    <attr name="ui_theme_radiobutton_disabled_unchecked_bitmap" format="reference" />
+    <attr name="ui_theme_radiobutton_enabled_checked_bitmap" format="reference" />
+    <attr name="ui_theme_radiobutton_enabled_unchecked_bitmap" format="reference" />
+    <attr name="ui_theme_richframe_bitmap" format="reference" />
+    <attr name="ui_theme_spinner_arrow_bitmap" format="reference" />
+    <attr name="ui_theme_spinner_disabled_pressed_bitmap" format="reference" />
+    <attr name="ui_theme_spinner_disabled_unpressed_bitmap" format="reference" />
+    <attr name="ui_theme_spinner_enabled_pressed_bitmap" format="reference" />
+    <attr name="ui_theme_spinner_enabled_unpressed_bitmap" format="reference" />
+    <attr name="ui_theme_stdframe_bitmap" format="reference" />
+    <attr name="ui_theme_submenu_indicator_bitmap" format="reference" />
+    <attr name="ui_theme_tabframe_bitmap" format="reference" />
+    <attr name="ui_theme_tabwidget_disabled_selected_bitmap" format="reference" />
+    <attr name="ui_theme_tabwidget_disabled_unselected_bitmap" format="reference" />
+    <attr name="ui_theme_tabwidget_enabled_selected_bitmap" format="reference" />
+    <attr name="ui_theme_tabwidget_enabled_unselected_bitmap" format="reference" />
+    <attr name="ui_theme_textbutton_disabled_pressed_bitmap" format="reference" />
+    <attr name="ui_theme_textbutton_disabled_unpressed_bitmap" format="reference" />
+    <attr name="ui_theme_textbutton_enabled_pressed_bitmap" format="reference" />
+    <attr name="ui_theme_textbutton_enabled_unpressed_bitmap" format="reference" />
+
+    <!-- Color palette -->
+    <attr name="ui_theme_stdframe_bg_color" format="reference" />
+    <attr name="ui_theme_buttonbar_bg_color" format="reference" />
+    <attr name="ui_theme_displayworldmap_bg_color" format="reference" />
+    <attr name="ui_theme_palette_text_gray_darker_color" format="reference" />
+    <attr name="ui_theme_palette_text_gray_light_color" format="reference" />
+    <attr name="ui_theme_palette_text_gray_mid_color" format="reference" />
+    <attr name="ui_theme_textbutton_textcolor_color" format="reference" />
+    <attr name="ui_theme_playername_dark_color" format="reference" />
+    <attr name="ui_theme_playername_light_color" format="reference" />
+    <attr name="ui_theme_npcname_dark_color" format="reference" />
+    <attr name="ui_theme_npcname_light_color" format="reference" />
+    <attr name="ui_theme_reward_dark_color" format="reference" />
+    <attr name="ui_theme_reward_light_color" format="reference" />
+    <attr name="ui_theme_dialogue_dark_color" format="reference" />
+    <attr name="ui_theme_dialogue_light_color" format="reference" />
+
+</resources>
\ No newline at end of file
diff --git a/AndorsTrail/res/values/worldmap_template.xml b/AndorsTrail/res/values/worldmap_template.xml
index b2f4e6c4b..dab32b651 100644
--- a/AndorsTrail/res/values/worldmap_template.xml
+++ b/AndorsTrail/res/values/worldmap_template.xml
@@ -40,7 +40,6 @@ if (params) {
 	var y = parseInt(pos[1])-{{offsety}};
 	player.style.top = y + \"px\";
 	player.style.left = x + \"px\";
-	window.scrollTo(x-100, y-100);
 } else {
 	player.style.display = \"none\";
 }
diff --git a/AndorsTrail/res/xml/preferences.xml b/AndorsTrail/res/xml/preferences.xml
index 9b9ec599c..5fdd0caf8 100644
--- a/AndorsTrail/res/xml/preferences.xml
+++ b/AndorsTrail/res/xml/preferences.xml
@@ -7,7 +7,14 @@
 			android:defaultValue="true"
 			android:summary="@string/preferences_display_fullscreen"
 			android:key="fullscreen" />
-		<ListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
+			android:title="@string/preferences_display_theme_title"
+			android:summary="@string/preferences_display_theme"
+			android:key="selectedTheme"
+			android:defaultValue="0"
+			android:entries="@array/preferences_display_theme"
+			android:entryValues="@array/preferences_display_theme_values" />
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_display_scaling_factor_title"
 			android:summary="@string/preferences_display_scaling_factor"
 			android:key="scaling_factor"
@@ -32,14 +39,14 @@
 			android:defaultValue="true"
 			android:summary="@string/preferences_dialog_confirmattack"
 			android:key="confirm_attack" />
-		<ListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_dialog_monsterloot_title"
 			android:summary="@string/preferences_dialog_monsterloot"
 			android:key="display_lootdialog"
 			android:defaultValue="0"
 			android:entries="@array/preferences_display_loot"
 			android:entryValues="@array/preferences_display_loot_values" />
-		<ListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_dialog_overwrite_savegame_title"
 			android:summary="@string/preferences_dialog_overwrite_savegame"
 			android:key="display_overwrite_savegame"
@@ -49,7 +56,7 @@
 	</PreferenceCategory>
 	<PreferenceCategory
 		android:title="@string/preferences_combat_category">
-		<ListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_combat_speed_title"
 			android:summary="@string/preferences_combat_speed"
 			android:key="attackspeed"
@@ -59,14 +66,14 @@
 	</PreferenceCategory>
 	<PreferenceCategory
 		android:title="@string/preferences_movement_category">
-		<ListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_movementmethod_title"
 			android:summary="@string/preferences_movementmethod"
 			android:key="movementmethod"
 			android:defaultValue="0"
 			android:entries="@array/preferences_movementmethods"
 			android:entryValues="@array/preferences_movementmethod_values" />
-		<ListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_movement_dpad_position_title"
 			android:summary="@string/preferences_movement_dpad_position"
 			android:key="dpadposition"
@@ -86,7 +93,7 @@
 			android:defaultValue="true"
 			android:summary="@string/preferences_ui_enable_animations"
 			android:key="enableUiAnimations" />
-		<ListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_quickslots_placement"
 			android:summary="@string/preferences_quickslots_placement_summary"
 			android:key="quickslots_placement"
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index 86ef2b4d8..1110ef88b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -1,5 +1,7 @@
 package com.gpl.rpg.AndorsTrail;
 
+import java.util.Locale;
+
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
@@ -7,11 +9,10 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.view.Window;
 import android.view.WindowManager;
+
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 
-import java.util.Locale;
-
 public final class AndorsTrailApplication extends Application {
 
 	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
index edce5c5b4..d90d5ec01 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
@@ -1,5 +1,7 @@
 package com.gpl.rpg.AndorsTrail;
 
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
@@ -53,6 +55,7 @@ public final class AndorsTrailPreferences {
 	public int quickslotsPosition = QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM;
 	public boolean showQuickslotsWhenToolboxIsVisible = false;
 	public boolean useLocalizedResources = true;
+	public int selectedTheme = 0;
 
 	public void read(final Context androidContext) {
 		AndorsTrailPreferences dest = this;
@@ -73,7 +76,7 @@ public final class AndorsTrailPreferences {
 			dest.quickslotsPosition = Integer.parseInt(prefs.getString("quickslots_placement", Integer.toString(QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM)));
 			dest.showQuickslotsWhenToolboxIsVisible = prefs.getBoolean("showQuickslotsWhenToolboxIsVisible", false);
 			dest.useLocalizedResources = prefs.getBoolean("useLocalizedResources", true);
-
+			dest.selectedTheme = Integer.parseInt(prefs.getString("selectedTheme", Integer.toString(0)));
 			// This might be implemented as a skill in the future.
 			//dest.movementAggressiveness = Integer.parseInt(prefs.getString("movementaggressiveness", Integer.toString(MOVEMENTAGGRESSIVENESS_NORMAL)));
 		} catch (Exception e) {
@@ -93,6 +96,7 @@ public final class AndorsTrailPreferences {
 			dest.quickslotsPosition = QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM;
 			dest.showQuickslotsWhenToolboxIsVisible = false;
 			dest.useLocalizedResources = true;
+			dest.selectedTheme = 0;
 		}
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
index 5e781febb..cfee5d906 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
@@ -1,347 +1,408 @@
-package com.gpl.rpg.AndorsTrail;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.Intent;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Toast;
-import com.gpl.rpg.AndorsTrail.activity.*;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail.model.item.Loot;
-import com.gpl.rpg.AndorsTrail.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-public final class Dialogs {
-
-	private static void showDialogAndPause(Dialog d, final ControllerContext context) {
-		showDialogAndPause(d, context, null);
-	}
-	private static void showDialogAndPause(Dialog d, final ControllerContext context, final OnDismissListener onDismiss) {
-		context.gameRoundController.pause();
-		d.setOnDismissListener(new OnDismissListener() {
-			@Override
-			public void onDismiss(DialogInterface arg0) {
-				if (onDismiss != null) onDismiss.onDismiss(arg0);
-				context.gameRoundController.resume();
-			}
-		});
-		d.show();
-	}
-
-	public static void showKeyArea(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
-		showConversation(currentActivity, context, phraseID, null);
-	}
-
-	public static void showMapSign(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
-		showConversation(currentActivity, context, phraseID, null);
-	}
-
-	public static void showMapScriptMessage(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
-		showConversation(currentActivity, context, phraseID, null, false);
-	}
-
-	public static void showConversation(final MainActivity currentActivity, final ControllerContext context, final String phraseID, final Monster npc) {
-		showConversation(currentActivity, context, phraseID, npc, true);
-	}
-
-	private static void showConversation(final MainActivity currentActivity, final ControllerContext context, final String phraseID, final Monster npc, boolean applyScriptEffectsForFirstPhrase) {
-		context.gameRoundController.pause();
-		Intent intent = new Intent(currentActivity, ConversationActivity.class);
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/conversation/" + phraseID));
-		intent.putExtra("applyScriptEffectsForFirstPhrase", applyScriptEffectsForFirstPhrase);
-		addMonsterIdentifiers(intent, npc);
-		currentActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_CONVERSATION);
-	}
-
-	public static void addMonsterIdentifiers(Intent intent, Monster monster) {
-		if (monster == null) return;
-		intent.putExtra("x", monster.position.x);
-		intent.putExtra("y", monster.position.y);
-	}
-	public static void addMonsterIdentifiers(Bundle bundle, Monster monster) {
-		if (monster == null) return;
-		bundle.putInt("x", monster.position.x);
-		bundle.putInt("y", monster.position.y);
-	}
-
-	public static Monster getMonsterFromIntent(Intent intent, final WorldContext world) {
-		return getMonsterFromBundle(intent.getExtras(), world);
-	}
-	public static Monster getMonsterFromBundle(Bundle params, final WorldContext world) {
-		if (params == null) return null;
-		if (!params.containsKey("x")) return null;
-		int x = params.getInt("x");
-		int y = params.getInt("y");
-		return world.model.currentMap.getMonsterAt(x, y);
-	}
-
-	public static void showMonsterEncounter(final MainActivity currentActivity, final ControllerContext context, final Monster monster) {
-		context.gameRoundController.pause();
-		Intent intent = new Intent(currentActivity, MonsterEncounterActivity.class);
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/monsterencounter"));
-		addMonsterIdentifiers(intent, monster);
-		currentActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_MONSTERENCOUNTER);
-	}
-
-	public static void showMonsterInfo(final Context context, final Monster monster) {
-		Intent intent = new Intent(context, MonsterInfoActivity.class);
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/monsterinfo"));
-		addMonsterIdentifiers(intent, monster);
-		context.startActivity(intent);
-	}
-
-	public static String getGroundLootFoundMessage(final Context ctx, final Loot loot) {
-		StringBuilder sb = new StringBuilder(60);
-		if (!loot.items.isEmpty()) {
-			sb.append(ctx.getString(R.string.dialog_groundloot_message));
-		}
-		appendGoldPickedUpMessage(ctx, loot, sb);
-		return sb.toString();
-	}
-	public static String getGroundLootPickedUpMessage(final Context ctx, final Loot loot) {
-		StringBuilder sb = new StringBuilder(60);
-		appendLootPickedUpMessage(ctx, loot, sb);
-		return sb.toString();
-	}
-	public static String getMonsterLootFoundMessage(final Context ctx, final Loot combinedLoot, final int exp) {
-		StringBuilder sb = new StringBuilder(60);
-		appendMonsterEncounterSurvivedMessage(ctx, sb, exp);
-		appendGoldPickedUpMessage(ctx, combinedLoot, sb);
-		return sb.toString();
-	}
-	public static String getMonsterLootPickedUpMessage(final Context ctx, final Loot combinedLoot, final int exp) {
-		StringBuilder sb = new StringBuilder(60);
-		appendMonsterEncounterSurvivedMessage(ctx, sb, exp);
-		appendLootPickedUpMessage(ctx, combinedLoot, sb);
-		return sb.toString();
-	}
-	private static void appendMonsterEncounterSurvivedMessage(final Context ctx, final StringBuilder sb, final int exp) {
-		sb.append(ctx.getString(R.string.dialog_monsterloot_message));
-		if (exp > 0) {
-			sb.append(' ');
-			sb.append(ctx.getString(R.string.dialog_monsterloot_gainedexp, exp));
-		}
-	}
-	private static void appendGoldPickedUpMessage(final Context ctx, final Loot loot, final StringBuilder sb) {
-		if (loot.gold > 0) {
-			sb.append(' ');
-			sb.append(ctx.getString(R.string.dialog_loot_foundgold, loot.gold));
-		}
-	}
-	private static void appendLootPickedUpMessage(final Context ctx, final Loot loot, final StringBuilder sb) {
-		appendGoldPickedUpMessage(ctx, loot, sb);
-		int numItems = loot.items.countItems();
-		if (numItems == 1) {
-			sb.append(' ');
-			sb.append(ctx.getString(R.string.dialog_loot_pickedupitem));
-		} else if (numItems > 1){
-			sb.append(' ');
-			sb.append(ctx.getString(R.string.dialog_loot_pickedupitems, numItems));
-		}
-	}
-
-	public static void showMonsterLoot(final MainActivity mainActivity, final ControllerContext controllers, final WorldContext world, final Collection<Loot> lootBags, final Loot combinedLoot, final String msg) {
-		// CombatController will do killedMonsterBags.clear() after this method has been called,
-		// so we need to keep the list of objects. Therefore, we create a shallow copy of the list of bags.
-		ArrayList<Loot> bags = new ArrayList<Loot>(lootBags);
-		showLoot(mainActivity, controllers, world, combinedLoot, bags, R.string.dialog_monsterloot_title, msg);
-	}
-
-	public static void showGroundLoot(final MainActivity mainActivity, final ControllerContext controllers, final WorldContext world, final Loot loot, final String msg) {
-		showLoot(mainActivity, controllers, world, loot, Collections.singletonList(loot), R.string.dialog_groundloot_title, msg);
- 	}
-
-	private static void showLoot(final MainActivity mainActivity, final ControllerContext controllers, final WorldContext world, final Loot combinedLoot, final Iterable<Loot> lootBags, final int title, final String msg) {
-		final ListView itemList = new ListView(mainActivity);
-		itemList.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
-		itemList.setPadding(20, 0, 20, 20);
-		itemList.setOnItemClickListener(new OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-
-				final String itemTypeID = ((ItemContainerAdapter) parent.getAdapter()).getItem(position).itemType.id;
-				boolean removeFromCombinedLoot = true;
-				for (Loot l : lootBags) {
-					if (l == combinedLoot) removeFromCombinedLoot = false;
-					if (l.items.removeItem(itemTypeID)) {
-						controllers.itemController.removeLootBagIfEmpty(l);
-						break;
-					}
-				}
-				if (removeFromCombinedLoot) combinedLoot.items.removeItem(itemTypeID);
-				ItemType type = world.itemTypes.getItemType(itemTypeID);
-				world.model.player.inventory.addItem(type);
-				((ItemContainerAdapter) itemList.getAdapter()).notifyDataSetChanged();
-			}
-		});
-		itemList.setAdapter(new ItemContainerAdapter(mainActivity, world.tileManager, combinedLoot.items, world.model.player));
-
-		AlertDialog.Builder db = new AlertDialog.Builder(mainActivity)
-		.setTitle(title)
-		.setMessage(msg)
-		.setIcon(new BitmapDrawable(mainActivity.getResources(), world.tileManager.preloadedTiles.getBitmap(TileManager.iconID_groundbag)))
-		.setNegativeButton(R.string.dialog_close, null)
-		.setView(itemList);
-
-		if (!combinedLoot.items.isEmpty()) {
-			db.setPositiveButton(R.string.dialog_loot_pickall, new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					controllers.itemController.pickupAll(lootBags);
-				}
-			});
-		}
-
-		final Dialog d = db.create();
-
-		showDialogAndPause(d, controllers, new OnDismissListener() {
-			@Override
-			public void onDismiss(DialogInterface arg0) {
-				controllers.itemController.removeLootBagIfEmpty(lootBags);
-			}
-		});
-	}
-
-	public static Intent getIntentForItemInfo(final Context ctx, String itemTypeID, ItemInfoActivity.ItemInfoAction actionType, String buttonText, boolean buttonEnabled, Inventory.WearSlot inventorySlot) {
-		Intent intent = new Intent(ctx, ItemInfoActivity.class);
-		intent.putExtra("buttonText", buttonText);
-		intent.putExtra("buttonEnabled", buttonEnabled);
-		intent.putExtra("itemTypeID", itemTypeID);
-		intent.putExtra("actionType", actionType.name());
-		if (inventorySlot != null) intent.putExtra("inventorySlot", inventorySlot.name());
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/iteminfo/" + itemTypeID));
-		return intent;
-	}
-	public static Intent getIntentForLevelUp(final Context ctx) {
-		Intent intent = new Intent(ctx, LevelUpActivity.class);
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/levelup"));
-		return intent;
-	}
-
-	public static void showConfirmRest(final Activity currentActivity, final ControllerContext controllerContext, final MapObject area) {
-		Dialog d = new AlertDialog.Builder(currentActivity)
-		.setTitle(R.string.dialog_rest_title)
-		.setMessage(R.string.dialog_rest_confirm_message)
-		.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				controllerContext.mapController.rest(area);
-			}
-		})
-		.setNegativeButton(android.R.string.no, null)
-		.create();
-
-		showDialogAndPause(d, controllerContext);
-	}
-	public static void showRested(final Activity currentActivity, final ControllerContext controllerContext) {
-		Dialog d = new AlertDialog.Builder(currentActivity)
-		.setTitle(R.string.dialog_rest_title)
-		.setMessage(R.string.dialog_rest_message)
-		.setNeutralButton(android.R.string.ok, null)
-		.create();
-
-		showDialogAndPause(d, controllerContext);
-	}
-
-	public static void showNewVersion(final Activity currentActivity) {
-		new AlertDialog.Builder(currentActivity)
-		.setTitle(R.string.dialog_newversion_title)
-		.setMessage(R.string.dialog_newversion_message)
-		.setNeutralButton(android.R.string.ok, null)
-		.show();
-	}
-
-	public static boolean showSave(final Activity mainActivity, final ControllerContext controllerContext, final WorldContext world) {
-		if (world.model.uiSelections.isInCombat) {
-			Toast.makeText(mainActivity, R.string.menu_save_saving_not_allowed_in_combat, Toast.LENGTH_SHORT).show();
-			return false;
-		}
-		controllerContext.gameRoundController.pause();
-		Intent intent = new Intent(mainActivity, LoadSaveActivity.class);
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/save"));
-		mainActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_SAVEGAME);
-		return true;
-	}
-
-	public static void showLoad(final Activity currentActivity) {
-		Intent intent = new Intent(currentActivity, LoadSaveActivity.class);
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/load"));
-		currentActivity.startActivityForResult(intent, StartScreenActivity.INTENTREQUEST_LOADGAME);
-	}
-
-	public static void showActorConditionInfo(final Context context, ActorConditionType conditionType) {
-		Intent intent = new Intent(context, ActorConditionInfoActivity.class);
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/actorconditioninfo/" + conditionType.conditionTypeID));
-		context.startActivity(intent);
-	}
-
-	public static Intent getIntentForBulkBuyingInterface(final Context ctx, String itemTypeID, int totalAvailableAmount) {
-		return getIntentForBulkSelectionInterface(ctx, itemTypeID, totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType.buy);
-	}
-
-	public static Intent getIntentForBulkSellingInterface(final Context ctx, String itemTypeID, int totalAvailableAmount) {
-		return getIntentForBulkSelectionInterface(ctx, itemTypeID, totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType.sell);
-	}
-
-	public static Intent getIntentForBulkDroppingInterface(final Context ctx, String itemTypeID, int totalAvailableAmount) {
-		return getIntentForBulkSelectionInterface(ctx, itemTypeID, totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType.drop);
-	}
-
-	private static Intent getIntentForBulkSelectionInterface(final Context ctx, String itemTypeID, int totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType interfaceType) {
-		Intent intent = new Intent(ctx, BulkSelectionInterface.class);
-		intent.putExtra("itemTypeID", itemTypeID);
-		intent.putExtra("totalAvailableAmount", totalAvailableAmount);
-		intent.putExtra("interfaceType", interfaceType.name());
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/bulkselection/" + itemTypeID));
-		return intent;
-	}
-	public static Intent getIntentForSkillInfo(final Context ctx, SkillCollection.SkillID skillID) {
-		Intent intent = new Intent(ctx, SkillInfoActivity.class);
-		intent.putExtra("skillID", skillID.name());
-		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/showskillinfo/" + skillID));
-		return intent;
-	}
-
-	public static void showCombatLog(final Context context, final ControllerContext controllerContext, final WorldContext world) {
-		final String[] combatLogMessages = world.model.combatLog.getAllMessages();
-
-		final ListView itemList = new ListView(context);
-		itemList.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
-		itemList.setPadding(20, 0, 20, 20);
-		itemList.setStackFromBottom(true);
-		itemList.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
-		itemList.setChoiceMode(ListView.CHOICE_MODE_NONE);
-		itemList.setAdapter(new ArrayAdapter<String>(context, R.layout.combatlog_row, android.R.id.text1, combatLogMessages));
-
-		final Dialog d = new AlertDialog.Builder(context)
-				.setTitle(R.string.combat_log_title)
-				.setIcon(R.drawable.ui_icon_combat)
-				.setNegativeButton(R.string.dialog_close, null)
-				.setView(itemList)
-				.create();
-
-		showDialogAndPause(d, controllerContext);
-	}
-}
+package com.gpl.rpg.AndorsTrail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface;
+import com.gpl.rpg.AndorsTrail.activity.ConversationActivity;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.LevelUpActivity;
+import com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity;
+import com.gpl.rpg.AndorsTrail.activity.MainActivity;
+import com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity;
+import com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
+
+public final class Dialogs {
+
+	private static void showDialogAndPause(Dialog d, final ControllerContext context) {
+		showDialogAndPause(d, context, null);
+	}
+	private static void showDialogAndPause(Dialog d, final ControllerContext context, final OnDismissListener onDismiss) {
+		context.gameRoundController.pause();
+		CustomDialogFactory.setDismissListener(d, new OnDismissListener() {
+			@Override
+			public void onDismiss(DialogInterface arg0) {
+				if (onDismiss != null) onDismiss.onDismiss(arg0);
+				context.gameRoundController.resume();
+			}
+		});
+		CustomDialogFactory.show(d);
+	}
+
+	public static void showKeyArea(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
+		showConversation(currentActivity, context, phraseID, null);
+	}
+
+	public static void showMapSign(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
+		showConversation(currentActivity, context, phraseID, null);
+	}
+
+	public static void showMapScriptMessage(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
+		showConversation(currentActivity, context, phraseID, null, false);
+	}
+
+	public static void showConversation(final MainActivity currentActivity, final ControllerContext context, final String phraseID, final Monster npc) {
+		showConversation(currentActivity, context, phraseID, npc, true);
+	}
+
+	private static void showConversation(final MainActivity currentActivity, final ControllerContext context, final String phraseID, final Monster npc, boolean applyScriptEffectsForFirstPhrase) {
+		context.gameRoundController.pause();
+		Intent intent = new Intent(currentActivity, ConversationActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/conversation/" + phraseID));
+		intent.putExtra("applyScriptEffectsForFirstPhrase", applyScriptEffectsForFirstPhrase);
+		addMonsterIdentifiers(intent, npc);
+		currentActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_CONVERSATION);
+	}
+
+	public static void addMonsterIdentifiers(Intent intent, Monster monster) {
+		if (monster == null) return;
+		intent.putExtra("x", monster.position.x);
+		intent.putExtra("y", monster.position.y);
+	}
+	public static void addMonsterIdentifiers(Bundle bundle, Monster monster) {
+		if (monster == null) return;
+		bundle.putInt("x", monster.position.x);
+		bundle.putInt("y", monster.position.y);
+	}
+
+	public static Monster getMonsterFromIntent(Intent intent, final WorldContext world) {
+		return getMonsterFromBundle(intent.getExtras(), world);
+	}
+	public static Monster getMonsterFromBundle(Bundle params, final WorldContext world) {
+		if (params == null) return null;
+		if (!params.containsKey("x")) return null;
+		int x = params.getInt("x");
+		int y = params.getInt("y");
+		return world.model.currentMap.getMonsterAt(x, y);
+	}
+
+	public static void showMonsterEncounter(final MainActivity currentActivity, final ControllerContext context, final Monster monster) {
+		context.gameRoundController.pause();
+		Intent intent = new Intent(currentActivity, MonsterEncounterActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/monsterencounter"));
+		addMonsterIdentifiers(intent, monster);
+		currentActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_MONSTERENCOUNTER);
+	}
+
+	public static void showMonsterInfo(final Context context, final Monster monster) {
+		Intent intent = new Intent(context, MonsterInfoActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/monsterinfo"));
+		addMonsterIdentifiers(intent, monster);
+		context.startActivity(intent);
+	}
+
+	public static String getGroundLootFoundMessage(final Context ctx, final Loot loot) {
+		StringBuilder sb = new StringBuilder(60);
+		if (!loot.items.isEmpty()) {
+			sb.append(ctx.getString(R.string.dialog_groundloot_message));
+		}
+		appendGoldPickedUpMessage(ctx, loot, sb);
+		return sb.toString();
+	}
+	public static String getGroundLootPickedUpMessage(final Context ctx, final Loot loot) {
+		StringBuilder sb = new StringBuilder(60);
+		appendLootPickedUpMessage(ctx, loot, sb);
+		return sb.toString();
+	}
+	public static String getMonsterLootFoundMessage(final Context ctx, final Loot combinedLoot, final int exp) {
+		StringBuilder sb = new StringBuilder(60);
+		appendMonsterEncounterSurvivedMessage(ctx, sb, exp);
+		appendGoldPickedUpMessage(ctx, combinedLoot, sb);
+		return sb.toString();
+	}
+	public static String getMonsterLootPickedUpMessage(final Context ctx, final Loot combinedLoot, final int exp) {
+		StringBuilder sb = new StringBuilder(60);
+		appendMonsterEncounterSurvivedMessage(ctx, sb, exp);
+		appendLootPickedUpMessage(ctx, combinedLoot, sb);
+		return sb.toString();
+	}
+	private static void appendMonsterEncounterSurvivedMessage(final Context ctx, final StringBuilder sb, final int exp) {
+		sb.append(ctx.getString(R.string.dialog_monsterloot_message));
+		if (exp > 0) {
+			sb.append(' ');
+			sb.append(ctx.getString(R.string.dialog_monsterloot_gainedexp, exp));
+		}
+	}
+	private static void appendGoldPickedUpMessage(final Context ctx, final Loot loot, final StringBuilder sb) {
+		if (loot.gold > 0) {
+			sb.append(' ');
+			sb.append(ctx.getString(R.string.dialog_loot_foundgold, loot.gold));
+		}
+	}
+	private static void appendLootPickedUpMessage(final Context ctx, final Loot loot, final StringBuilder sb) {
+		appendGoldPickedUpMessage(ctx, loot, sb);
+		int numItems = loot.items.countItems();
+		if (numItems == 1) {
+			sb.append(' ');
+			sb.append(ctx.getString(R.string.dialog_loot_pickedupitem));
+		} else if (numItems > 1){
+			sb.append(' ');
+			sb.append(ctx.getString(R.string.dialog_loot_pickedupitems, numItems));
+		}
+	}
+
+	public static void showMonsterLoot(final MainActivity mainActivity, final ControllerContext controllers, final WorldContext world, final Collection<Loot> lootBags, final Loot combinedLoot, final String msg) {
+		// CombatController will do killedMonsterBags.clear() after this method has been called,
+		// so we need to keep the list of objects. Therefore, we create a shallow copy of the list of bags.
+		ArrayList<Loot> bags = new ArrayList<Loot>(lootBags);
+		showLoot(mainActivity, controllers, world, combinedLoot, bags, R.string.dialog_monsterloot_title, msg);
+	}
+
+	public static void showGroundLoot(final MainActivity mainActivity, final ControllerContext controllers, final WorldContext world, final Loot loot, final String msg) {
+		showLoot(mainActivity, controllers, world, loot, Collections.singletonList(loot), R.string.dialog_groundloot_title, msg);
+	}
+
+	private static void showLoot(final MainActivity mainActivity, final ControllerContext controllers, final WorldContext world, final Loot combinedLoot, final Iterable<Loot> lootBags, final int title, final String msg) {
+		final ListView itemList = new ListView(mainActivity);
+		itemList.setBackgroundResource(android.R.color.transparent);
+		itemList.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
+		//		itemList.setPadding(20, 0, 20, 20);
+		itemList.setAdapter(new ItemContainerAdapter(mainActivity, world.tileManager, combinedLoot.items, world.model.player));
+
+		final Dialog d = CustomDialogFactory.createDialog(mainActivity, 
+				mainActivity.getResources().getString(title), 
+				mainActivity.getResources().getDrawable(R.drawable.ui_icon_equipment), 
+				msg, 
+				combinedLoot.items.isEmpty() ? null : itemList, 
+						true);
+
+		itemList.setOnItemClickListener(new OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+
+				final String itemTypeID = ((ItemContainerAdapter) parent.getAdapter()).getItem(position).itemType.id;
+				boolean removeFromCombinedLoot = true;
+				for (Loot l : lootBags) {
+					if (l == combinedLoot) removeFromCombinedLoot = false;
+					if (l.items.removeItem(itemTypeID)) {
+						controllers.itemController.removeLootBagIfEmpty(l);
+						break;
+					}
+				}
+				if (removeFromCombinedLoot) {
+					combinedLoot.items.removeItem(itemTypeID);
+				}
+				if (((ItemContainerAdapter) parent.getAdapter()).isEmpty()) {
+					ViewGroup vg = (ViewGroup) d.findViewById(R.id.dialog_content_container);
+					vg.setVisibility(View.GONE);
+				}
+				ItemType type = world.itemTypes.getItemType(itemTypeID);
+				world.model.player.inventory.addItem(type);
+				((ItemContainerAdapter) itemList.getAdapter()).notifyDataSetChanged();
+			}
+		});
+
+		if (!itemList.getAdapter().isEmpty()) {
+			CustomDialogFactory.addButton(d, R.string.dialog_loot_pickall, new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					controllers.itemController.pickupAll(lootBags);
+				}
+			});
+		}
+
+		CustomDialogFactory.addDismissButton(d, R.string.dialog_close);
+
+		showDialogAndPause(d, controllers, new OnDismissListener() {
+			@Override
+			public void onDismiss(DialogInterface arg0) {
+				controllers.itemController.removeLootBagIfEmpty(lootBags);
+			}
+		});
+	}
+
+	public static Intent getIntentForItemInfo(final Context ctx, String itemTypeID, ItemInfoActivity.ItemInfoAction actionType, String buttonText, boolean buttonEnabled, Inventory.WearSlot inventorySlot) {
+		Intent intent = new Intent(ctx, ItemInfoActivity.class);
+		intent.putExtra("buttonText", buttonText);
+		intent.putExtra("buttonEnabled", buttonEnabled);
+		intent.putExtra("moreActions", (actionType == ItemInfoActivity.ItemInfoAction.equip || actionType == ItemInfoActivity.ItemInfoAction.use || actionType == ItemInfoActivity.ItemInfoAction.none));
+		intent.putExtra("itemTypeID", itemTypeID);
+		intent.putExtra("actionType", actionType.name());
+		if (inventorySlot != null) intent.putExtra("inventorySlot", inventorySlot.name());
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/iteminfo/" + itemTypeID));
+		return intent;
+	}
+	public static Intent getIntentForLevelUp(final Context ctx) {
+		Intent intent = new Intent(ctx, LevelUpActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/levelup"));
+		return intent;
+	}
+
+	public static void showConfirmRest(final Activity currentActivity, final ControllerContext controllerContext, final MapObject area) {
+		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
+				currentActivity.getResources().getString(R.string.dialog_rest_title), 
+				null, 
+				currentActivity.getResources().getString(R.string.dialog_rest_confirm_message), 
+				null, 
+				true);
+
+		CustomDialogFactory.addButton(d, android.R.string.yes, new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				controllerContext.mapController.rest(area);
+			}
+		});
+
+		CustomDialogFactory.addDismissButton(d, android.R.string.no);
+
+		showDialogAndPause(d, controllerContext);
+	}
+	public static void showRested(final Activity currentActivity, final ControllerContext controllerContext) {
+		//		Dialog d = new AlertDialog.Builder(new ContextThemeWrapper(currentActivity, R.style.AndorsTrailStyle))
+		//		.setTitle(R.string.dialog_rest_title)
+		//		.setMessage(R.string.dialog_rest_message)
+		//		.setNeutralButton(android.R.string.ok, null)
+		//		.create();
+		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
+				currentActivity.getResources().getString(R.string.dialog_rest_title), 
+				null, 
+				currentActivity.getResources().getString(R.string.dialog_rest_message), 
+				null, 
+				true);
+
+
+		CustomDialogFactory.addDismissButton(d, android.R.string.ok);
+
+		showDialogAndPause(d, controllerContext);
+	}
+
+	public static void showNewVersion(final Activity currentActivity) {
+		//		new AlertDialog.Builder(new ContextThemeWrapper(currentActivity, R.style.AndorsTrailStyle))
+		//		.setTitle(R.string.dialog_newversion_title)
+		//		.setMessage(R.string.dialog_newversion_message)
+		//		.setNeutralButton(android.R.string.ok, null)
+		//		.show();
+
+		final Dialog d = CustomDialogFactory.createDialog(currentActivity, 
+				currentActivity.getResources().getString(R.string.dialog_newversion_title), 
+				null, 
+				currentActivity.getResources().getString(R.string.dialog_newversion_message), 
+				null, 
+				true);
+
+
+		CustomDialogFactory.addDismissButton(d, android.R.string.ok);
+
+		CustomDialogFactory.show(d);
+	}
+
+	public static boolean showSave(final Activity mainActivity, final ControllerContext controllerContext, final WorldContext world) {
+		if (world.model.uiSelections.isInCombat) {
+			Toast.makeText(mainActivity, R.string.menu_save_saving_not_allowed_in_combat, Toast.LENGTH_SHORT).show();
+			return false;
+		}
+		controllerContext.gameRoundController.pause();
+		Intent intent = new Intent(mainActivity, LoadSaveActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/save"));
+		mainActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_SAVEGAME);
+		return true;
+	}
+
+	public static void showLoad(final Activity currentActivity) {
+		Intent intent = new Intent(currentActivity, LoadSaveActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/load"));
+		currentActivity.startActivityForResult(intent, StartScreenActivity_MainMenu.INTENTREQUEST_LOADGAME);
+	}
+
+	public static void showLoad(final Fragment currentFragment) {
+		Intent intent = new Intent(currentFragment.getActivity(), LoadSaveActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/load"));
+		currentFragment.startActivityForResult(intent, StartScreenActivity_MainMenu.INTENTREQUEST_LOADGAME);
+	}
+
+	public static void showActorConditionInfo(final Context context, ActorConditionType conditionType) {
+		Intent intent = new Intent(context, ActorConditionInfoActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/actorconditioninfo/" + conditionType.conditionTypeID));
+		context.startActivity(intent);
+	}
+
+	public static Intent getIntentForBulkBuyingInterface(final Context ctx, String itemTypeID, int totalAvailableAmount) {
+		return getIntentForBulkSelectionInterface(ctx, itemTypeID, totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType.buy);
+	}
+
+	public static Intent getIntentForBulkSellingInterface(final Context ctx, String itemTypeID, int totalAvailableAmount) {
+		return getIntentForBulkSelectionInterface(ctx, itemTypeID, totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType.sell);
+	}
+
+	public static Intent getIntentForBulkDroppingInterface(final Context ctx, String itemTypeID, int totalAvailableAmount) {
+		return getIntentForBulkSelectionInterface(ctx, itemTypeID, totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType.drop);
+	}
+
+	private static Intent getIntentForBulkSelectionInterface(final Context ctx, String itemTypeID, int totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType interfaceType) {
+		Intent intent = new Intent(ctx, BulkSelectionInterface.class);
+		intent.putExtra("itemTypeID", itemTypeID);
+		intent.putExtra("totalAvailableAmount", totalAvailableAmount);
+		intent.putExtra("interfaceType", interfaceType.name());
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/bulkselection/" + itemTypeID));
+		return intent;
+	}
+	public static Intent getIntentForSkillInfo(final Context ctx, SkillCollection.SkillID skillID) {
+		Intent intent = new Intent(ctx, SkillInfoActivity.class);
+		intent.putExtra("skillID", skillID.name());
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/showskillinfo/" + skillID));
+		return intent;
+	}
+
+	public static void showCombatLog(final Context context, final ControllerContext controllerContext, final WorldContext world) {
+		String[] combatLogMessages = world.model.combatLog.getAllMessages();
+
+		View view = null;
+		ListView itemList = null;
+		itemList = new ListView(context);
+		itemList.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
+		itemList.setStackFromBottom(true);
+		itemList.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
+		itemList.setChoiceMode(ListView.CHOICE_MODE_NONE);
+		itemList.setBackgroundColor(ThemeHelper.getThemeColor(context, R.attr.ui_theme_stdframe_bg_color));
+		if (combatLogMessages.length <= 0) {
+			combatLogMessages = new String[] {context.getResources().getString(R.string.combat_log_noentries)};
+		}
+		itemList.setAdapter(new ArrayAdapter<String>(context, R.layout.combatlog_row, android.R.id.text1, combatLogMessages));
+		view = itemList;
+
+		final Dialog d = CustomDialogFactory.createDialog(context, 
+				context.getResources().getString(R.string.combat_log_title), 
+				context.getResources().getDrawable(R.drawable.ui_icon_combat), 
+				null, 
+				view, 
+				true);
+
+
+		CustomDialogFactory.addDismissButton(d, R.string.dialog_close);
+
+		showDialogAndPause(d, controllerContext);
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
index 35848144c..ff89272e4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
@@ -1,16 +1,17 @@
 package com.gpl.rpg.AndorsTrail;
 
+import java.lang.ref.WeakReference;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.AsyncTask;
+
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.resource.ResourceLoader;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 
-import java.lang.ref.WeakReference;
-
 public final class WorldSetup {
 
 	private final WorldContext world;
@@ -26,6 +27,7 @@ public final class WorldSetup {
 	public int loadFromSlot = Savegames.SLOT_QUICKSAVE;
 	public boolean isSceneReady = false;
 	public String newHeroName;
+	public int newHeroIcon;
 	private Savegames.LoadSavegameResult loadResult;
 
 	public WorldSetup(WorldContext world, ControllerContext controllers, Context androidContext) {
@@ -53,10 +55,14 @@ public final class WorldSetup {
 			isInitializingResources = true;
 		}
 
+		//Load resources essential to the app synchroneously
+		ResourceLoader.loadResourcesSync(world, r);
+		
+		//And the rest asynchroneously
 		(new AsyncTask<Void, Void, Void>() {
 			@Override
 			protected Void doInBackground(Void... arg0) {
-				ResourceLoader.loadResources(world, r);
+				ResourceLoader.loadResourcesAsync(world, r);
 				return null;
 			}
 
@@ -144,7 +150,7 @@ public final class WorldSetup {
 	private void createNewWorld() {
 		Context ctx = androidContext.get();
 		world.model = new ModelContainer();
-		world.model.player.initializeNewPlayer(world.dropLists, newHeroName);
+		world.model.player.initializeNewPlayer(world.dropLists, newHeroName, newHeroIcon);
 
 		controllers.actorStatsController.recalculatePlayerStats(world.model.player);
 		controllers.movementController.respawnPlayer(ctx.getResources());
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
index d65ecc1d0..e0f61fe93 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
@@ -11,14 +11,17 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class AboutActivity extends Activity implements ImageGetter {
 
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getBaseTheme());
 		super.onCreate(savedInstanceState);
 
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
index 2fbb327e3..ca738c777 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
@@ -9,10 +9,12 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView;
 import com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse;
 
@@ -20,6 +22,7 @@ public final class ActorConditionInfoActivity extends Activity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getDialogTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
index 20363130f..837176674 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
@@ -1,8 +1,7 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
+import android.app.Dialog;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -17,11 +16,14 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.SeekBar;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.ItemController;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 /**
  * @author ejwessel
@@ -70,6 +72,7 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 	 */
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getDialogTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
@@ -192,18 +195,33 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 					final String displayType = ItemInfoActivity.getDisplayTypeString(res, itemType).toLowerCase();
 					final String message = res.getString(R.string.bulkselection_sell_confirmation, itemType.getName(world.model.player), displayType);
 
-					new AlertDialog.Builder(v.getContext())
-						.setIcon(android.R.drawable.ic_dialog_info)
-						.setTitle(R.string.bulkselection_sell_confirmation_title)
-						.setMessage(message)
-						.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+//					new AlertDialog.Builder(v.getContext())
+//						.setIcon(android.R.drawable.ic_dialog_info)
+//						.setTitle(R.string.bulkselection_sell_confirmation_title)
+//						.setMessage(message)
+//						.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+//							@Override
+//							public void onClick(DialogInterface dialog, int which) {
+//								itemsResult(intent);
+//							}
+//									})
+//						.setNegativeButton(android.R.string.no, null)
+//						.show();
+					final Dialog d = CustomDialogFactory.createDialog(v.getContext(),
+							v.getContext().getResources().getString(R.string.bulkselection_sell_confirmation_title),
+							v.getContext().getResources().getDrawable(android.R.drawable.ic_dialog_info),
+							message,
+							null,
+							true);
+					CustomDialogFactory.addButton(d, android.R.string.yes,  new View.OnClickListener() {
 							@Override
-							public void onClick(DialogInterface dialog, int which) {
+							public void onClick(View v) {
 								itemsResult(intent);
 							}
-									})
-						.setNegativeButton(android.R.string.no, null)
-						.show();
+					});
+					CustomDialogFactory.addDismissButton(d, android.R.string.no);
+					CustomDialogFactory.show(d);
+					
 				} else {
 					itemsResult(intent);
 				}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index 591453639..75fb14228 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -1,5 +1,7 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import java.util.ArrayList;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -16,9 +18,17 @@ import android.view.View.OnClickListener;
 import android.view.View.OnKeyListener;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.*;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.TextView;
 import android.widget.TextView.BufferType;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
@@ -33,25 +43,13 @@ import com.gpl.rpg.AndorsTrail.model.quest.Quest;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
-
-import java.util.ArrayList;
-import java.util.ListIterator;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class ConversationActivity
 		extends Activity
 		implements OnKeyListener
 		, ConversationController.ConversationStatemachine.ConversationStateListener {
 
-	private static final int playerNameColor = 		Color.argb(255, 0xbb, 0x22, 0x22);
-	private static final int NPCNameColor = 		Color.argb(255, 0xbb, 0xbb, 0x22);
-	private static final int playerPhraseColor = 	Color.argb(255, 0xff, 0xff, 0xff);
-	private static final int NPCPhraseColor =  		Color.argb(255, 0xff, 0xff, 0xff);
-	private static final int rewardColor = 			Color.argb(255, 0x99, 0x99, 0x55);
-	private static final int oldPhraseColor = 		Color.argb(255, 0xb0, 0xb0, 0xb0);
-	private static final int oldPlayerNameColor = 	Color.argb(255, 0x89, 0x19, 0x19);
-	private static final int oldNPCNameColor = 		Color.argb(255, 0xa2, 0xa2, 0x1d);
-	private static final int oldRewardColor = 		Color.argb(255, 0x7a, 0x7a, 0x44);
-
 	private WorldContext world;
 	private Player player;
 	private final ArrayList<ConversationStatement> conversationHistory = new ArrayList<ConversationStatement>();
@@ -66,6 +64,7 @@ public final class ConversationActivity
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getDialogTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
@@ -138,11 +137,16 @@ public final class ConversationActivity
 	}
 
 	private int getSelectedReplyIndex() {
+		int j = 0;
 		for (int i = 0; i < replyGroup.getChildCount(); ++i) {
 			final View v = replyGroup.getChildAt(i);
 			if (v == null) continue;
+			if (!(v instanceof RadioButton)) {
+				continue;
+			}
 			final RadioButton rb = (RadioButton) v;
-			if (rb.isChecked()) return i;
+			if (rb.isChecked()) return j;
+			j++;
 		}
 		return -1;
 	}
@@ -151,12 +155,21 @@ public final class ConversationActivity
 		int replyCount = replyGroup.getChildCount();
 		if (replyCount <= 0) return;
 		if (i < 0) i = 0;
-		else if (i >= replyCount) i = replyCount - 1;
+		else if (i >= (replyCount-1)) i = replyCount-1;
 
-		View v = replyGroup.getChildAt(i);
-		if (v == null) return;
-		RadioButton rb = (RadioButton) v;
-		rb.setChecked(true);
+		for (int j = 0; j < replyGroup.getChildCount(); ++j) {
+			View v = replyGroup.getChildAt(j);
+			if (v == null) continue;
+			if (!(v instanceof RadioButton)) {
+				continue;
+			}
+			i--;
+			if (i < 0) {
+				RadioButton rb = (RadioButton) v;
+				rb.setChecked(true);
+				break;
+			}
+		}
 	}
 
 	@Override
@@ -204,6 +217,9 @@ public final class ConversationActivity
 		for (int i = 0; i < replyGroup.getChildCount(); ++i) {
 			final View v = replyGroup.getChildAt(i);
 			if (v == null) continue;
+			if (!(v instanceof RadioButton)) {
+				continue;
+			}
 			final RadioButton rb = (RadioButton) v;
 			if (rb.isChecked()) {
 				return rb;
@@ -217,16 +233,16 @@ public final class ConversationActivity
 		while(numberOfNewMessage != 0){
 			ConversationStatement conversation = conversationHistory.get(numberOfMessage - numberOfNewMessage);
 			if(conversation.hasActor()){
-				conversation.textColor = oldPhraseColor;
+				conversation.textColor = getSpanColor(R.attr.ui_theme_dialogue_dark_color);
 				if(conversation.isPlayerActor){
-					conversation.nameColor = oldPlayerNameColor;
+					conversation.nameColor = getSpanColor(R.attr.ui_theme_playername_light_color);
 				} else {
-					conversation.nameColor = oldNPCNameColor;
+					conversation.nameColor = getSpanColor(R.attr.ui_theme_npcname_dark_color);
 				}
 			} else if (conversation.isReward) {
-				conversation.textColor = oldRewardColor;
+				conversation.textColor = getSpanColor(R.attr.ui_theme_reward_light_color);
 			} else {
-				conversation.textColor = oldPhraseColor;
+				conversation.textColor = getSpanColor(R.attr.ui_theme_dialogue_dark_color);;
 			}
 			numberOfNewMessage--;
 		}
@@ -242,7 +258,7 @@ public final class ConversationActivity
 		} else {
 			if (rb == null) return;
 			Reply r = (Reply) rb.getTag();
-			addConversationStatement(player, rb.getText().toString(), playerPhraseColor, false);
+			addConversationStatement(player, rb.getText().toString(), getSpanColor(R.attr.ui_theme_dialogue_light_color), false);
 			conversationState.playerSelectedReply(getResources(), r);
 		}
 	}
@@ -256,7 +272,7 @@ public final class ConversationActivity
 			s.iconID = ConversationStatement.NO_ICON;
 		}
 		s.text = text;
-		s.nameColor = actor == player ? playerNameColor : NPCNameColor;
+		s.nameColor = actor == player ? getSpanColor(R.attr.ui_theme_playername_light_color) : getSpanColor(R.attr.ui_theme_npcname_light_color);
 		s.textColor = textColor;
 		s.isPlayerActor = actor != null && actor == player;
 		s.isReward = isReward;
@@ -381,7 +397,7 @@ public final class ConversationActivity
 
 	@Override
 	public void onTextPhraseReached(String message, Actor actor, String phraseID) {
-		addConversationStatement(actor, message, NPCPhraseColor, false);
+		addConversationStatement(actor, message, getSpanColor(R.attr.ui_theme_dialogue_light_color), false);
 	}
 
 	@Override
@@ -417,7 +433,7 @@ public final class ConversationActivity
 	}
 
 	private void addRewardMessage(String text) {
-		addConversationStatement(null, text, rewardColor, true);
+		addConversationStatement(null, text, getSpanColor(R.attr.ui_theme_reward_light_color), true);
 	}
 
 	@Override
@@ -451,6 +467,7 @@ public final class ConversationActivity
 	@Override
 	public void onConversationHasReply(Reply r, String message) {
 		RadioGroup.LayoutParams layoutParams = new RadioGroup.LayoutParams(RadioGroup.LayoutParams.MATCH_PARENT, RadioGroup.LayoutParams.WRAP_CONTENT);
+		layoutParams.setMargins(0, getResources().getDimensionPixelOffset(R.dimen.conversation_replyseparator_margintop), 0, getResources().getDimensionPixelOffset(R.dimen.conversation_replyseparator_marginbottom));
 		RadioButton rb = new RadioButton(this);
 		rb.setLayoutParams(layoutParams);
 		rb.setText(message);
@@ -459,6 +476,18 @@ public final class ConversationActivity
 		rb.setShadowLayer(1, 1, 1, Color.BLACK);
 		rb.setFocusable(false);
 		rb.setFocusableInTouchMode(false);
+		if (replyGroup.getChildCount() == 0) { //Add a separator before first item
+			ImageView iv = new ImageView(this);
+			iv.setBackgroundResource(ThemeHelper.getThemeResource(this, R.attr.ui_theme_listseparator_drawable));
+			RadioGroup.LayoutParams ivLayoutParams = new RadioGroup.LayoutParams(RadioGroup.LayoutParams.MATCH_PARENT, RadioGroup.LayoutParams.WRAP_CONTENT);
+			ivLayoutParams.setMargins(0, getResources().getDimensionPixelOffset(R.dimen.conversation_replyseparator_margintop), 0, getResources().getDimensionPixelOffset(R.dimen.conversation_replyseparator_marginbottom));
+			iv.setLayoutParams(ivLayoutParams);
+			replyGroup.addView(iv, ivLayoutParams);
+		}
 		replyGroup.addView(rb, layoutParams);
 	}
+	
+	private int getSpanColor(int resId) {
+		return ThemeHelper.getThemeColor(this, resId);
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
index fa8699a54..76e3a79a1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
@@ -1,89 +1,169 @@
-package com.gpl.rpg.AndorsTrail.activity;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.webkit.WebView;
-import android.widget.Button;
-import android.widget.Toast;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
-import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
-import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
-import com.gpl.rpg.AndorsTrail.util.L;
-
-import java.io.File;
-
-public final class DisplayWorldMapActivity extends Activity {
-	private WorldContext world;
-
-	private WebView displayworldmap_webview;
-	private String worldMapSegmentName;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-		if (!app.isInitialized()) { finish(); return; }
-		this.world = app.getWorld();
-
-		app.setWindowParameters(this);
-
-		setContentView(R.layout.displayworldmap);
-
-		displayworldmap_webview = (WebView) findViewById(R.id.displayworldmap_webview);
-		displayworldmap_webview.setBackgroundColor(getResources().getColor(R.color.displayworldmap_background));
-		displayworldmap_webview.getSettings().setBuiltInZoomControls(true);
-		displayworldmap_webview.getSettings().setUseWideViewPort(true);
-		enableJavascript();
-
-		Button b = (Button) findViewById(R.id.displayworldmap_close);
-		b.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				DisplayWorldMapActivity.this.finish();
-			}
-		});
-
-		worldMapSegmentName = getIntent().getStringExtra("worldMapSegmentName");
-	}
-
-	@SuppressLint("SetJavaScriptEnabled")
-	public void enableJavascript() {
-		displayworldmap_webview.getSettings().setJavaScriptEnabled(true);
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		update();
-	}
-
-	private void update() {
-		File worldmap = WorldMapController.getCombinedWorldMapFile(worldMapSegmentName);
-
-		if (!worldmap.exists()) {
-			Toast.makeText(this, getResources().getString(R.string.menu_button_worldmap_failed), Toast.LENGTH_LONG).show();
-			this.finish();
-		}
-
-		WorldMapSegment segment = world.maps.worldMapSegments.get(worldMapSegmentName);
-		WorldMapSegmentMap map = segment.maps.get(world.model.currentMap.name);
-		if (map == null) {
-			this.finish();
-			return;
-		}
-
-		String url = "file://" + worldmap.getAbsolutePath() + '?'
-				+ (world.model.player.position.x + map.worldPosition.x) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE
-				+ ','
-				+ (world.model.player.position.y + map.worldPosition.y-1) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE;
-		L.log("Showing " + url);
-		displayworldmap_webview.loadUrl(url);
-	}
-}
+package com.gpl.rpg.AndorsTrail.activity;
+
+import java.io.File;
+
+import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+
+public final class DisplayWorldMapActivity extends Activity {
+	private WorldContext world;
+
+	private WebView displayworldmap_webview;
+	private String worldMapSegmentName;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getBaseTheme());
+		super.onCreate(savedInstanceState);
+
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		this.world = app.getWorld();
+
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.displayworldmap);
+
+		displayworldmap_webview = (WebView) findViewById(R.id.displayworldmap_webview);
+		displayworldmap_webview.setBackgroundColor(ThemeHelper.getThemeColor(this, R.attr.ui_theme_displayworldmap_bg_color));
+		displayworldmap_webview.getSettings().setBuiltInZoomControls(true);
+		displayworldmap_webview.getSettings().setUseWideViewPort(true);
+		displayworldmap_webview.setVerticalScrollBarEnabled(true);
+		displayworldmap_webview.setHorizontalScrollBarEnabled(true);
+		enableJavascript();
+
+		Button b = (Button) findViewById(R.id.displayworldmap_close);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				DisplayWorldMapActivity.this.finish();
+			}
+		});
+
+		b = (Button) findViewById(R.id.displayworldmap_recenter);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				recenter();
+			}
+		});
+
+		worldMapSegmentName = getIntent().getStringExtra("worldMapSegmentName");
+	}
+
+	@SuppressLint("SetJavaScriptEnabled")
+	public void enableJavascript() {
+		displayworldmap_webview.getSettings().setJavaScriptEnabled(true);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		update();
+	}
+
+	WorldMapSegmentMap map;
+	Coord offsetWorldmapTo;
+	@SuppressLint("NewApi")
+	private void update() {
+		File worldmap = WorldMapController.getCombinedWorldMapFile(worldMapSegmentName);
+
+		if (!worldmap.exists()) {
+			Toast.makeText(this, getResources().getString(R.string.menu_button_worldmap_failed), Toast.LENGTH_LONG).show();
+			this.finish();
+		}
+
+		WorldMapSegment segment = world.maps.worldMapSegments.get(worldMapSegmentName);
+		map = segment.maps.get(world.model.currentMap.name);
+		if (map == null) {
+			this.finish();
+			return;
+		}
+		
+		offsetWorldmapTo = new Coord(999999, 999999);
+		for (WorldMapSegmentMap map : segment.maps.values()) {
+			PredefinedMap predefinedMap = world.maps.findPredefinedMap(map.mapName);
+			if (predefinedMap == null) continue;
+			if (!predefinedMap.visited) continue;
+			if (!WorldMapController.fileForMapExists(predefinedMap)) continue;
+
+			offsetWorldmapTo.x = Math.min(offsetWorldmapTo.x, map.worldPosition.x);
+			offsetWorldmapTo.y = Math.min(offsetWorldmapTo.y, map.worldPosition.y);
+		}
+		
+
+		String url = "file://" + worldmap.getAbsolutePath() + '?'
+				+ (world.model.player.position.x + map.worldPosition.x) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE
+				+ ','
+				+ (world.model.player.position.y + map.worldPosition.y-1) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE;
+		L.log("Showing " + url);
+		displayworldmap_webview.loadUrl(url);
+		displayworldmap_webview.setBackgroundColor(ThemeHelper.getThemeColor(this, R.attr.ui_theme_displayworldmap_bg_color));
+		displayworldmap_webview.setWebViewClient(new WebViewClient() {
+			@SuppressLint("NewApi")
+			@Override
+			public void onPageFinished(WebView view, String url)
+			{
+				recenter();
+			}
+		});
+	}
+	
+	private void recenter() {
+		displayworldmap_webview.postDelayed(new Runnable() {
+			@Override
+			public void run() {
+				if (map != null) {
+					//Local map to global worldmap
+					int x = world.model.player.position.x + map.worldPosition.x - offsetWorldmapTo.x;
+					//Tile coord to pixel coord
+					x *= WorldMapController.WORLDMAP_DISPLAY_TILESIZE;
+					x += WorldMapController.WORLDMAP_DISPLAY_TILESIZE/2;
+					//Zoom level
+					x = (int)(x * displayworldmap_webview.getScale());
+					//Center
+					x -= displayworldmap_webview.getWidth() / 2;
+					
+					//Local map to global worldmap
+					int y = world.model.player.position.y + map.worldPosition.y  - offsetWorldmapTo.y;
+					//Tile coord to pixel coord
+					y *= WorldMapController.WORLDMAP_DISPLAY_TILESIZE;
+					y += WorldMapController.WORLDMAP_DISPLAY_TILESIZE/2;
+					//Zoom level
+					y = (int)(y * displayworldmap_webview.getScale());
+					//Center
+					y -= displayworldmap_webview.getHeight() / 2;
+					
+					displayworldmap_webview.scrollTo(x, y);
+				}
+			}
+		}, 100);
+	}
+	
+	@Override
+	public void finish() {
+	    ViewGroup view = (ViewGroup) getWindow().getDecorView();
+	    view.removeAllViews();
+	    super.finish();
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
index 8ccbd2b89..858995d6e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
@@ -4,6 +4,11 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTabHost;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Inventory;
@@ -11,6 +16,7 @@ import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Quests;
 import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Skills;
 import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Stats;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class HeroinfoActivity extends FragmentActivity {
 	private WorldContext world;
@@ -19,6 +25,7 @@ public final class HeroinfoActivity extends FragmentActivity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getBaseTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
@@ -33,22 +40,54 @@ public final class HeroinfoActivity extends FragmentActivity {
 		tabHost = (FragmentTabHost) findViewById(android.R.id.tabhost);
 		tabHost.setup(this, getSupportFragmentManager(), R.id.realtabcontent);
 
+		LayoutInflater inflater = getLayoutInflater();
+		
+		ViewGroup v;
+		
+		v = (ViewGroup) inflater.inflate(R.layout.tabindicator, null);
+		((TextView)v.findViewById(R.id.tabindicator_text)).setText(res.getString(R.string.heroinfo_char));
+		((ImageView)v.findViewById(R.id.tabindicator_icon)).setImageDrawable(res.getDrawable(R.drawable.char_hero));
 		tabHost.addTab(tabHost.newTabSpec("char")
-				.setIndicator(res.getString(R.string.heroinfo_char), res.getDrawable(R.drawable.char_hero))
+				.setIndicator(v)
 				,HeroinfoActivity_Stats.class, null);
+		
+		v = (ViewGroup) inflater.inflate(R.layout.tabindicator, null);
+		((TextView)v.findViewById(R.id.tabindicator_text)).setText(res.getString(R.string.heroinfo_quests));
+		((ImageView)v.findViewById(R.id.tabindicator_icon)).setImageDrawable(res.getDrawable(R.drawable.ui_icon_quest));
 		tabHost.addTab(tabHost.newTabSpec("quests")
-				.setIndicator(res.getString(R.string.heroinfo_quests), res.getDrawable(R.drawable.ui_icon_quest))
+				.setIndicator(v)
 				,HeroinfoActivity_Quests.class, null);
+		
+		v = (ViewGroup) inflater.inflate(R.layout.tabindicator, null);
+		((TextView)v.findViewById(R.id.tabindicator_text)).setText(res.getString(R.string.heroinfo_skill));
+		((ImageView)v.findViewById(R.id.tabindicator_icon)).setImageDrawable(res.getDrawable(R.drawable.ui_icon_skill));
 		tabHost.addTab(tabHost.newTabSpec("skills")
-				.setIndicator(res.getString(R.string.heroinfo_skill), res.getDrawable(R.drawable.ui_icon_skill))
+				.setIndicator(v)
 				,HeroinfoActivity_Skills.class, null);
+		
+		v = (ViewGroup) inflater.inflate(R.layout.tabindicator, null);
+		((TextView)v.findViewById(R.id.tabindicator_text)).setText(res.getString(R.string.heroinfo_inv));
+		((ImageView)v.findViewById(R.id.tabindicator_icon)).setImageDrawable(res.getDrawable(R.drawable.ui_icon_equipment));
 		tabHost.addTab(tabHost.newTabSpec("inv")
-				.setIndicator(res.getString(R.string.heroinfo_inv), res.getDrawable(R.drawable.ui_icon_equipment))
+				.setIndicator(v)
 				,HeroinfoActivity_Inventory.class, null);
 		String t = world.model.uiSelections.selectedTabHeroInfo;
 		if (t != null && t.length() > 0) {
 			tabHost.setCurrentTabByTag(t);
 		}
+		updateIconForPlayer();
+
+	}
+	
+	@Override
+	protected void onResume() {
+		super.onResume();
+		updateIconForPlayer();
+	}
+	
+	private void updateIconForPlayer() {
+		ImageView iv = (ImageView) tabHost.getTabWidget().getChildTabViewAt(0).findViewById(R.id.tabindicator_icon);
+		world.tileManager.setImageViewTileForPlayer(getResources(), iv, world.model.player.iconID);
 	}
 
 	@Override
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
index 2a18d92d7..b5e3ec8b2 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
@@ -1,118 +1,139 @@
-package com.gpl.rpg.AndorsTrail.activity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
-
-import java.util.Collections;
-
-public final class ItemInfoActivity extends Activity {
-
-	public static enum ItemInfoAction {
-		none, use, equip, unequip, buy, sell
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-		if (!app.isInitialized()) { finish(); return; }
-		final WorldContext world = app.getWorld();
-
-		app.setWindowParameters(this);
-
-		final Intent intent = getIntent();
-		Bundle params = intent.getExtras();
-		String itemTypeID = params.getString("itemTypeID");
-		final ItemType itemType = world.itemTypes.getItemType(itemTypeID);
-
-		final String buttonText = params.getString("buttonText");
-		boolean buttonEnabled = params.getBoolean("buttonEnabled");
-
-		setContentView(R.layout.iteminfo);
-
-		TextView tv = (TextView) findViewById(R.id.iteminfo_title);
-		tv.setText(itemType.getName(world.model.player));
-		world.tileManager.setImageViewTileForSingleItemType(getResources(), tv, itemType);
-
-		tv = (TextView) findViewById(R.id.iteminfo_description);
-		String description = itemType.getDescription();
-		if (description != null) {
-			tv.setText(description);
-			tv.setVisibility(View.VISIBLE);
-		} else {
-			tv.setVisibility(View.GONE);
-		}
-
-		tv = (TextView) findViewById(R.id.iteminfo_category);
-		tv.setText(itemType.category.displayName);
-
-		((ItemEffectsView) findViewById(R.id.iteminfo_effects)).update(
-				itemType.effects_equip,
-				itemType.effects_use == null ? null : Collections.singletonList(itemType.effects_use),
-				itemType.effects_hit == null ? null : Collections.singletonList(itemType.effects_hit),
-				itemType.effects_kill == null ? null : Collections.singletonList(itemType.effects_kill),
-				itemType.effects_hitReceived == null ? null : Collections.singletonList(itemType.effects_hitReceived),
-				null,
-				itemType.isWeapon()
-			);
-
-		Button b = (Button) findViewById(R.id.iteminfo_close);
-		b.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				setResult(RESULT_CANCELED);
-				ItemInfoActivity.this.finish();
-			}
-		});
-
-		b = (Button) findViewById(R.id.iteminfo_action);
-		if (buttonText != null && buttonText.length() > 0) {
-			b.setVisibility(View.VISIBLE);
-			b.setEnabled(buttonEnabled);
-			b.setText(buttonText);
-		} else {
-			b.setVisibility(View.GONE);
-		}
-
-		b.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				Intent result = new Intent();
-				result.putExtras(intent);
-				setResult(RESULT_OK, result);
-				ItemInfoActivity.this.finish();
-			}
-		});
-
-		tv = (TextView) findViewById(R.id.iteminfo_displaytype);
-		if (itemType.isOrdinaryItem()) {
-			tv.setVisibility(View.GONE);
-		} else {
-			tv.setVisibility(View.VISIBLE);
-			final String diplayType = getDisplayTypeString(getResources(), itemType);
-			tv.setText(diplayType);
-		}
-	}
-
-	public static String getDisplayTypeString(Resources res, ItemType itemType) {
-		switch (itemType.displayType) {
-			case rare: return res.getString(R.string.iteminfo_displaytypes_rare);
-			case extraordinary: return res.getString(R.string.iteminfo_displaytypes_extraordinary);
-			case legendary: return res.getString(R.string.iteminfo_displaytypes_legendary);
-			case ordinary: return res.getString(R.string.iteminfo_displaytypes_ordinary);
-			case quest: return res.getString(R.string.iteminfo_displaytypes_quest);
-			default: return "";
-		}
-	}
-}
+package com.gpl.rpg.AndorsTrail.activity;
+
+import java.util.Collections;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
+
+public final class ItemInfoActivity extends Activity {
+
+	public static enum ItemInfoAction {
+		none, use, equip, unequip, buy, sell
+	}
+	
+	public static final int RESULT_MORE_ACTIONS = Activity.RESULT_FIRST_USER; 
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getDialogTheme());
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		final WorldContext world = app.getWorld();
+
+		app.setWindowParameters(this);
+
+		final Intent intent = getIntent();
+		Bundle params = intent.getExtras();
+		String itemTypeID = params.getString("itemTypeID");
+		final ItemType itemType = world.itemTypes.getItemType(itemTypeID);
+
+		final String buttonText = params.getString("buttonText");
+		boolean buttonEnabled = params.getBoolean("buttonEnabled");
+		boolean moreButtonEnabled = params.getBoolean("moreActions");
+
+		setContentView(R.layout.iteminfo);
+
+		TextView tv = (TextView) findViewById(R.id.iteminfo_title);
+		tv.setText(itemType.getName(world.model.player));
+		world.tileManager.setImageViewTileForSingleItemType(getResources(), tv, itemType);
+
+		tv = (TextView) findViewById(R.id.iteminfo_description);
+		String description = itemType.getDescription();
+		if (description != null) {
+			tv.setText(description);
+			tv.setVisibility(View.VISIBLE);
+		} else {
+			tv.setVisibility(View.GONE);
+		}
+
+		tv = (TextView) findViewById(R.id.iteminfo_category);
+		tv.setText(itemType.category.displayName);
+
+		((ItemEffectsView) findViewById(R.id.iteminfo_effects)).update(
+				itemType.effects_equip,
+				itemType.effects_use == null ? null : Collections.singletonList(itemType.effects_use),
+				itemType.effects_hit == null ? null : Collections.singletonList(itemType.effects_hit),
+				itemType.effects_kill == null ? null : Collections.singletonList(itemType.effects_kill),
+				itemType.effects_hitReceived == null ? null : Collections.singletonList(itemType.effects_hitReceived),
+				null,
+				itemType.isWeapon()
+			);
+
+		Button b = (Button) findViewById(R.id.iteminfo_close);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				setResult(RESULT_CANCELED);
+				ItemInfoActivity.this.finish();
+			}
+		});
+		
+		b = (Button) findViewById(R.id.iteminfo_more);
+		if (!moreButtonEnabled) {
+			b.setVisibility(View.GONE);
+		} else {
+			b.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					Intent result = new Intent();
+					result.putExtras(intent);
+					setResult(RESULT_MORE_ACTIONS, intent);
+					ItemInfoActivity.this.finish();
+				}
+			});
+		}
+
+		b = (Button) findViewById(R.id.iteminfo_action);
+		if (buttonText != null && buttonText.length() > 0) {
+			b.setVisibility(View.VISIBLE);
+			b.setEnabled(buttonEnabled);
+			b.setText(buttonText);
+		} else {
+			b.setVisibility(View.GONE);
+		}
+
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				Intent result = new Intent();
+				result.putExtras(intent);
+				setResult(RESULT_OK, result);
+				ItemInfoActivity.this.finish();
+			}
+		});
+
+		tv = (TextView) findViewById(R.id.iteminfo_displaytype);
+		if (itemType.isOrdinaryItem()) {
+			tv.setVisibility(View.GONE);
+		} else {
+			tv.setVisibility(View.VISIBLE);
+			final String diplayType = getDisplayTypeString(getResources(), itemType);
+			tv.setText(diplayType);
+		}
+	}
+
+	public static String getDisplayTypeString(Resources res, ItemType itemType) {
+		switch (itemType.displayType) {
+			case rare: return res.getString(R.string.iteminfo_displaytypes_rare);
+			case extraordinary: return res.getString(R.string.iteminfo_displaytypes_extraordinary);
+			case legendary: return res.getString(R.string.iteminfo_displaytypes_legendary);
+			case ordinary: return res.getString(R.string.iteminfo_displaytypes_ordinary);
+			case quest: return res.getString(R.string.iteminfo_displaytypes_quest);
+			default: return "";
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
index fd5bc7023..f659cf0c5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
@@ -8,6 +8,7 @@ import android.view.View.OnClickListener;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
@@ -15,6 +16,7 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.ActorStatsController;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class LevelUpActivity extends Activity {
 	private WorldContext world;
@@ -26,6 +28,7 @@ public final class LevelUpActivity extends Activity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getDialogTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
index 07da04227..af2587ec2 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
@@ -1,8 +1,10 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import java.util.Collections;
+import java.util.List;
+
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
+import android.app.Dialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -11,31 +13,35 @@ import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
-
-import java.util.Collections;
-import java.util.List;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 public final class LoadSaveActivity extends Activity implements OnClickListener {
 	private boolean isLoading = true;
 	private static final int SLOT_NUMBER_CREATE_NEW_SLOT = -1;
 	private static final int SLOT_NUMBER_FIRST_SLOT = 1;
 	private ModelContainer model;
+	private TileManager tileManager;
 	private AndorsTrailPreferences preferences;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getDialogTheme());
 		super.onCreate(savedInstanceState);
 
 		final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		app.setWindowParameters(this);
 		this.model = app.getWorld().model;
 		this.preferences = app.getPreferences();
+		this.tileManager = app.getWorld().tileManager;
 
 		String loadsave = getIntent().getData().getLastPathSegment();
 		isLoading = (loadsave.equalsIgnoreCase("load"));
@@ -53,20 +59,20 @@ public final class LoadSaveActivity extends Activity implements OnClickListener
 
 		ViewGroup slotList = (ViewGroup) findViewById(R.id.loadsave_slot_list);
 		Button slotTemplateButton = (Button) findViewById(R.id.loadsave_slot_n);
-		Button createNewSlot = (Button) findViewById(R.id.loadsave_save_to_new_slot);
 		LayoutParams params = slotTemplateButton.getLayoutParams();
 		slotList.removeView(slotTemplateButton);
-		slotList.removeView(createNewSlot);
+
+		ViewGroup newSlotContainer = (ViewGroup) findViewById(R.id.loadsave_save_to_new_slot_container);
+		Button createNewSlot = (Button) findViewById(R.id.loadsave_save_to_new_slot);
 
 		addSavegameSlotButtons(slotList, params, Savegames.getUsedSavegameSlots());
 
 		if (!isLoading) {
-			Button b = new Button(this);
-			b.setLayoutParams(params);
-			b.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
-			b.setOnClickListener(this);
-			b.setText(R.string.loadsave_save_to_new_slot);
-			slotList.addView(b, params);
+			createNewSlot.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
+			createNewSlot.setOnClickListener(this);
+			newSlotContainer.setVisibility(View.VISIBLE);
+		} else {
+			newSlotContainer.setVisibility(View.GONE);
 		}
 	}
 
@@ -80,6 +86,7 @@ public final class LoadSaveActivity extends Activity implements OnClickListener
 			b.setTag(slot);
 			b.setOnClickListener(this);
 			b.setText(slot + ". " + header.describe());
+			tileManager.setImageViewTileForPlayer(getResources(), b, header.iconID);
 			parent.addView(b, params);
 		}
 	}
@@ -128,18 +135,34 @@ public final class LoadSaveActivity extends Activity implements OnClickListener
 			final String title =
 				getString(R.string.loadsave_save_overwrite_confirmation_title) + ' '
 				+ getString(R.string.loadsave_save_overwrite_confirmation_slot, slot);
-			new AlertDialog.Builder(this)
-				.setIcon(android.R.drawable.ic_dialog_alert)
-				.setTitle(title)
-				.setMessage(message)
-				.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+//			new AlertDialog.Builder(this)
+//				.setIcon(android.R.drawable.ic_dialog_alert)
+//				.setTitle(title)
+//				.setMessage(message)
+//				.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+//					@Override
+//					public void onClick(DialogInterface dialog, int which) {
+//						loadsave(slot);
+//					}
+//				})
+//				.setNegativeButton(android.R.string.no, null)
+//				.show();
+			final Dialog d = CustomDialogFactory.createDialog(this, 
+					title, 
+					getResources().getDrawable(android.R.drawable.ic_dialog_alert), 
+					message, 
+					null, 
+					true);
+			
+			CustomDialogFactory.addButton(d, android.R.string.yes, new View.OnClickListener() {
 					@Override
-					public void onClick(DialogInterface dialog, int which) {
+					public void onClick(View v) {
 						loadsave(slot);
 					}
-				})
-				.setNegativeButton(android.R.string.no, null)
-				.show();
+				});
+			CustomDialogFactory.addDismissButton(d, android.R.string.no);
+			
+			CustomDialogFactory.show(d);
 		} else {
 			loadsave(slot);
 		}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
index 2d87be8e8..7e636fab1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
@@ -1,38 +1,122 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
+import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.WorldSetup;
 import com.gpl.rpg.AndorsTrail.WorldSetup.OnResourcesLoadedListener;
 import com.gpl.rpg.AndorsTrail.WorldSetup.OnSceneLoadedListener;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 public final class LoadingActivity extends Activity implements OnResourcesLoadedListener, OnSceneLoadedListener {
 
 	private WorldSetup setup;
-	private ProgressDialog progressDialog;
+	private Dialog progressDialog;
+	private CloudsAnimatorView clouds_back, clouds_mid, clouds_front;
+	boolean loaded = false;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getBaseTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		app.setWindowParameters(this);
+		setContentView(R.layout.startscreen);
+
+		TextView tv = (TextView) findViewById(R.id.startscreen_version);
+		tv.setVisibility(View.GONE);
+		
+		clouds_back = (CloudsAnimatorView) findViewById(R.id.ts_clouds_animator_back);
+		if (clouds_back != null) clouds_back.setCloudsCountAndLayer(40, CloudsAnimatorView.Layer.below);
+		clouds_mid = (CloudsAnimatorView) findViewById(R.id.ts_clouds_animator_mid);
+		if (clouds_mid != null) clouds_mid.setCloudsCountAndLayer(15, CloudsAnimatorView.Layer.center);
+		clouds_front = (CloudsAnimatorView) findViewById(R.id.ts_clouds_animator_front);
+		if (clouds_front != null) clouds_front.setCloudsCountAndLayer(8, CloudsAnimatorView.Layer.above);
+		
 		this.setup = app.getWorldSetup();
 	}
 
+	@Override
+	public void onWindowFocusChanged(boolean hasFocus) {
+		super.onWindowFocusChanged(hasFocus);
+		if (hasFocus) {
+			((AnimationDrawable)((ImageView)findViewById(R.id.title_logo)).getDrawable()).start();
+			ImageView iv = (ImageView) findViewById(R.id.ts_foreground);
+			int ivWidth = iv.getWidth();
+			int drawableWidth = iv.getDrawable().getIntrinsicWidth();
+			float ratio = ((float)ivWidth) / ((float)drawableWidth);
+			
+			if (clouds_back != null) {
+				clouds_back.setScalingRatio(ratio);
+			}
+			if (clouds_mid != null) {
+				clouds_mid.setScalingRatio(ratio);
+			}
+			if (clouds_front != null) {
+				clouds_front.setScalingRatio(ratio);
+			}
+			
+			if (progressDialog == null) {
+				progressDialog = CustomDialogFactory.createDialog(this, getResources().getString(R.string.dialog_loading_message), 
+						getResources().getDrawable(R.drawable.loading_anim), null, null, false, false);
+				synchronized (progressDialog) {
+					if (!loaded) {
+						progressDialog.setOwnerActivity(this);
+						CustomDialogFactory.show(progressDialog);
+					}
+				}
+			}
+		}
+	}
+	
 	@Override
 	public void onResume() {
 		super.onResume();
-		progressDialog = ProgressDialog.show(this, null, getString(R.string.dialog_loading_message));
+		
 		setup.setOnResourcesLoadedListener(this);
+		
+
+		final ImageView iv = (ImageView) findViewById(R.id.ts_foreground);
+		iv.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+			
+			@Override
+			public boolean onPreDraw() {
+				float[] point = new float[]{0f,0.25f * iv.getDrawable().getIntrinsicHeight()};
+				iv.getImageMatrix().mapPoints(point);
+				int imgY = (int) (iv.getTop() + point[1]);
+
+				if (clouds_back != null) {
+					clouds_back.setYMax(imgY);
+				}
+				if (clouds_mid != null) {
+					clouds_mid.setYMax(imgY);
+				}
+				if (clouds_front != null) {
+					clouds_front.setYMax(imgY);
+				}
+				iv.getViewTreeObserver().removeOnPreDrawListener(this);
+				return true;
+			}
+		});
+		
+		
+		if (clouds_back != null)clouds_back.resumeAnimation();
+		if (clouds_mid != null)clouds_mid.resumeAnimation();
+		if (clouds_front != null)clouds_front.resumeAnimation();
 	}
 
 	@Override
@@ -40,23 +124,34 @@ public final class LoadingActivity extends Activity implements OnResourcesLoaded
 		super.onPause();
 		setup.setOnResourcesLoadedListener(null);
 		setup.removeOnSceneLoadedListener(this);
+		if (clouds_back != null)clouds_back.pauseAnimation();
+		if (clouds_mid != null)clouds_mid.pauseAnimation();
+		if (clouds_front != null)clouds_front.pauseAnimation();
 	}
-
+	
+	
 	@Override
 	public void onResourcesLoaded() {
+		loaded = false;
 		setup.startCharacterSetup(this);
 	}
 
 	@Override
 	public void onSceneLoaded() {
-		progressDialog.dismiss();
+		synchronized (progressDialog) {
+			if (progressDialog != null) progressDialog.dismiss();
+			loaded =true;
+		}
 		startActivity(new Intent(this, MainActivity.class));
 		this.finish();
 	}
 
 	@Override
 	public void onSceneLoadFailed(Savegames.LoadSavegameResult loadResult) {
-		progressDialog.dismiss();
+		synchronized (progressDialog) {
+			if (progressDialog != null) progressDialog.dismiss();
+			loaded =true;
+		}
 		if (loadResult == Savegames.LoadSavegameResult.savegameIsFromAFutureVersion) {
 			showLoadingFailedDialog(R.string.dialog_loading_failed_incorrectversion);
 		} else {
@@ -65,17 +160,15 @@ public final class LoadingActivity extends Activity implements OnResourcesLoaded
 	}
 
 	private void showLoadingFailedDialog(int messageResourceID) {
-		Dialog d = new AlertDialog.Builder(this)
-			.setTitle(R.string.dialog_loading_failed_title)
-			.setMessage(messageResourceID)
-			.setNeutralButton(android.R.string.ok, null)
-			.create();
-		d.setOnDismissListener(new OnDismissListener() {
+		final Dialog d = CustomDialogFactory.createDialog(this, getResources().getString(R.string.dialog_loading_failed_title), null, getResources().getString(messageResourceID), null, true);
+		CustomDialogFactory.addDismissButton(d, android.R.string.ok);
+		CustomDialogFactory.setDismissListener(d, new OnDismissListener() {
 			@Override
 			public void onDismiss(DialogInterface dialog) {
 				LoadingActivity.this.finish();
 			}
 		});
-		d.show();
+		CustomDialogFactory.show(d);
+		
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
index 989634a08..ad24f648d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
@@ -4,7 +4,7 @@ import java.lang.ref.WeakReference;
 import java.util.Collection;
 
 import android.app.Activity;
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -25,6 +25,7 @@ import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.AttackResult;
 import com.gpl.rpg.AndorsTrail.controller.CombatController;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListener;
 import com.gpl.rpg.AndorsTrail.controller.listeners.CombatTurnListener;
 import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerMovementListener;
@@ -39,7 +40,9 @@ import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.CombatView;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 import com.gpl.rpg.AndorsTrail.view.DisplayActiveActorConditionIcons;
 import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
 import com.gpl.rpg.AndorsTrail.view.MainView;
@@ -79,6 +82,7 @@ public final class MainActivity
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getNoBackgroundTheme());
 		super.onCreate(savedInstanceState);
 
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
@@ -231,82 +235,35 @@ public final class MainActivity
 					
 					final int buttonId = ((QuickButton)v).getIndex();
 					
-					final AlertDialog dialog = new AlertDialog.Builder(v.getContext()).create();
+//					final AlertDialog dialog = new AlertDialog.Builder(new ContextThemeWrapper(v.getContext(), R.style.AndorsTrailStyle_Dialog)).create();
 					View view = getLayoutInflater().inflate(R.layout.quickbuttons_usable_inventory, null);
 					ListView lv = (ListView) view.findViewById(R.id.quickbuttons_assignlist);
 
 					TileCollection wornTiles = world.tileManager.loadTilesFor(world.model.player.inventory, getResources());
 					final ItemContainerAdapter inventoryListAdapter = new QuickslotsItemContainerAdapter(lv.getContext(), world.tileManager, world.model.player.inventory.usableItems(), world.model.player, wornTiles);
 					lv.setAdapter(inventoryListAdapter);
+
+					final Dialog d = CustomDialogFactory.createDialog(v.getContext(), 
+							v.getResources().getString(R.string.inventory_assign), 
+							v.getResources().getDrawable(R.drawable.ui_icon_equipment), 
+							v.getResources().getString(R.string.inventory_selectitem), view, false);
+					
 					
 					lv.setOnItemClickListener(new OnItemClickListener() {
 						@Override
 						public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 							controllers.itemController.setQuickItem(inventoryListAdapter.getItem(position).itemType, buttonId);
-							dialog.dismiss();
+							d.dismiss();
 						}
 					});
 					
-//					Button b = (Button) view.findViewById(R.id.quickbuttons_unassign);
-//					b.setOnClickListener(new OnClickListener() {
-//						@Override
-//						public void onClick(View v) {
-//							controllers.itemController.setQuickItem(null, buttonId);
-//							dialog.dismiss();
-//						}
-//					});
-					
-					dialog.setView(view);
-					dialog.setCancelable(true);
-					dialog.show();
+					CustomDialogFactory.show(d);
 				}
 				return true;
 			}
 		};
 	}
 	
-//	@Override
-//	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-//		
-//		super.onCreateContextMenu(menu, v, menuInfo);
-//		if(quickitemview.isQuickButtonId(v.getId())){
-//			createQuickButtonMenu(menu);
-//		}
-//		lastSelectedMenu = null;
-//	}
-//
-//	private void createQuickButtonMenu(ContextMenu menu){
-//		menu.add(Menu.NONE, R.id.quick_menu_unassign, Menu.NONE, R.string.inventory_unassign);
-//		SubMenu assignMenu = menu.addSubMenu(Menu.NONE, R.id.quick_menu_assign, Menu.NONE, R.string.inventory_assign);
-//		for(int i=0; i<world.model.player.inventory.items.size(); ++i){
-//			ItemEntry itemEntry = world.model.player.inventory.items.get(i);
-//			if(itemEntry.itemType.isUsable())
-//				assignMenu.add(R.id.quick_menu_assign_group, i, Menu.NONE, itemEntry.itemType.getName(world.model.player));
-//		}
-//	}
-//
-//	@Override
-//	public boolean onContextItemSelected(MenuItem item) {
-//		QuickButtonContextMenuInfo menuInfo;
-//		if(item.getGroupId() == R.id.quick_menu_assign_group){
-//			menuInfo = (QuickButtonContextMenuInfo) lastSelectedMenu;
-//			controllers.itemController.setQuickItem(world.model.player.inventory.items.get(item.getItemId()).itemType, menuInfo.index);
-//			return true;
-//		}
-//		switch(item.getItemId()){
-//		case R.id.quick_menu_unassign:
-//			menuInfo = (QuickButtonContextMenuInfo) item.getMenuInfo();
-//			controllers.itemController.setQuickItem(null, menuInfo.index);
-//			break;
-//		case R.id.quick_menu_assign:
-//			menuInfo = (QuickButtonContextMenuInfo) item.getMenuInfo();
-//			lastSelectedMenu = menuInfo;
-//			break;
-//		default:
-//			return super.onContextItemSelected(item);
-//		}
-//		return true;
-//	}
 
 	private void updateStatus() {
 		statusview.updateStatus();
@@ -319,6 +276,14 @@ public final class MainActivity
 		world.model.combatLog.append(msg);
 		statusText.setText(world.model.combatLog.getLastMessages());
 		statusText.setVisibility(View.VISIBLE);
+		if (! world.model.uiSelections.isInCombat) {
+			statusText.postDelayed(new Runnable(){
+				@Override
+				public void run() {
+					clearMessages();
+				}
+			}, Constants.STATUS_TEXT_AUTOHIDE_DELAY);
+		}
 	}
 
 	private void clearMessages() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
index 39f759644..6e38f2df4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
@@ -7,17 +7,20 @@ import android.view.View.OnClickListener;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class MonsterEncounterActivity extends Activity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getDialogTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
index e129e6a39..4ab493b2c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
@@ -8,12 +8,14 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
 import com.gpl.rpg.AndorsTrail.view.RangeBar;
 import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
@@ -33,6 +35,7 @@ public final class MonsterInfoActivity extends Activity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getDialogTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
index c72d6ff7a..bad5073f5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
@@ -1,13 +1,25 @@
-package com.gpl.rpg.AndorsTrail.activity;
-
-import android.os.Bundle;
-import android.preference.PreferenceActivity;
-import com.gpl.rpg.AndorsTrail.R;
-
-public final class Preferences extends PreferenceActivity {
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		addPreferencesFromResource(R.xml.preferences);
-	}
-}
+package com.gpl.rpg.AndorsTrail.activity;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+
+public final class Preferences extends PreferenceActivity {
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getBaseTheme());
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		super.onCreate(savedInstanceState);
+		if (AndorsTrailApplication.getApplicationFromActivity(this).getPreferences().fullscreen) {
+			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		} else {
+			getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
+		addPreferencesFromResource(R.xml.preferences);
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
index 3ef0821c7..26d6abe5f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
@@ -4,15 +4,23 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTabHost;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Buy;
 import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Sell;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class ShopActivity extends FragmentActivity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getBaseTheme());
 		super.onCreate(savedInstanceState);
 
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
@@ -26,11 +34,22 @@ public final class ShopActivity extends FragmentActivity {
 		FragmentTabHost tabHost = (FragmentTabHost) findViewById(android.R.id.tabhost);
 		tabHost.setup(this, getSupportFragmentManager(), R.id.realtabcontent);
 
+		LayoutInflater inflater = getLayoutInflater();
+		
+		ViewGroup v;
+		
+		v = (ViewGroup) inflater.inflate(R.layout.tabindicator, null);
+		((TextView)v.findViewById(R.id.tabindicator_text)).setText(res.getString(R.string.shop_buy));
+		((ImageView)v.findViewById(R.id.tabindicator_icon)).setImageResource(R.drawable.ui_icon_equipment);
 		tabHost.addTab(tabHost.newTabSpec("buy")
-				.setIndicator(res.getString(R.string.shop_buy))
+				.setIndicator(v)
 				,ShopActivity_Buy.class, null);
+		
+		v = (ViewGroup) inflater.inflate(R.layout.tabindicator, null);
+		((TextView)v.findViewById(R.id.tabindicator_text)).setText(res.getString(R.string.shop_sell));
+		((ImageView)v.findViewById(R.id.tabindicator_icon)).setImageResource(R.drawable.ui_icon_coins);
 		tabHost.addTab(tabHost.newTabSpec("sell")
-				.setIndicator(res.getString(R.string.shop_sell))
+				.setIndicator(v)
 				,ShopActivity_Sell.class, null);
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
index d6996b682..d24d681a3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
@@ -10,6 +10,7 @@ import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -18,11 +19,13 @@ import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class SkillInfoActivity extends Activity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		setTheme(ThemeHelper.getDialogTheme());
 		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
 		if (!app.isInitialized()) { finish(); return; }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
index d1e1a1936..892151fc8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
@@ -1,246 +1,258 @@
-package com.gpl.rpg.AndorsTrail.activity;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-import com.gpl.rpg.AndorsTrail.*;
-import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
-
-public final class StartScreenActivity extends Activity {
-
-	private static final int INTENTREQUEST_PREFERENCES = 7;
-	public static final int INTENTREQUEST_LOADGAME = 9;
-
-	private boolean hasExistingGame = false;
-	private Button startscreen_continue;
-	private Button startscreen_newgame;
-	private Button startscreen_load;
-	private TextView startscreen_currenthero;
-	private EditText startscreen_enterheroname;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-		final Resources res = getResources();
-		TileManager tileManager = app.getWorld().tileManager;
-		tileManager.setDensity(res);
-		updatePreferences(false);
-		app.setWindowParameters(this);
-
-		setContentView(R.layout.startscreen);
-
-		TextView tv = (TextView) findViewById(R.id.startscreen_version);
-		tv.setText('v' + AndorsTrailApplication.CURRENT_VERSION_DISPLAY);
-
-		startscreen_currenthero = (TextView) findViewById(R.id.startscreen_currenthero);
-		startscreen_enterheroname = (EditText) findViewById(R.id.startscreen_enterheroname);
-		//startscreen_enterheroname.setImeOptions(EditorInfo.IME_ACTION_DONE);
-
-		startscreen_continue = (Button) findViewById(R.id.startscreen_continue);
-		startscreen_continue.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				continueGame(false, Savegames.SLOT_QUICKSAVE, null);
-			}
-		});
-
-		startscreen_newgame = (Button) findViewById(R.id.startscreen_newgame);
-		startscreen_newgame.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				if (hasExistingGame) {
-					comfirmNewGame();
-				} else {
-					createNewGame();
-				}
-			}
-		});
-
-		Button b = (Button) findViewById(R.id.startscreen_about);
-		b.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				startActivity(new Intent(StartScreenActivity.this, AboutActivity.class));
-			}
-		});
-
-		b = (Button) findViewById(R.id.startscreen_preferences);
-		b.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				Intent intent = new Intent(StartScreenActivity.this, Preferences.class);
-				startActivityForResult(intent, INTENTREQUEST_PREFERENCES);
-			}
-		});
-
-		startscreen_load = (Button) findViewById(R.id.startscreen_load);
-		startscreen_load.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				Dialogs.showLoad(StartScreenActivity.this);
-			}
-		});
-
-		TextView development_version = (TextView) findViewById(R.id.startscreen_dev_version);
-		if (AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAMES) {
-			development_version.setText(R.string.startscreen_incompatible_savegames);
-			development_version.setVisibility(View.VISIBLE);
-		} else if (!AndorsTrailApplication.IS_RELEASE_VERSION) {
-			development_version.setText(R.string.startscreen_non_release_version);
-			development_version.setVisibility(View.VISIBLE);
-		}
-//		if (development_version.getVisibility() == View.VISIBLE) {
-//			development_version.setText(development_version.getText() +
-//					"\nMax Heap: " + Runtime.getRuntime().maxMemory() / 1024 +
-//					"\nTile size: " + (int) (32 * res.getDisplayMetrics().density));
-//		}
-
-		app.getWorldSetup().startResourceLoader(res);
-
-		if (AndorsTrailApplication.DEVELOPMENT_FORCE_STARTNEWGAME) {
-			if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
-				continueGame(true, 0, "Debug player");
-			} else {
-				continueGame(true, 0, "Player");
-			}
-		} else if (AndorsTrailApplication.DEVELOPMENT_FORCE_CONTINUEGAME) {
-			continueGame(false, Savegames.SLOT_QUICKSAVE, null);
-		}
-	}
-
-	private void updatePreferences(boolean alreadyStartedLoadingResources) {
-		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-		AndorsTrailPreferences preferences = app.getPreferences();
-		preferences.read(this);
-		if (app.setLocale(this)) {
-			if (alreadyStartedLoadingResources) {
-				// Changing the locale after having loaded the game requires resources to
-				// be re-loaded. Therefore, we just exit here.
-				Toast.makeText(this, R.string.change_locale_requires_restart, Toast.LENGTH_LONG).show();
-				this.finish();
-				return;
-			}
-		}
-		app.getWorld().tileManager.updatePreferences(preferences);
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-
-		String playerName;
-		String displayInfo = null;
-
-		FileHeader header = Savegames.quickload(this, Savegames.SLOT_QUICKSAVE);
-		if (header != null && header.playerName != null) {
-			playerName = header.playerName;
-			displayInfo = header.displayInfo;
-		} else {
-			// Before fileversion 14 (v0.6.7), quicksave was stored in Shared preferences
-			SharedPreferences p = getSharedPreferences("quicksave", MODE_PRIVATE);
-			playerName = p.getString("playername", null);
-			if (playerName != null) {
-				displayInfo = "level " + p.getInt("level", -1);
-			}
-		}
-		hasExistingGame = (playerName != null);
-		setButtonState(playerName, displayInfo);
-
-		if (isNewVersion()) {
-			Dialogs.showNewVersion(this);
-		}
-
-		boolean hasSavegames = !Savegames.getUsedSavegameSlots().isEmpty();
-		startscreen_load.setEnabled(hasSavegames);
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		switch (requestCode) {
-		case INTENTREQUEST_LOADGAME:
-			if (resultCode != Activity.RESULT_OK) break;
-			final int slot = data.getIntExtra("slot", 1);
-			continueGame(false, slot, null);
-			break;
-		case INTENTREQUEST_PREFERENCES:
-			updatePreferences(true);
-			break;
-		}
-	}
-
-	private boolean isNewVersion() {
-		final String v = "lastversion";
-		SharedPreferences s = getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, MODE_PRIVATE);
-		int lastversion = s.getInt(v, 0);
-		if (lastversion >= AndorsTrailApplication.CURRENT_VERSION) return false;
-		Editor e = s.edit();
-		e.putInt(v, AndorsTrailApplication.CURRENT_VERSION);
-		e.commit();
-		return true;
-	}
-
-
-	private void setButtonState(final String playerName, final String displayInfo) {
-		startscreen_continue.setEnabled(hasExistingGame);
-		startscreen_newgame.setEnabled(true);
-		if (hasExistingGame) {
-			startscreen_currenthero.setText(playerName + ", " + displayInfo);
-			startscreen_enterheroname.setText(playerName);
-			startscreen_enterheroname.setVisibility(View.GONE);
-		} else {
-			startscreen_currenthero.setText(R.string.startscreen_enterheroname);
-			startscreen_enterheroname.setVisibility(View.VISIBLE);
-		}
-	}
-
-	private void continueGame(boolean createNewCharacter, int loadFromSlot, String name) {
-		final WorldSetup setup = AndorsTrailApplication.getApplicationFromActivity(this).getWorldSetup();
-		setup.createNewCharacter = createNewCharacter;
-		setup.loadFromSlot = loadFromSlot;
-		setup.newHeroName = name;
-		startActivity(new Intent(this, LoadingActivity.class));
-	}
-
-	private void createNewGame() {
-		String name = startscreen_enterheroname.getText().toString().trim();
-		if (name == null || name.length() <= 0) {
-			Toast.makeText(this, R.string.startscreen_enterheroname, Toast.LENGTH_SHORT).show();
-			return;
-		}
-		continueGame(true, 0, name);
-	}
-
-	private void comfirmNewGame() {
-		new AlertDialog.Builder(this)
-		.setTitle(R.string.startscreen_newgame)
-		.setMessage(R.string.startscreen_newgame_confirm)
-		.setIcon(android.R.drawable.ic_delete)
-		.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				//continueGame(true);
-				hasExistingGame = false;
-				setButtonState(null, null);
-			}
-		})
-		.setNegativeButton(android.R.string.cancel, null)
-		.create().show();
-	}
-}
+package com.gpl.rpg.AndorsTrail.activity;
+
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.drawable.AnimationDrawable;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager.OnBackStackChangedListener;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame.GameCreationOverListener;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
+
+public final class StartScreenActivity extends FragmentActivity implements OnNewGameRequestedListener, GameCreationOverListener, OnBackStackChangedListener {
+
+	private TextView tv;
+	private TextView development_version;
+	private CloudsAnimatorView clouds_back, clouds_mid, clouds_front;
+	private Fragment currentFragment;
+	
+	//Means false by default, as a toggle is initiated in onCreate.
+	boolean ui_visible = true;
+	
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		initPreferences();
+		setTheme(ThemeHelper.getBaseTheme());
+		super.onCreate(savedInstanceState);
+
+		final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		final Resources res = getResources();
+		TileManager tileManager = app.getWorld().tileManager;
+		tileManager.setDensity(res);
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.startscreen);
+
+		if (findViewById(R.id.startscreen_fragment_container) != null) {
+			StartScreenActivity_MainMenu mainMenu = new StartScreenActivity_MainMenu();
+			
+			getSupportFragmentManager().beginTransaction()
+				.replace(R.id.startscreen_fragment_container, mainMenu)
+				.commit();
+			currentFragment = mainMenu;
+			
+			getSupportFragmentManager().addOnBackStackChangedListener(this);
+		}
+		
+		
+		
+		tv = (TextView) findViewById(R.id.startscreen_version);
+		tv.setText('v' + AndorsTrailApplication.CURRENT_VERSION_DISPLAY);
+		
+		development_version = (TextView) findViewById(R.id.startscreen_dev_version);
+		if (AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAMES) {
+			development_version.setText(R.string.startscreen_incompatible_savegames);
+			development_version.setVisibility(View.VISIBLE);
+		} else if (!AndorsTrailApplication.IS_RELEASE_VERSION) {
+			development_version.setText(R.string.startscreen_non_release_version);
+			development_version.setVisibility(View.VISIBLE);
+		}
+		
+
+		clouds_back = (CloudsAnimatorView) findViewById(R.id.ts_clouds_animator_back);
+		if (clouds_back != null) clouds_back.setCloudsCountAndLayer(40, CloudsAnimatorView.Layer.below);
+		clouds_mid = (CloudsAnimatorView) findViewById(R.id.ts_clouds_animator_mid);
+		if (clouds_mid != null) clouds_mid.setCloudsCountAndLayer(15, CloudsAnimatorView.Layer.center);
+		clouds_front = (CloudsAnimatorView) findViewById(R.id.ts_clouds_animator_front);
+		if (clouds_front != null) clouds_front.setCloudsCountAndLayer(8, CloudsAnimatorView.Layer.above);
+		
+		View background = findViewById(R.id.title_bg);
+		if (background != null) {
+			background.setOnClickListener(new View.OnClickListener() {
+			
+				@Override
+				public void onClick(View v) {
+					toggleUiVisibility();
+				}
+			});
+		}
+		
+		if (development_version.getVisibility() == View.VISIBLE) {
+			development_version.setText(development_version.getText()
+//					+
+//					"\nMax Heap: " + Runtime.getRuntime().maxMemory() / (1024 * 1024) + "MB"+
+//					"\nUsed Heap: " + Runtime.getRuntime().totalMemory() / (1024 * 1024) + "MB"+
+//					"\nTile size: " + (int) (32 * res.getDisplayMetrics().density)
+					);
+		}
+
+		toggleUiVisibility();
+		
+		app.getWorldSetup().startResourceLoader(res);
+
+	}
+	
+	private void toggleUiVisibility() {
+		ui_visible = !ui_visible; 
+		int visibility = ui_visible ? View.VISIBLE : View.GONE;
+		if (tv != null) tv.setVisibility(visibility);
+		if (development_version != null) development_version.setVisibility(visibility);
+		if (currentFragment != null) {
+			if (ui_visible) {
+
+				development_version.setText(
+						development_version.getText()
+//						+
+//						"\nMax Heap: " + Runtime.getRuntime().maxMemory() / (1024 * 1024) + "MB"+
+//						"\nUsed Heap: " + Runtime.getRuntime().totalMemory() / (1024 * 1024) + "MB"+
+//						"\nTile size: " + (int) (32 * getResources().getDisplayMetrics().density)
+						);
+				
+				getSupportFragmentManager().beginTransaction()
+					.show(currentFragment)
+					.commit();
+			} else {
+				getSupportFragmentManager().beginTransaction()
+					.hide(currentFragment)
+					.commit();
+			}
+		}
+	}
+	
+	private void initPreferences() {
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		AndorsTrailPreferences preferences = app.getPreferences();
+		preferences.read(this);
+		ThemeHelper.changeTheme(preferences.selectedTheme);
+	}
+	
+	@Override
+	public void onWindowFocusChanged(boolean hasFocus) {
+		super.onWindowFocusChanged(hasFocus);
+		if (hasFocus) {
+			((AnimationDrawable)((ImageView)findViewById(R.id.title_logo)).getDrawable()).start();
+			ImageView iv = (ImageView) findViewById(R.id.ts_foreground);
+			int ivWidth = iv.getWidth();
+			int drawableWidth = iv.getDrawable().getIntrinsicWidth();
+			float ratio = ((float)ivWidth) / ((float)drawableWidth);
+			
+			if (clouds_back != null) {
+				clouds_back.setScalingRatio(ratio);
+			}
+			if (clouds_mid != null) {
+				clouds_mid.setScalingRatio(ratio);
+			}
+			if (clouds_front != null) {
+				clouds_front.setScalingRatio(ratio);
+			}
+		}
+	}
+	
+	@Override
+	protected void onResume() {
+		super.onResume();
+		final ImageView iv = (ImageView) findViewById(R.id.ts_foreground);
+		iv.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+			
+			@Override
+			public boolean onPreDraw() {
+				float[] point = new float[]{0f,0.25f * iv.getDrawable().getIntrinsicHeight()};
+				iv.getImageMatrix().mapPoints(point);
+				int imgY = (int) (iv.getTop() + point[1]);
+				int screenHeight = getResources().getDisplayMetrics().heightPixels;
+
+				if (clouds_back != null) {
+					clouds_back.setYMax(imgY);
+				}
+				if (clouds_mid != null) {
+					clouds_mid.setYMax(imgY);
+				}
+				if (clouds_front != null) {
+					clouds_front.setYMax(imgY);
+				}
+				iv.getViewTreeObserver().removeOnPreDrawListener(this);
+				return true;
+			}
+		});
+		
+		
+		if (clouds_back != null)clouds_back.resumeAnimation();
+		if (clouds_mid != null)clouds_mid.resumeAnimation();
+		if (clouds_front != null)clouds_front.resumeAnimation();
+	}
+
+	@Override
+	protected void onPause() {
+		super.onPause();
+		if (clouds_back != null)clouds_back.pauseAnimation();
+		if (clouds_mid != null)clouds_mid.pauseAnimation();
+		if (clouds_front != null)clouds_front.pauseAnimation();
+	}
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+	}
+	
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (keyCode == KeyEvent.KEYCODE_BACK) {
+			if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
+				backPressed();
+				return true;
+			} else {
+				return super.onKeyDown(keyCode, event);
+			}
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+
+	private void backPressed() {
+		if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
+			getSupportFragmentManager().popBackStack();
+			currentFragment = getSupportFragmentManager().findFragmentById(R.id.startscreen_fragment_container);
+		}
+	}
+	
+	
+	
+	public void onNewGameRequested() {
+		if (findViewById(R.id.startscreen_fragment_container) != null) {
+			StartScreenActivity_NewGame newGameFragment = new StartScreenActivity_NewGame();
+			
+			getSupportFragmentManager().beginTransaction()
+				.replace(R.id.startscreen_fragment_container, newGameFragment)
+				.addToBackStack(null)
+				.commit();
+
+			currentFragment = newGameFragment;
+			
+		}
+	}
+	
+	@Override
+	public void onGameCreationCancelled() {
+		backPressed();
+	}
+
+	@Override
+	public void onBackStackChanged() {
+		currentFragment = getSupportFragmentManager().findFragmentById(R.id.startscreen_fragment_container);
+	}
+	
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
index 498e6279f..6a95ee8fa 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
@@ -1,478 +1,473 @@
-package com.gpl.rpg.AndorsTrail.activity.fragment;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.*;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.Dialogs;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.ItemController;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
-
-public final class HeroinfoActivity_Inventory extends Fragment {
-
-	private static final int INTENTREQUEST_ITEMINFO = 3;
-	private static final int INTENTREQUEST_BULKSELECT_DROP = 11;
-
-	private WorldContext world;
-	private ControllerContext controllers;
-	private TileCollection wornTiles;
-
-	private Player player;
-	private ListView inventoryList;
-	private Spinner inventorylist_categories;
-	private Spinner inventorylist_sort;
-	private ItemContainerAdapter inventoryListAdapter;
-	private ItemContainerAdapter inventoryWeaponsListAdapter;
-	private ItemContainerAdapter inventoryArmorListAdapter;
-	private ItemContainerAdapter inventoryUsableListAdapter;
-	private ItemContainerAdapter inventoryQuestListAdapter;
-	private ItemContainerAdapter inventoryOtherListAdapter;
-
-
-	private TextView heroinfo_stats_gold;
-	private TextView heroinfo_stats_attack;
-	private TextView heroinfo_stats_defense;
-
-	private ItemType lastSelectedItem; // Workaround android bug #7139
-
-	private final ImageView[] wornItemImage = new ImageView[Inventory.WearSlot.values().length];
-	private final int[] defaultWornItemImageResourceIDs = new int[Inventory.WearSlot.values().length];
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity());
-		if (!app.isInitialized()) return;
-		this.world = app.getWorld();
-		this.controllers = app.getControllerContext();
-		this.player = world.model.player;
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		final View v = inflater.inflate(R.layout.heroinfo_inventory, container, false);
-
-		initialiseInventorySpinners(v);
-
-		inventoryList = (ListView) v.findViewById(R.id.inventorylist_root);
-		registerForContextMenu(inventoryList);
-		inventoryList.setOnItemClickListener(new OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-				// Move this code to separate function? -- Done
-				ItemType itemType = getSelectedItemType(position);
-				showInventoryItemInfo(itemType.id);
-			}
-		});
-
-		ItemContainer inv = player.inventory;
-		wornTiles = world.tileManager.loadTilesFor(player.inventory, getResources());
-		inventoryListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, inv, player, wornTiles);
-		inventoryList.setAdapter(inventoryListAdapter);
-
-		heroinfo_stats_gold = (TextView) v.findViewById(R.id.heroinfo_stats_gold);
-		heroinfo_stats_attack = (TextView) v.findViewById(R.id.heroinfo_stats_attack);
-		heroinfo_stats_defense = (TextView) v.findViewById(R.id.heroinfo_stats_defense);
-
-		setWearSlot(v, Inventory.WearSlot.weapon, R.id.heroinfo_worn_weapon, R.drawable.equip_weapon);
-		setWearSlot(v, Inventory.WearSlot.shield, R.id.heroinfo_worn_shield, R.drawable.equip_shield);
-		setWearSlot(v, Inventory.WearSlot.head, R.id.heroinfo_worn_head, R.drawable.equip_head);
-		setWearSlot(v, Inventory.WearSlot.body, R.id.heroinfo_worn_body, R.drawable.equip_body);
-		setWearSlot(v, Inventory.WearSlot.feet, R.id.heroinfo_worn_feet, R.drawable.equip_feet);
-		setWearSlot(v, Inventory.WearSlot.neck, R.id.heroinfo_worn_neck, R.drawable.equip_neck);
-		setWearSlot(v, Inventory.WearSlot.hand, R.id.heroinfo_worn_hand, R.drawable.equip_hand);
-		setWearSlot(v, Inventory.WearSlot.leftring, R.id.heroinfo_worn_ringleft, R.drawable.equip_ring);
-		setWearSlot(v, Inventory.WearSlot.rightring, R.id.heroinfo_worn_ringright, R.drawable.equip_ring);
-
-		return v;
-	}
-
-	private void initialiseInventorySpinners(View v) {
-		inventorylist_categories = (Spinner) v.findViewById(R.id.inventorylist_category_filters);
-		ArrayAdapter<CharSequence> categoryFilterAdapter = ArrayAdapter.createFromResource(getActivity(), R.array.inventorylist_category_filters, android.R.layout.simple_spinner_item);
-		categoryFilterAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		inventorylist_categories.setAdapter(categoryFilterAdapter);
-		inventorylist_categories.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-				world.model.uiSelections.selectedInventoryCategory = inventorylist_categories.getSelectedItemPosition();
-				reloadShownCategory(world.model.uiSelections.selectedInventoryCategory);
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> arg0) {
-				world.model.uiSelections.selectedInventoryCategory = 0;
-			}
-		});
-		inventorylist_categories.setSelection(world.model.uiSelections.selectedInventoryCategory);
-
-
-		inventorylist_sort = (Spinner) v.findViewById(R.id.inventorylist_sort_filters);
-		ArrayAdapter<CharSequence> sortFilterAdapter = ArrayAdapter.createFromResource(getActivity(), R.array.inventorylist_sort_filters, android.R.layout.simple_spinner_item);
-		sortFilterAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		inventorylist_sort.setAdapter(sortFilterAdapter);
-		inventorylist_sort.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-			@Override
-			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-				world.model.uiSelections.selectedInventorySort = inventorylist_sort.getSelectedItemPosition();
-				reloadShownSort(player.inventory);
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> parent) {
-				// Reset to "Custom" position
-				world.model.uiSelections.selectedInventorySort = 0;
-			}
-		});
-		inventorylist_sort.setSelection(world.model.uiSelections.selectedInventorySort);
-	}
-
-	private void setHeroStatsVisiblity(int visibility) {
-		heroinfo_stats_gold.setVisibility(visibility);
-		heroinfo_stats_attack.setVisibility(visibility);
-		heroinfo_stats_defense.setVisibility(visibility);
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		update();
-	}
-
-	private void setWearSlot(final View v, final Inventory.WearSlot inventorySlot, int viewId, int resourceId) {
-		final ImageView imageView = (ImageView) v.findViewById(viewId);
-		wornItemImage[inventorySlot.ordinal()] = imageView;
-		defaultWornItemImageResourceIDs[inventorySlot.ordinal()] = resourceId;
-		imageView.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (player.inventory.isEmptySlot(inventorySlot)) return;
-				imageView.setClickable(false); // Will be enabled again on update()
-				showEquippedItemInfo(player.inventory.getItemTypeInWearSlot(inventorySlot), inventorySlot);
-			}
-		});
-	}
-
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		switch (requestCode) {
-		case INTENTREQUEST_ITEMINFO:
-			if (resultCode != Activity.RESULT_OK) break;
-
-			ItemType itemType = world.itemTypes.getItemType(data.getExtras().getString("itemTypeID"));
-			ItemInfoActivity.ItemInfoAction actionType = ItemInfoActivity.ItemInfoAction.valueOf(data.getExtras().getString("actionType"));
-			if (actionType == ItemInfoActivity.ItemInfoAction.unequip) {
-				Inventory.WearSlot slot = Inventory.WearSlot.valueOf(data.getExtras().getString("inventorySlot"));
-				controllers.itemController.unequipSlot(itemType, slot);
-			} else if (actionType == ItemInfoActivity.ItemInfoAction.equip) {
-				Inventory.WearSlot slot = suggestInventorySlot(itemType);
-				controllers.itemController.equipItem(itemType, slot);
-			} else if (actionType == ItemInfoActivity.ItemInfoAction.use) {
-				controllers.itemController.useItem(itemType);
-			}
-			break;
-		case INTENTREQUEST_BULKSELECT_DROP:
-			if (resultCode != Activity.RESULT_OK) break;
-
-			int quantity = data.getExtras().getInt("selectedAmount");
-			String itemTypeID = data.getExtras().getString("itemTypeID");
-			dropItem(itemTypeID, quantity);
-			break;
-		}
-		update();
-	}
-
-	private Inventory.WearSlot suggestInventorySlot(ItemType itemType) {
-		Inventory.WearSlot slot = itemType.category.inventorySlot;
-		if (player.inventory.isEmptySlot(slot)) return slot;
-
-		if (slot == Inventory.WearSlot.leftring) return Inventory.WearSlot.rightring;
-		if (itemType.isOffhandCapableWeapon()) {
-			ItemType mainWeapon = player.inventory.getItemTypeInWearSlot(Inventory.WearSlot.weapon);
-			if (mainWeapon != null && mainWeapon.isTwohandWeapon()) return slot;
-			else if (player.inventory.isEmptySlot(Inventory.WearSlot.shield)) return Inventory.WearSlot.shield;
-		}
-		return slot;
-	}
-
-	private void dropItem(String itemTypeID, int quantity) {
-		ItemType itemType = world.itemTypes.getItemType(itemTypeID);
-		controllers.itemController.dropItem(itemType, quantity);
-	}
-
-	private void update() {
-		updateTraits();
-		updateWorn();
-		updateItemList();
-	}
-
-	private void updateTraits() {
-		heroinfo_stats_gold.setText(getResources().getString(R.string.heroinfo_gold, player.inventory.gold));
-
-		StringBuilder sb = new StringBuilder(10);
-		ItemController.describeAttackEffect(
-				player.getAttackChance(),
-				player.getDamagePotential().current,
-				player.getDamagePotential().max,
-				player.getCriticalSkill(),
-				player.getCriticalMultiplier(),
-				sb);
-		heroinfo_stats_attack.setText(sb.toString());
-
-		sb = new StringBuilder(10);
-		ItemController.describeBlockEffect(player.getBlockChance(), player.getDamageResistance(), sb);
-		heroinfo_stats_defense.setText(sb.toString());
-	}
-
-	private void updateWorn() {
-		for(Inventory.WearSlot slot : Inventory.WearSlot.values()) {
-			updateWornImage(wornItemImage[slot.ordinal()], defaultWornItemImageResourceIDs[slot.ordinal()], player.inventory.getItemTypeInWearSlot(slot));
-		}
-	}
-
-	private void updateWornImage(ImageView imageView, int resourceIDEmptyImage, ItemType type) {
-		if (type != null) {
-			world.tileManager.setImageViewTile(getResources(), imageView, type, wornTiles);
-		} else {
-			imageView.setImageResource(resourceIDEmptyImage);
-		}
-		imageView.setClickable(true);
-	}
-
-	private void updateItemList() {
-		int currentScreen = world.model.uiSelections.selectedInventoryCategory;
-		if (currentScreen == 0)
-			inventoryListAdapter.notifyDataSetChanged();
-		else
-			reloadShownCategory(world.model.uiSelections.selectedInventoryCategory);
-	}
-
-	@Override
-	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-		super.onCreateContextMenu(menu, v, menuInfo);
-		ItemType type = getSelectedItemType((AdapterContextMenuInfo) menuInfo);
-		MenuInflater inflater = getActivity().getMenuInflater();
-		switch (v.getId()) {
-		case R.id.inventorylist_root:
-			inflater.inflate(R.menu.inventoryitem, menu);
-			if (type.isUsable()){
-				menu.findItem(R.id.inv_menu_use).setVisible(true);
-				menu.findItem(R.id.inv_menu_assign).setVisible(true);
-			}
-			if (type.isEquippable()) {
-				menu.findItem(R.id.inv_menu_equip).setVisible(true);
-				if (type.isOffhandCapableWeapon()) menu.findItem(R.id.inv_menu_equip_offhand).setVisible(true);
-				else if (type.category.inventorySlot == Inventory.WearSlot.leftring) menu.findItem(R.id.inv_menu_equip_offhand).setVisible(true);
-			}
-			break;
-		}
-		lastSelectedItem = null;
-	}
-
-	private ItemType getSelectedItemType(int position) {
-		int v = world.model.uiSelections.selectedInventoryCategory;
-
-		if (v == 0) { //All items
-			return inventoryListAdapter.getItem(position).itemType;
-		}else if (v == 1) { //Weapon items
-			return inventoryWeaponsListAdapter.getItem(position).itemType;
-		} else if (v == 2) { //Armor items
-			return inventoryArmorListAdapter.getItem(position).itemType;
-		} else if (v == 3) { //Usable items
-			return inventoryUsableListAdapter.getItem(position).itemType;
-		} else if (v == 4) { //Quest items
-			return inventoryQuestListAdapter.getItem(position).itemType;
-		} else if (v == 5) { //Other items
-			return inventoryOtherListAdapter.getItem(position).itemType;
-		}
-
-		// Better than crashing...
-		return inventoryListAdapter.getItem(position).itemType;
-
-	}
-
-
-	private ItemType getSelectedItemType(AdapterContextMenuInfo info) {
-		return getSelectedItemType(info.position);
-	}
-	@Override
-	public boolean onContextItemSelected(MenuItem item) {
-		ItemType itemType;
-		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-		switch (item.getItemId()) {
-		case R.id.inv_menu_info:
-			showInventoryItemInfo(getSelectedItemType(info));
-			//context.mapController.itemInfo(this, getSelectedItemType(info));
-			break;
-		case R.id.inv_menu_drop:
-			String itemTypeID = getSelectedItemType(info).id;
-			int quantity = player.inventory.getItemQuantity(itemTypeID);
-			if (quantity > 1) {
-				Intent intent = Dialogs.getIntentForBulkDroppingInterface(getActivity(), itemTypeID, quantity);
-				startActivityForResult(intent, INTENTREQUEST_BULKSELECT_DROP);
-			} else {
-				dropItem(itemTypeID, quantity);
-			}
-			break;
-		case R.id.inv_menu_equip:
-			itemType = getSelectedItemType(info);
-			controllers.itemController.equipItem(itemType, itemType.category.inventorySlot);
-			break;
-		case R.id.inv_menu_equip_offhand:
-			itemType = getSelectedItemType(info);
-			if (itemType.category.inventorySlot == Inventory.WearSlot.weapon) {
-				controllers.itemController.equipItem(itemType, Inventory.WearSlot.shield);
-			} else if (itemType.category.inventorySlot == Inventory.WearSlot.leftring) {
-				controllers.itemController.equipItem(itemType, Inventory.WearSlot.rightring);
-			}
-			break;
-		/*case R.id.inv_menu_unequip:
-			context.mapController.unequipItem(this, getSelectedItemType(info));
-			break;*/
-		case R.id.inv_menu_use:
-			controllers.itemController.useItem(getSelectedItemType(info));
-			break;
-		case R.id.inv_menu_assign:
-			lastSelectedItem = getSelectedItemType(info);
-			break;
-		case R.id.inv_assign_slot1:
-			controllers.itemController.setQuickItem(lastSelectedItem, 0);
-			break;
-		case R.id.inv_assign_slot2:
-			controllers.itemController.setQuickItem(lastSelectedItem, 1);
-			break;
-		case R.id.inv_assign_slot3:
-			controllers.itemController.setQuickItem(lastSelectedItem, 2);
-			break;
-		case R.id.inv_menu_movetop:
-			player.inventory.sortToTop(getSelectedItemType(info).id);
-			break;
-		case R.id.inv_menu_movebottom:
-			player.inventory.sortToBottom(getSelectedItemType(info).id);
-			break;
-		default:
-			return super.onContextItemSelected(item);
-		}
-		update();
-		return true;
-	}
-
-	private void showEquippedItemInfo(ItemType itemType, Inventory.WearSlot inventorySlot) {
-		String text;
-		boolean enabled = true;
-
-		if (world.model.uiSelections.isInCombat) {
-			int ap = world.model.player.getReequipCost();
-			text = getResources().getString(R.string.iteminfo_action_unequip_ap, ap);
-			if (ap > 0) {
-				enabled = world.model.player.hasAPs(ap);
-			}
-		} else {
-			text = getResources().getString(R.string.iteminfo_action_unequip);
-		}
-		Intent intent = Dialogs.getIntentForItemInfo(getActivity(), itemType.id, ItemInfoActivity.ItemInfoAction.unequip, text, enabled, inventorySlot);
-		startActivityForResult(intent, INTENTREQUEST_ITEMINFO);
-	}
-	private void showInventoryItemInfo(String itemTypeID) {
-		showInventoryItemInfo(world.itemTypes.getItemType(itemTypeID));
-	}
-	private void showInventoryItemInfo(ItemType itemType) {
-		String text = "";
-		int ap = 0;
-		boolean enabled = true;
-		ItemInfoActivity.ItemInfoAction action = ItemInfoActivity.ItemInfoAction.none;
-		final boolean isInCombat = world.model.uiSelections.isInCombat;
-		if (itemType.isEquippable()) {
-			if (isInCombat) {
-				ap = world.model.player.getReequipCost();
-				text = getResources().getString(R.string.iteminfo_action_equip_ap, ap);
-			} else {
-				text = getResources().getString(R.string.iteminfo_action_equip);
-			}
-			action = ItemInfoActivity.ItemInfoAction.equip;
-		} else if (itemType.isUsable()) {
-			if (isInCombat) {
-				ap = world.model.player.getUseItemCost();
-				text = getResources().getString(R.string.iteminfo_action_use_ap, ap);
-			} else {
-				text = getResources().getString(R.string.iteminfo_action_use);
-			}
-			action = ItemInfoActivity.ItemInfoAction.use;
-		}
-		if (isInCombat && ap > 0) {
-			enabled = world.model.player.hasAPs(ap);
-		}
-
-		Intent intent = Dialogs.getIntentForItemInfo(getActivity(), itemType.id, action, text, enabled, null);
-		startActivityForResult(intent, INTENTREQUEST_ITEMINFO);
-	}
-
-	private void reloadShownCategory(int v) { // Apologies about the code duplication,
-		// just didn't seem to make sense as an array, although I did create a nice array for skill category adapters.
-
-		// Decide which category to show
-		if (v == 0) { //All items
-			inventoryList.setAdapter(inventoryListAdapter);
-			inventoryListAdapter.notifyDataSetChanged();
-		} else if (v == 1) { //Weapon items
-			inventoryWeaponsListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildWeaponItems(), player, wornTiles);
-			inventoryList.setAdapter(inventoryWeaponsListAdapter);
-			inventoryWeaponsListAdapter.notifyDataSetChanged();
-		} else if (v == 2) { //Armor items
-			inventoryArmorListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildArmorItems(), player, wornTiles);
-			inventoryList.setAdapter(inventoryArmorListAdapter);
-			inventoryArmorListAdapter.notifyDataSetChanged();
-		} else if (v == 3) { //Usable items
-			inventoryUsableListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildUsableItems(), player, wornTiles);
-			inventoryList.setAdapter(inventoryUsableListAdapter);
-			inventoryUsableListAdapter.notifyDataSetChanged();
-		} else if (v == 4) { //Quest items
-			inventoryQuestListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildQuestItems(), player, wornTiles);
-			inventoryList.setAdapter(inventoryQuestListAdapter);
-			inventoryQuestListAdapter.notifyDataSetChanged();
-		} else if (v == 5) { //Other items
-			inventoryOtherListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildOtherItems(), player, wornTiles);
-			inventoryList.setAdapter(inventoryOtherListAdapter);
-			inventoryOtherListAdapter.notifyDataSetChanged();
-		}
-		//updateItemList();
-	}
-
-	private void reloadShownSort(Inventory inv) {
-		int selected = world.model.uiSelections.selectedInventorySort;
-
-		inventoryListAdapter.reloadShownSort(selected, world.model.uiSelections.oldSortSelection, player.inventory, player);
-
-		// Currently not functional, perhaps because selection only updates when changed.
-		if (world.model.uiSelections.oldSortSelection == selected)
-			world.model.uiSelections.oldSortSelection = 0;
-		else world.model.uiSelections.oldSortSelection = selected;
-		updateItemList();
-	}
-
-}
+package com.gpl.rpg.AndorsTrail.activity.fragment;
+
+import java.util.Arrays;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.view.CustomMenuInflater;
+import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
+
+public final class HeroinfoActivity_Inventory extends Fragment implements CustomMenuInflater.MenuItemSelectedListener {
+
+	private static final int INTENTREQUEST_ITEMINFO = 3;
+	private static final int INTENTREQUEST_BULKSELECT_DROP = 11;
+
+	private WorldContext world;
+	private ControllerContext controllers;
+	private TileCollection wornTiles;
+
+	private Player player;
+	private ListView inventoryList;
+	private ItemContainerAdapter inventoryListAdapter;
+	private ItemContainerAdapter inventoryWeaponsListAdapter;
+	private ItemContainerAdapter inventoryArmorListAdapter;
+	private ItemContainerAdapter inventoryUsableListAdapter;
+	private ItemContainerAdapter inventoryQuestListAdapter;
+	private ItemContainerAdapter inventoryOtherListAdapter;
+
+	private TextView heroinfo_stats_gold;
+	private TextView heroinfo_stats_attack;
+	private TextView heroinfo_stats_defense;
+
+	private ItemType lastSelectedItem; // Workaround android bug #7139
+
+	private final ImageView[] wornItemImage = new ImageView[Inventory.WearSlot.values().length];
+	private final int[] defaultWornItemImageResourceIDs = new int[Inventory.WearSlot.values().length];
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity());
+		if (!app.isInitialized()) return;
+		this.world = app.getWorld();
+		this.controllers = app.getControllerContext();
+		this.player = world.model.player;
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final View v = inflater.inflate(R.layout.heroinfo_inventory, container, false);
+
+		inventoryList = (ListView) v.findViewById(R.id.inventorylist_root);
+		ImageView heroicon = (ImageView) v.findViewById(R.id.heroinfo_inventory_heroicon);
+		heroinfo_stats_gold = (TextView) v.findViewById(R.id.heroinfo_stats_gold);
+		heroinfo_stats_attack = (TextView) v.findViewById(R.id.heroinfo_stats_attack);
+		heroinfo_stats_defense = (TextView) v.findViewById(R.id.heroinfo_stats_defense);
+
+		registerForContextMenu(inventoryList);
+		inventoryList.setOnItemClickListener(new OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+				// Move this code to separate function? -- Done
+				ItemType itemType = getSelectedItemType(position);
+				showInventoryItemInfo(itemType.id);
+			}
+		});
+		inventoryList.setOnItemLongClickListener(new OnItemLongClickListener() {
+			
+			@Override
+			public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+				showContextMenuForItem(getSelectedItemType(position));
+				return true;
+			}
+		});
+
+		new SpinnerEmulator(v, R.id.inventorylist_category_filters_button, R.array.inventorylist_category_filters, R.string.heroinfo_inventory_categories) {
+			@Override
+			public void setValue(int value) {
+				world.model.uiSelections.selectedInventoryCategory = value;
+			}
+			@Override
+			public void selectionChanged(int value) {
+				reloadShownCategory(value);
+			}
+			@Override
+			public int getValue() {
+				return world.model.uiSelections.selectedInventoryCategory;
+			}
+		};
+		new SpinnerEmulator(v, R.id.inventorylist_sort_filters_button, R.array.inventorylist_sort_filters, R.string.heroinfo_inventory_sort) {
+			@Override
+			public void setValue(int value) {
+				world.model.uiSelections.selectedInventorySort = value;
+			}
+			@Override
+			public void selectionChanged(int value) {
+				reloadShownSort(player.inventory);
+			}
+			@Override
+			public int getValue() {
+				return world.model.uiSelections.selectedInventorySort;
+			}
+		};
+		
+		ItemContainer inv = player.inventory;
+		wornTiles = world.tileManager.loadTilesFor(player.inventory, getResources());
+		inventoryListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, inv, player, wornTiles);
+		inventoryList.setAdapter(inventoryListAdapter);
+
+		
+		heroicon.setImageResource(HeroCollection.getHeroLargeSprite(player.iconID));
+
+		setWearSlot(v, Inventory.WearSlot.weapon, R.id.heroinfo_worn_weapon, R.drawable.equip_weapon);
+		setWearSlot(v, Inventory.WearSlot.shield, R.id.heroinfo_worn_shield, R.drawable.equip_shield);
+		setWearSlot(v, Inventory.WearSlot.head, R.id.heroinfo_worn_head, R.drawable.equip_head);
+		setWearSlot(v, Inventory.WearSlot.body, R.id.heroinfo_worn_body, R.drawable.equip_body);
+		setWearSlot(v, Inventory.WearSlot.feet, R.id.heroinfo_worn_feet, R.drawable.equip_feet);
+		setWearSlot(v, Inventory.WearSlot.neck, R.id.heroinfo_worn_neck, R.drawable.equip_neck);
+		setWearSlot(v, Inventory.WearSlot.hand, R.id.heroinfo_worn_hand, R.drawable.equip_hand);
+		setWearSlot(v, Inventory.WearSlot.leftring, R.id.heroinfo_worn_ringleft, R.drawable.equip_ring);
+		setWearSlot(v, Inventory.WearSlot.rightring, R.id.heroinfo_worn_ringright, R.drawable.equip_ring);
+
+		return v;
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		update();
+	}
+
+	private void setWearSlot(final View v, final Inventory.WearSlot inventorySlot, int viewId, int resourceId) {
+		final ImageView imageView = (ImageView) v.findViewById(viewId);
+		wornItemImage[inventorySlot.ordinal()] = imageView;
+		defaultWornItemImageResourceIDs[inventorySlot.ordinal()] = resourceId;
+		imageView.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (player.inventory.isEmptySlot(inventorySlot)) return;
+				imageView.setClickable(false); // Will be enabled again on update()
+				showEquippedItemInfo(player.inventory.getItemTypeInWearSlot(inventorySlot), inventorySlot);
+			}
+		});
+	}
+
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		switch (requestCode) {
+		case INTENTREQUEST_ITEMINFO:
+			if (resultCode == ItemInfoActivity.RESULT_MORE_ACTIONS) {
+				showContextMenuForItem( world.itemTypes.getItemType(data.getExtras().getString("itemTypeID")));
+				break;
+			}
+			if (resultCode != Activity.RESULT_OK) break;
+
+			ItemType itemType = world.itemTypes.getItemType(data.getExtras().getString("itemTypeID"));
+			ItemInfoActivity.ItemInfoAction actionType = ItemInfoActivity.ItemInfoAction.valueOf(data.getExtras().getString("actionType"));
+			if (actionType == ItemInfoActivity.ItemInfoAction.unequip) {
+				Inventory.WearSlot slot = Inventory.WearSlot.valueOf(data.getExtras().getString("inventorySlot"));
+				controllers.itemController.unequipSlot(itemType, slot);
+			} else if (actionType == ItemInfoActivity.ItemInfoAction.equip) {
+				Inventory.WearSlot slot = suggestInventorySlot(itemType);
+				controllers.itemController.equipItem(itemType, slot);
+			} else if (actionType == ItemInfoActivity.ItemInfoAction.use) {
+				controllers.itemController.useItem(itemType);
+			}
+			break;
+		case INTENTREQUEST_BULKSELECT_DROP:
+			if (resultCode != Activity.RESULT_OK) break;
+
+			int quantity = data.getExtras().getInt("selectedAmount");
+			String itemTypeID = data.getExtras().getString("itemTypeID");
+			dropItem(itemTypeID, quantity);
+			break;
+		}
+		update();
+	}
+
+	private Inventory.WearSlot suggestInventorySlot(ItemType itemType) {
+		Inventory.WearSlot slot = itemType.category.inventorySlot;
+		if (player.inventory.isEmptySlot(slot)) return slot;
+
+		if (slot == Inventory.WearSlot.leftring) return Inventory.WearSlot.rightring;
+		if (itemType.isOffhandCapableWeapon()) {
+			ItemType mainWeapon = player.inventory.getItemTypeInWearSlot(Inventory.WearSlot.weapon);
+			if (mainWeapon != null && mainWeapon.isTwohandWeapon()) return slot;
+			else if (player.inventory.isEmptySlot(Inventory.WearSlot.shield)) return Inventory.WearSlot.shield;
+		}
+		return slot;
+	}
+
+	private void dropItem(String itemTypeID, int quantity) {
+		ItemType itemType = world.itemTypes.getItemType(itemTypeID);
+		controllers.itemController.dropItem(itemType, quantity);
+	}
+
+	private void update() {
+		updateTraits();
+		updateWorn();
+		updateItemList();
+	}
+
+	private void updateTraits() {
+		heroinfo_stats_gold.setText(getResources().getString(R.string.heroinfo_gold, player.inventory.gold));
+
+		StringBuilder sb = new StringBuilder(10);
+		ItemController.describeAttackEffect(
+				player.getAttackChance(),
+				player.getDamagePotential().current,
+				player.getDamagePotential().max,
+				player.getCriticalSkill(),
+				player.getCriticalMultiplier(),
+				sb);
+		heroinfo_stats_attack.setText(sb.toString());
+
+		sb = new StringBuilder(10);
+		ItemController.describeBlockEffect(player.getBlockChance(), player.getDamageResistance(), sb);
+		heroinfo_stats_defense.setText(sb.toString());
+	}
+
+	private void updateWorn() {
+		for(Inventory.WearSlot slot : Inventory.WearSlot.values()) {
+			updateWornImage(wornItemImage[slot.ordinal()], defaultWornItemImageResourceIDs[slot.ordinal()], player.inventory.getItemTypeInWearSlot(slot));
+		}
+	}
+
+	private void updateWornImage(ImageView imageView, int resourceIDEmptyImage, ItemType type) {
+		if (type != null) {
+			world.tileManager.setImageViewTile(getResources(), imageView, type, wornTiles);
+		} else {
+			imageView.setImageResource(resourceIDEmptyImage);
+		}
+		imageView.setClickable(true);
+	}
+
+	private void updateItemList() {
+		int currentScreen = world.model.uiSelections.selectedInventoryCategory;
+		if (currentScreen == 0)
+			inventoryListAdapter.notifyDataSetChanged();
+		else
+			reloadShownCategory(world.model.uiSelections.selectedInventoryCategory);
+	}
+
+//	@Override
+//	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {}
+//		ItemType type = getSelectedItemType((AdapterContextMenuInfo) menuInfo);
+	
+	
+	public void showContextMenuForItem(ItemType type) {
+		MenuInflater inflater = getActivity().getMenuInflater();
+		Menu menu = CustomMenuInflater.newMenuInstance(getActivity());
+		inflater.inflate(R.menu.inventoryitem, menu);
+		if (type.isUsable()){
+			menu.findItem(R.id.inv_menu_use).setVisible(true);
+			menu.findItem(R.id.inv_menu_assign).setVisible(true);
+		}
+		if (type.isEquippable()) {
+			menu.findItem(R.id.inv_menu_equip).setVisible(true);
+			if (type.isOffhandCapableWeapon()) menu.findItem(R.id.inv_menu_equip_offhand).setVisible(true);
+			else if (type.category.inventorySlot == Inventory.WearSlot.leftring) menu.findItem(R.id.inv_menu_equip_offhand).setVisible(true);
+		}
+		lastSelectedItem = null;
+		CustomMenuInflater.showMenuInDialog(getActivity(), menu, world.tileManager.getDrawableForItem(getResources(), type.iconID, world.tileManager.loadTilesFor(Arrays.asList(new Integer[] { type.iconID}), getResources())), type.getName(player), type, this);
+	}
+
+	private ItemType getSelectedItemType(int position) {
+		int v = world.model.uiSelections.selectedInventoryCategory;
+
+		if (v == 0) { //All items
+			return inventoryListAdapter.getItem(position).itemType;
+		}else if (v == 1) { //Weapon items
+			return inventoryWeaponsListAdapter.getItem(position).itemType;
+		} else if (v == 2) { //Armor items
+			return inventoryArmorListAdapter.getItem(position).itemType;
+		} else if (v == 3) { //Usable items
+			return inventoryUsableListAdapter.getItem(position).itemType;
+		} else if (v == 4) { //Quest items
+			return inventoryQuestListAdapter.getItem(position).itemType;
+		} else if (v == 5) { //Other items
+			return inventoryOtherListAdapter.getItem(position).itemType;
+		}
+
+		// Better than crashing...
+		return inventoryListAdapter.getItem(position).itemType;
+
+	}
+
+
+	private ItemType getSelectedItemType(AdapterContextMenuInfo info) {
+		return getSelectedItemType(info.position);
+	}
+	
+	@Override
+	public void onMenuItemSelected(MenuItem item, Object data) {
+		ItemType itemType = (ItemType) data;
+		switch (item.getItemId()) {
+		case R.id.inv_menu_info:
+			showInventoryItemInfo(itemType);
+			//context.mapController.itemInfo(this, getSelectedItemType(info));
+			break;
+		case R.id.inv_menu_drop:
+			String itemTypeID = itemType.id;
+			int quantity = player.inventory.getItemQuantity(itemTypeID);
+			if (quantity > 1) {
+				Intent intent = Dialogs.getIntentForBulkDroppingInterface(getActivity(), itemTypeID, quantity);
+				startActivityForResult(intent, INTENTREQUEST_BULKSELECT_DROP);
+			} else {
+				dropItem(itemTypeID, quantity);
+			}
+			break;
+		case R.id.inv_menu_equip:
+			controllers.itemController.equipItem(itemType, itemType.category.inventorySlot);
+			break;
+		case R.id.inv_menu_equip_offhand:
+			if (itemType.category.inventorySlot == Inventory.WearSlot.weapon) {
+				controllers.itemController.equipItem(itemType, Inventory.WearSlot.shield);
+			} else if (itemType.category.inventorySlot == Inventory.WearSlot.leftring) {
+				controllers.itemController.equipItem(itemType, Inventory.WearSlot.rightring);
+			}
+			break;
+		/*case R.id.inv_menu_unequip:
+			context.mapController.unequipItem(this, getSelectedItemType(info));
+			break;*/
+		case R.id.inv_menu_use:
+			controllers.itemController.useItem(itemType);
+			break;
+		case R.id.inv_menu_assign:
+			//lastSelectedItem = itemType;
+			break;
+		case R.id.inv_assign_slot1:
+			controllers.itemController.setQuickItem(itemType, 0);
+			break;
+		case R.id.inv_assign_slot2:
+			controllers.itemController.setQuickItem(itemType, 1);
+			break;
+		case R.id.inv_assign_slot3:
+			controllers.itemController.setQuickItem(itemType, 2);
+			break;
+		case R.id.inv_menu_movetop:
+			player.inventory.sortToTop(itemType.id);
+			break;
+		case R.id.inv_menu_movebottom:
+			player.inventory.sortToBottom(itemType.id);
+			break;
+		}
+		update();
+	}
+
+	private void showEquippedItemInfo(ItemType itemType, Inventory.WearSlot inventorySlot) {
+		String text;
+		boolean enabled = true;
+
+		if (world.model.uiSelections.isInCombat) {
+			int ap = world.model.player.getReequipCost();
+			text = getResources().getString(R.string.iteminfo_action_unequip_ap, ap);
+			if (ap > 0) {
+				enabled = world.model.player.hasAPs(ap);
+			}
+		} else {
+			text = getResources().getString(R.string.iteminfo_action_unequip);
+		}
+		Intent intent = Dialogs.getIntentForItemInfo(getActivity(), itemType.id, ItemInfoActivity.ItemInfoAction.unequip, text, enabled, inventorySlot);
+		startActivityForResult(intent, INTENTREQUEST_ITEMINFO);
+	}
+	private void showInventoryItemInfo(String itemTypeID) {
+		showInventoryItemInfo(world.itemTypes.getItemType(itemTypeID));
+	}
+	private void showInventoryItemInfo(ItemType itemType) {
+		String text = "";
+		int ap = 0;
+		boolean enabled = true;
+		ItemInfoActivity.ItemInfoAction action = ItemInfoActivity.ItemInfoAction.none;
+		final boolean isInCombat = world.model.uiSelections.isInCombat;
+		if (itemType.isEquippable()) {
+			if (isInCombat) {
+				ap = world.model.player.getReequipCost();
+				text = getResources().getString(R.string.iteminfo_action_equip_ap, ap);
+			} else {
+				text = getResources().getString(R.string.iteminfo_action_equip);
+			}
+			action = ItemInfoActivity.ItemInfoAction.equip;
+		} else if (itemType.isUsable()) {
+			if (isInCombat) {
+				ap = world.model.player.getUseItemCost();
+				text = getResources().getString(R.string.iteminfo_action_use_ap, ap);
+			} else {
+				text = getResources().getString(R.string.iteminfo_action_use);
+			}
+			action = ItemInfoActivity.ItemInfoAction.use;
+		}
+		if (isInCombat && ap > 0) {
+			enabled = world.model.player.hasAPs(ap);
+		}
+
+		Intent intent = Dialogs.getIntentForItemInfo(getActivity(), itemType.id, action, text, enabled, null);
+		startActivityForResult(intent, INTENTREQUEST_ITEMINFO);
+	}
+
+	private void reloadShownCategory(int v) { // Apologies about the code duplication,
+		// just didn't seem to make sense as an array, although I did create a nice array for skill category adapters.
+
+		// Decide which category to show
+		if (v == 0) { //All items
+			inventoryList.setAdapter(inventoryListAdapter);
+			inventoryListAdapter.notifyDataSetChanged();
+		} else if (v == 1) { //Weapon items
+			inventoryWeaponsListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildWeaponItems(), player, wornTiles);
+			inventoryList.setAdapter(inventoryWeaponsListAdapter);
+			inventoryWeaponsListAdapter.notifyDataSetChanged();
+		} else if (v == 2) { //Armor items
+			inventoryArmorListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildArmorItems(), player, wornTiles);
+			inventoryList.setAdapter(inventoryArmorListAdapter);
+			inventoryArmorListAdapter.notifyDataSetChanged();
+		} else if (v == 3) { //Usable items
+			inventoryUsableListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildUsableItems(), player, wornTiles);
+			inventoryList.setAdapter(inventoryUsableListAdapter);
+			inventoryUsableListAdapter.notifyDataSetChanged();
+		} else if (v == 4) { //Quest items
+			inventoryQuestListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildQuestItems(), player, wornTiles);
+			inventoryList.setAdapter(inventoryQuestListAdapter);
+			inventoryQuestListAdapter.notifyDataSetChanged();
+		} else if (v == 5) { //Other items
+			inventoryOtherListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, player.inventory.buildOtherItems(), player, wornTiles);
+			inventoryList.setAdapter(inventoryOtherListAdapter);
+			inventoryOtherListAdapter.notifyDataSetChanged();
+		}
+		//updateItemList();
+	}
+
+	private void reloadShownSort(Inventory inv) {
+		int selected = world.model.uiSelections.selectedInventorySort;
+
+		inventoryListAdapter.reloadShownSort(selected, world.model.uiSelections.oldSortSelection, player.inventory, player);
+
+		// Currently not functional, perhaps because selection only updates when changed.
+		if (world.model.uiSelections.oldSortSelection == selected)
+			world.model.uiSelections.oldSortSelection = 0;
+		else world.model.uiSelections.oldSortSelection = selected;
+		updateItemList();
+	}
+
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
index ec17f6819..d51d19f72 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
@@ -1,5 +1,10 @@
 package com.gpl.rpg.AndorsTrail.activity.fragment;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,24 +12,25 @@ import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.*;
-import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ExpandableListView;
+import android.widget.SimpleExpandableListAdapter;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.model.quest.Quest;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 
 public final class HeroinfoActivity_Quests extends Fragment {
 
 	private WorldContext world;
-	private Spinner questlog_includecompleted;
+
+//	private Button includeCompletedButton;
+//	private Dialog includeCompletedDialog = null;
+//	private ListView questlog_includecompleted;
+	
 	private SimpleExpandableListAdapter questlog_contents_adapter;
 
 	private Player player;
@@ -48,22 +54,24 @@ public final class HeroinfoActivity_Quests extends Fragment {
 
 		Context ctx = getActivity();
 
-		questlog_includecompleted = (Spinner) v.findViewById(R.id.questlog_includecompleted);
-		ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(ctx, R.array.questlog_includecompleted, android.R.layout.simple_spinner_item);
-		adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		questlog_includecompleted.setAdapter(adapter);
-		questlog_includecompleted.setOnItemSelectedListener(new OnItemSelectedListener() {
+		
+		new SpinnerEmulator(v, R.id.questlog_includecompleted_button, R.array.questlog_includecompleted, R.string.questlog_includecompleted_prompt) {
 			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-				world.model.uiSelections.selectedQuestFilter = questlog_includecompleted.getSelectedItemPosition();
+			public void setValue(int value) {
+				world.model.uiSelections.selectedQuestFilter = value;
+			}
+			
+			@Override
+			public void selectionChanged(int value) {
 				reloadQuests();
 			}
-
+			
 			@Override
-			public void onNothingSelected(AdapterView<?> arg0) {}
-		});
-		questlog_includecompleted.setSelection(world.model.uiSelections.selectedQuestFilter);
-
+			public int getValue() {
+				return world.model.uiSelections.selectedQuestFilter;
+			}
+		};
+		
 		ExpandableListView questlog_contents = (ExpandableListView) v.findViewById(R.id.questlog_contents);
 		questlog_contents_adapter = new SimpleExpandableListAdapter(
 				ctx
@@ -110,7 +118,7 @@ public final class HeroinfoActivity_Quests extends Fragment {
 			if (player.hasAnyQuestProgress(q.questID)) {
 				boolean isCompleted = q.isCompleted(player);
 
-				int v = questlog_includecompleted.getSelectedItemPosition();
+				int v = world.model.uiSelections.selectedQuestFilter;
 				if (v == 0) { // Hide completed quests
 					if (isCompleted) continue;
 				} else if (v == 1) { // Include completed quests
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
index 3be757014..22bcf6918 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
@@ -1,5 +1,7 @@
 package com.gpl.rpg.AndorsTrail.activity.fragment;
 
+import java.util.ArrayList;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -9,10 +11,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
 import android.widget.ListView;
-import android.widget.Spinner;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
@@ -21,8 +22,7 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.view.SkillListAdapter;
-
-import java.util.ArrayList;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 public final class HeroinfoActivity_Skills extends Fragment {
 
 	private static final int INTENTREQUEST_SKILLINFO = 12;
@@ -31,11 +31,9 @@ public final class HeroinfoActivity_Skills extends Fragment {
 	private ControllerContext controllers;
 	private Player player;
 
+	private TextView listskills_number_of_increases;
 	ListView skillList;
 	private ArrayList<SkillListAdapter> skillListCategoryViewsAdapters = new ArrayList<SkillListAdapter>();
-	private Spinner skillList_categories;
-	private Spinner skillList_sort;
-	private TextView listskills_number_of_increases;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -53,24 +51,35 @@ public final class HeroinfoActivity_Skills extends Fragment {
 
 		final Activity ctx = getActivity();
 
-		//Initiating drop-down list for category filters
-		skillList_categories = (Spinner) v.findViewById(R.id.skillList_category_filters);
-		ArrayAdapter<CharSequence> skillCategoryFilterAdapter = ArrayAdapter.createFromResource(getActivity(), R.array.skill_category_filters, android.R.layout.simple_spinner_item);
-		skillCategoryFilterAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		skillList_categories.setAdapter(skillCategoryFilterAdapter);
-		skillList_categories.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+		new SpinnerEmulator(v,R.id.skillList_category_filters_button, R.array.skill_category_filters, R.string.heroinfo_skill_categories) {
 			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-				world.model.uiSelections.selectedSkillCategory = skillList_categories.getSelectedItemPosition();
+			public void setValue(int value) {
+				world.model.uiSelections.selectedSkillCategory = value;
+			}
+			@Override
+			public void selectionChanged(int value) {
 				reloadShownCategory();
 			}
-
 			@Override
-			public void onNothingSelected(AdapterView<?> arg0) {
-				world.model.uiSelections.selectedSkillCategory = 0;
+			public int getValue() {
+				return world.model.uiSelections.selectedSkillCategory;
 			}
-		});
-		skillList_categories.setSelection(world.model.uiSelections.selectedSkillCategory);
+		};
+		new SpinnerEmulator(v,R.id.skillList_sort_filters_button, R.array.skill_sort_filters, R.string.heroinfo_skill_sort) {
+			@Override
+			public void setValue(int value) {
+				world.model.uiSelections.selectedSkillSort = value;
+			}
+			@Override
+			public void selectionChanged(int value) {
+				reloadShownSort();
+			}
+			@Override
+			public int getValue() {
+				return world.model.uiSelections.selectedSkillSort;
+			}
+		};
+		
 
 		for(int i = 0; i< SkillCollection.SkillCategory.values().length; i++){
 			// Creates a list of adapters for each category.
@@ -79,28 +88,7 @@ public final class HeroinfoActivity_Skills extends Fragment {
 			skillListCategoryViewsAdapters.add(
 					new SkillListAdapter(ctx, world.skills.getAllSkills(), player, i));
 		}
-
-
-		//Initiating drop-down list for sort filters
-		skillList_sort = (Spinner) v.findViewById(R.id.skillList_sort_filters);
-		ArrayAdapter<CharSequence> skillSortFilterAdapter = ArrayAdapter.createFromResource(getActivity(), R.array.skill_sort_filters, android.R.layout.simple_spinner_item);
-		skillSortFilterAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		skillList_sort.setAdapter(skillSortFilterAdapter);
-		skillList_sort.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-				world.model.uiSelections.selectedSkillSort = skillList_sort.getSelectedItemPosition();
-				reloadShownSort(); //Yet to be implemented
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> arg0) {
-				world.model.uiSelections.selectedSkillSort = 0;
-			}
-		});
-		skillList_sort.setSelection(world.model.uiSelections.selectedSkillSort);
-
-
+		
 		skillList = (ListView) v.findViewById(R.id.heroinfo_listskills_list);
 		skillList.setAdapter(getCurrentCategoryAdapter());
 		skillList.setOnItemClickListener(new OnItemClickListener() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
index ffc1dec2c..088b28e6c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
@@ -1,5 +1,7 @@
 package com.gpl.rpg.AndorsTrail.activity.fragment;
 
+import java.util.ArrayList;
+
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -17,6 +19,7 @@ import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.model.item.Inventory;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
@@ -26,8 +29,6 @@ import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
 import com.gpl.rpg.AndorsTrail.view.RangeBar;
 import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
 
-import java.util.ArrayList;
-
 public final class HeroinfoActivity_Stats extends Fragment {
 
 	private static final int INTENTREQUEST_LEVELUP = 6;
@@ -37,7 +38,6 @@ public final class HeroinfoActivity_Stats extends Fragment {
 
 	private View view;
 	private Button levelUpButton;
-	private TextView heroinfo_ap;
 	private TextView heroinfo_reequip_cost;
 	private TextView heroinfo_useitem_cost;
 	private TextView heroinfo_level;
@@ -48,6 +48,7 @@ public final class HeroinfoActivity_Stats extends Fragment {
 	private TextView heroinfo_base_useitem_cost;
 	private RangeBar rangebar_hp;
 	private RangeBar rangebar_exp;
+	private RangeBar rangebar_ap;
 	private ItemEffectsView actorinfo_onhiteffects;
 	private TableLayout heroinfo_basestats_table;
 	private ViewGroup heroinfo_container;
@@ -68,10 +69,9 @@ public final class HeroinfoActivity_Stats extends Fragment {
 
 		TextView tv = (TextView) v.findViewById(R.id.heroinfo_title);
 		tv.setText(player.getName());
-		world.tileManager.setImageViewTile(getResources(), tv, player);
+		tv.setCompoundDrawablesWithIntrinsicBounds(HeroCollection.getHeroLargeSprite(player.iconID), 0, 0, 0);
 
 		heroinfo_container = (ViewGroup) v.findViewById(R.id.heroinfo_container);
-		heroinfo_ap = (TextView) v.findViewById(R.id.heroinfo_ap);
 		heroinfo_reequip_cost = (TextView) v.findViewById(R.id.heroinfo_reequip_cost);
 		heroinfo_useitem_cost = (TextView) v.findViewById(R.id.heroinfo_useitem_cost);
 		basetraitsinfo_max_hp = (TextView) v.findViewById(R.id.basetraitsinfo_max_hp);
@@ -84,9 +84,14 @@ public final class HeroinfoActivity_Stats extends Fragment {
 		heroinfo_basestats_table = (TableLayout) v.findViewById(R.id.heroinfo_basestats_table);
 
 		rangebar_hp = (RangeBar) v.findViewById(R.id.heroinfo_healthbar);
-		rangebar_hp.init(R.drawable.ui_progress_health, R.string.status_hp);
+		rangebar_hp.init(R.drawable.ui_progress_health, R.string.heroinfo_healthpoints);
+		rangebar_hp.setLargeLabel(true);
 		rangebar_exp = (RangeBar) v.findViewById(R.id.heroinfo_expbar);
-		rangebar_exp.init(R.drawable.ui_progress_exp, R.string.status_exp);
+		rangebar_exp.init(R.drawable.ui_progress_exp, R.string.heroinfo_experiencepoints);
+		rangebar_exp.setLargeLabel(true);
+		rangebar_ap = (RangeBar) v.findViewById(R.id.heroinfo_apbar);
+		rangebar_ap.init(R.drawable.ui_progress_ap, R.string.heroinfo_actionpoints);
+		rangebar_ap.setLargeLabel(true);
 
 		levelUpButton = (Button) v.findViewById(R.id.heroinfo_levelup);
 		levelUpButton.setOnClickListener(new OnClickListener() {
@@ -131,7 +136,7 @@ public final class HeroinfoActivity_Stats extends Fragment {
 
 		heroinfo_level.setText(Integer.toString(player.getLevel()));
 		heroinfo_totalexperience.setText(Integer.toString(player.getTotalExperience()));
-		heroinfo_ap.setText(player.getMaxAP() + "/" + player.getCurrentAP());
+//		heroinfo_ap.update(player.getMaxAP() + "/" + player.getCurrentAP());
 		heroinfo_reequip_cost.setText(Integer.toString(player.getReequipCost()));
 		heroinfo_useitem_cost.setText(Integer.toString(player.getUseItemCost()));
 		basetraitsinfo_max_hp.setText(Integer.toString(player.baseTraits.maxHP));
@@ -140,6 +145,7 @@ public final class HeroinfoActivity_Stats extends Fragment {
 		heroinfo_base_useitem_cost.setText(Integer.toString(player.baseTraits.useItemCost));
 		rangebar_hp.update(player.getMaxHP(), player.getCurrentHP());
 		rangebar_exp.update(player.getMaxLevelExperience(), player.getCurrentLevelExperience());
+		rangebar_ap.update(player.getMaxAP(), player.getCurrentAP());
 
 		TraitsInfoView.update(heroinfo_container, player);
 		TraitsInfoView.updateTraitsTable(
@@ -167,6 +173,7 @@ public final class HeroinfoActivity_Stats extends Fragment {
 		}
 		if (effects_hit.isEmpty()) effects_hit = null;
 		if (effects_kill.isEmpty()) effects_kill = null;
+		if (effects_hitReceived.isEmpty()) effects_hitReceived = null;
 		actorinfo_onhiteffects.update(null, null, effects_hit, effects_kill, effects_hitReceived, null, false);
 
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
index 1aa5476f3..68d86faa5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
@@ -1,130 +1,131 @@
-package com.gpl.rpg.AndorsTrail.activity.fragment;
-
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.Dialogs;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
-
-import java.util.HashSet;
-
-public abstract class ShopActivityFragment extends Fragment implements OnContainerItemClickedListener {
-
-	protected static final int INTENTREQUEST_ITEMINFO = 3;
-	protected static final int INTENTREQUEST_BULKSELECT = 9;
-
-	protected WorldContext world;
-	protected Player player;
-
-	protected ItemContainer shopInventory;
-	private TextView shop_gc;
-	private ShopItemContainerAdapter listAdapter;
-	private Spinner shoplist_sort;
-
-	protected abstract boolean isSellingInterface();
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
-		if (!app.isInitialized()) return;
-		this.world = app.getWorld();
-		this.player = world.model.player;
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.shoplist, container, false);
-
-		final Monster npc = Dialogs.getMonsterFromIntent(getActivity().getIntent(), world);
-
-		final Resources res = getResources();
-
-		shop_gc = (TextView) v.findViewById(R.id.shop_gc);
-
-		ListView shoplist = (ListView) v.findViewById(R.id.shop_list);
-
-		shopInventory = npc.getShopItems(player);
-
-		HashSet<Integer> iconIDs = world.tileManager.getTileIDsFor(shopInventory);
-		iconIDs.addAll(world.tileManager.getTileIDsFor(player.inventory));
-		TileCollection tiles = world.tileManager.loadTilesFor(iconIDs, res);
-		final boolean isSelling = isSellingInterface();
-		listAdapter = new ShopItemContainerAdapter(getActivity(), tiles, world.tileManager, player, isSelling ? player.inventory : shopInventory, this, isSelling);
-		shoplist.setAdapter(listAdapter);
-
-		//Initiating drop-down list for category filters
-		shoplist_sort = (Spinner) v.findViewById(R.id.shoplist_sort_filters);
-		ArrayAdapter<CharSequence> sortFilterAdapter = ArrayAdapter.createFromResource(getActivity(), R.array.shoplist_sort_filters, android.R.layout.simple_spinner_item);
-		sortFilterAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		shoplist_sort.setAdapter(sortFilterAdapter);
-		shoplist_sort.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-				world.model.uiSelections.selectedShopSort = shoplist_sort.getSelectedItemPosition();
-				reloadShownSort(isSelling ? player.inventory : shopInventory);
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> arg0) {
-				world.model.uiSelections.selectedShopSort = 0;
-			}
-		});
-		shoplist_sort.setSelection(world.model.uiSelections.selectedShopSort);
-
-		return v;
-	}
-
-	private void reloadShownSort(ItemContainer itemContainer) {
-		listAdapter.reloadShownSort(world.model.uiSelections.selectedShopSort, itemContainer, player);
-		listAdapter.notifyDataSetChanged();
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		update();
-	}
-
-	private Toast lastToast = null;
-	protected void displayStoreAction(final String msg) {
-		if (lastToast != null) {
-			lastToast.setText(msg);
-		} else {
-			lastToast = Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT);
-		}
-		lastToast.show();
-		update();
-	}
-
-	@Override
-	public void onPause() {
-		super.onPause();
-		lastToast = null;
-	}
-
-	protected void update() {
-		listAdapter.notifyDataSetChanged();
-		String gc = getResources().getString(R.string.shop_yourgold, player.getGold());
-		shop_gc.setText(gc);
-	}
-}
+package com.gpl.rpg.AndorsTrail.activity.fragment;
+
+import java.util.HashSet;
+
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
+
+public abstract class ShopActivityFragment extends Fragment implements OnContainerItemClickedListener {
+
+	protected static final int INTENTREQUEST_ITEMINFO = 3;
+	protected static final int INTENTREQUEST_BULKSELECT = 9;
+
+	protected WorldContext world;
+	protected Player player;
+
+	protected ItemContainer shopInventory;
+	private TextView shop_gc;
+	private ShopItemContainerAdapter listAdapter;
+	private Button shoplist_sort;
+
+	protected abstract boolean isSellingInterface();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
+		if (!app.isInitialized()) return;
+		this.world = app.getWorld();
+		this.player = world.model.player;
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View v = inflater.inflate(R.layout.shoplist, container, false);
+
+		final Monster npc = Dialogs.getMonsterFromIntent(getActivity().getIntent(), world);
+
+		final Resources res = getResources();
+
+		shop_gc = (TextView) v.findViewById(R.id.shop_gc);
+
+		ListView shoplist = (ListView) v.findViewById(R.id.shop_list);
+
+		shopInventory = npc.getShopItems(player);
+
+		HashSet<Integer> iconIDs = world.tileManager.getTileIDsFor(shopInventory);
+		iconIDs.addAll(world.tileManager.getTileIDsFor(player.inventory));
+		TileCollection tiles = world.tileManager.loadTilesFor(iconIDs, res);
+		final boolean isSelling = isSellingInterface();
+		listAdapter = new ShopItemContainerAdapter(getActivity(), tiles, world.tileManager, player, isSelling ? player.inventory : shopInventory, this, isSelling);
+		shoplist.setAdapter(listAdapter);
+
+		//Initiating drop-down list for category filters
+		shoplist_sort = (Button) v.findViewById(R.id.shoplist_sort_filters);
+		new SpinnerEmulator(v, R.id.shoplist_sort_filters, R.array.shoplist_sort_filters, R.string.shop_item_sort) {
+			@Override
+			public void setValue(int value) {
+				world.model.uiSelections.selectedShopSort = value;
+			}
+			@Override
+			public void selectionChanged(int value) {
+				reloadShownSort(isSelling ? player.inventory : shopInventory);
+			}
+			@Override
+			public int getValue() {
+				return world.model.uiSelections.selectedShopSort;
+			}
+		};
+		
+
+		return v;
+	}
+
+	private void reloadShownSort(ItemContainer itemContainer) {
+		listAdapter.reloadShownSort(world.model.uiSelections.selectedShopSort, itemContainer, player);
+		listAdapter.notifyDataSetChanged();
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		update();
+	}
+
+	private Toast lastToast = null;
+	protected void displayStoreAction(final String msg) {
+		if (lastToast != null) {
+			lastToast.setText(msg);
+		} else {
+			lastToast = Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT);
+		}
+		lastToast.show();
+		update();
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		lastToast = null;
+	}
+
+	protected void update() {
+		listAdapter.notifyDataSetChanged();
+		String gc = getResources().getString(R.string.shop_yourgold, player.getGold());
+		shop_gc.setText(gc);
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
index 6725f2bdb..6c2702e45 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
@@ -2,6 +2,7 @@ package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
+
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
index 0397376e2..7760ab675 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
@@ -2,6 +2,7 @@ package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
+
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
new file mode 100644
index 000000000..56bfeeadf
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
@@ -0,0 +1,289 @@
+package com.gpl.rpg.AndorsTrail.activity.fragment;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.activity.AboutActivity;
+import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
+import com.gpl.rpg.AndorsTrail.activity.Preferences;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
+
+public class StartScreenActivity_MainMenu extends Fragment {
+
+	private static final int INTENTREQUEST_PREFERENCES = 7;
+	public static final int INTENTREQUEST_LOADGAME = 9;
+
+	private boolean hasExistingGame = false;
+	private Button startscreen_continue;
+	private Button startscreen_newgame;
+	private Button startscreen_load;
+	private ViewGroup save_preview_holder;
+	private ImageView save_preview_hero_icon;
+	private TextView save_preview_hero_desc;
+	
+	
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		updatePreferences(false);
+		super.onCreateView(inflater, container, savedInstanceState);
+
+
+		if (container != null) {
+			container.removeAllViews();
+		}
+		
+		View root = inflater.inflate(R.layout.startscreen_mainmenu, container, false);
+		
+		save_preview_holder = (ViewGroup) root.findViewById(R.id.save_preview_holder);
+		save_preview_hero_icon = (ImageView) root.findViewById(R.id.save_preview_hero_icon);
+		save_preview_hero_desc = (TextView) root.findViewById(R.id.save_preview_hero_desc);
+		
+
+		startscreen_continue = (Button) root.findViewById(R.id.startscreen_continue);
+		startscreen_continue.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				continueGame(false, Savegames.SLOT_QUICKSAVE, null);
+			}
+		});
+
+		startscreen_newgame = (Button) root.findViewById(R.id.startscreen_newgame);
+		startscreen_newgame.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				if (hasExistingGame) {
+					comfirmNewGame();
+				} else {
+					createNewGame();
+				}
+			}
+		});
+
+		Button b = (Button) root.findViewById(R.id.startscreen_about);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				startActivity(new Intent(getActivity(), AboutActivity.class));
+			}
+		});
+
+		b = (Button) root.findViewById(R.id.startscreen_preferences);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				Intent intent = new Intent(getActivity(), Preferences.class);
+				StartScreenActivity_MainMenu.this.startActivityForResult(intent, INTENTREQUEST_PREFERENCES);
+			}
+		});
+
+		startscreen_load = (Button) root.findViewById(R.id.startscreen_load);
+		startscreen_load.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				Dialogs.showLoad(StartScreenActivity_MainMenu.this);
+			}
+		});
+		
+
+		if (AndorsTrailApplication.DEVELOPMENT_FORCE_STARTNEWGAME) {
+			if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
+				continueGame(true, 0, "Debug player");
+			} else {
+				continueGame(true, 0, "Player");
+			}
+		} else if (AndorsTrailApplication.DEVELOPMENT_FORCE_CONTINUEGAME) {
+			continueGame(false, Savegames.SLOT_QUICKSAVE, null);
+		}
+		
+		return root;
+	}
+	
+	@Override
+	public void onResume() {
+		// TODO Auto-generated method stub
+		super.onResume();
+		
+		String playerName;
+		String displayInfo = null;
+		int iconID = TileManager.CHAR_HERO;
+
+		FileHeader header = Savegames.quickload(getActivity(), Savegames.SLOT_QUICKSAVE);
+		if (header != null && header.playerName != null) {
+			playerName = header.playerName;
+			displayInfo = header.displayInfo;
+			iconID = header.iconID;
+		} else {
+			// Before fileversion 14 (v0.6.7), quicksave was stored in Shared preferences
+			SharedPreferences p = getActivity().getSharedPreferences("quicksave", Activity.MODE_PRIVATE);
+			playerName = p.getString("playername", null);
+			if (playerName != null) {
+				displayInfo = "level " + p.getInt("level", -1);
+			}
+		}
+		hasExistingGame = (playerName != null);
+		setButtonState(playerName, displayInfo, iconID);
+
+		if (isNewVersion()) {
+			Dialogs.showNewVersion(getActivity());
+		}
+
+		boolean hasSavegames = !Savegames.getUsedSavegameSlots().isEmpty();
+		startscreen_load.setEnabled(hasSavegames);
+	}
+	
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+		listener = (OnNewGameRequestedListener) activity;
+	}
+	
+	@Override
+	public void onDetach() {
+		super.onDetach();
+		listener = null;
+	}
+	
+	private void setButtonState(final String playerName, final String displayInfo, int iconID) {
+		startscreen_continue.setEnabled(hasExistingGame);
+		startscreen_newgame.setEnabled(true);
+		if (hasExistingGame) {
+			TileManager tm = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorld().tileManager;
+			tm.setImageViewTileForPlayer(getResources(), save_preview_hero_icon, iconID);
+			save_preview_hero_desc.setText(playerName + ", " + displayInfo);
+			save_preview_holder.setVisibility(View.VISIBLE);
+		} else {
+			save_preview_holder.setVisibility(View.GONE);
+		}
+	}
+
+	private void continueGame(boolean createNewCharacter, int loadFromSlot, String name) {
+		final WorldSetup setup = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorldSetup();
+		setup.createNewCharacter = createNewCharacter;
+		setup.loadFromSlot = loadFromSlot;
+		setup.newHeroName = name;
+		startActivity(new Intent(getActivity(), LoadingActivity.class));
+	}
+
+	private void comfirmNewGame() {
+//		new AlertDialog.Builder(new ContextThemeWrapper(getActivity(), R.style.AndorsTrailStyle_Dialog))
+//		.setTitle(R.string.startscreen_newgame)
+//		.setMessage(R.string.startscreen_newgame_confirm)
+//		.setIcon(android.R.drawable.ic_delete)
+//		.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+//			@Override
+//			public void onClick(DialogInterface dialog, int which) {
+//				//continueGame(true);
+////				hasExistingGame = false;
+////				setButtonState(null, null, 0);
+//				createNewGame();
+//			}
+//		})
+//		.setNegativeButton(android.R.string.cancel, null)
+//		.create().show();
+//		
+//		
+		final Dialog d = CustomDialogFactory.createDialog(getActivity(),
+				getString(R.string.startscreen_newgame), 
+				getResources().getDrawable(android.R.drawable.ic_delete), 
+				getResources().getString(R.string.startscreen_newgame_confirm),
+				null,
+				true);
+		CustomDialogFactory.addButton(d, android.R.string.ok, new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				createNewGame();
+			}
+		});
+		CustomDialogFactory.addDismissButton(d, android.R.string.cancel);
+		
+		CustomDialogFactory.show(d);
+		
+	}
+	
+	private boolean isNewVersion() {
+		final String v = "lastversion";
+		SharedPreferences s = getActivity().getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, Activity.MODE_PRIVATE);
+		int lastversion = s.getInt(v, 0);
+		if (lastversion >= AndorsTrailApplication.CURRENT_VERSION) return false;
+		Editor e = s.edit();
+		e.putInt(v, AndorsTrailApplication.CURRENT_VERSION);
+		e.commit();
+		return true;
+	}
+	
+
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		switch (requestCode) {
+		case INTENTREQUEST_LOADGAME:
+			if (resultCode != Activity.RESULT_OK) break;
+			final int slot = data.getIntExtra("slot", 1);
+			continueGame(false, slot, null);
+			break;
+		case INTENTREQUEST_PREFERENCES:
+			updatePreferences(true);
+			break;
+		}
+	}
+	
+	private void updatePreferences(boolean alreadyStartedLoadingResources) {
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
+		AndorsTrailPreferences preferences = app.getPreferences();
+		preferences.read(getActivity());
+		if (app.setLocale(getActivity())) {
+			if (alreadyStartedLoadingResources) {
+				// Changing the locale after having loaded the game requires resources to
+				// be re-loaded. Therefore, we just exit here.
+				Toast.makeText(getActivity(), R.string.change_locale_requires_restart, Toast.LENGTH_LONG).show();
+				getActivity().finish();
+				return;
+			}
+		} 
+		if (ThemeHelper.changeTheme(preferences.selectedTheme)) {
+			// Changing the theme requires a restart to re-create all activities.
+			Toast.makeText(getActivity(), R.string.change_theme_requires_restart, Toast.LENGTH_LONG).show();
+			getActivity().finish();
+			return;
+		}
+		app.getWorld().tileManager.updatePreferences(preferences);
+	}
+
+	
+	public interface OnNewGameRequestedListener {
+		public void onNewGameRequested();
+	}
+	
+	private OnNewGameRequestedListener listener = null;
+	
+	private void createNewGame() {
+		if (listener != null) {
+			listener.onNewGameRequested();
+		}
+	}
+	
+
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java
new file mode 100644
index 000000000..e01aa06d1
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java
@@ -0,0 +1,143 @@
+package com.gpl.rpg.AndorsTrail.activity.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.RadioGroup;
+import android.widget.RadioGroup.OnCheckedChangeListener;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ToggleButton;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+
+public class StartScreenActivity_NewGame extends Fragment {
+
+	private TextView startscreen_enterheroname;
+	
+	private int selectedIconID = TileManager.CHAR_HERO;
+	
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		super.onCreateView(inflater, container, savedInstanceState);
+
+		if (container != null) {
+			container.removeAllViews();
+		}
+		
+		View root = inflater.inflate(R.layout.startscreen_newgame, container, false);
+		
+		
+		startscreen_enterheroname = (TextView) root.findViewById(R.id.startscreen_enterheroname);
+		
+		final RadioGroup group = (RadioGroup) root.findViewById(R.id.newgame_spritegroup);
+		group.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+			
+			@Override
+			public void onCheckedChanged(RadioGroup group, int checkedId) {
+				for (int i = 0; i < group.getChildCount(); i++) {
+					ToggleButton tb = ((ToggleButton)group.getChildAt(i));
+					tb.setChecked(tb.getId() == checkedId);
+				}
+				switch (checkedId) {
+				case R.id.newgame_sprite0:
+					selectedIconID = TileManager.CHAR_HERO_0;
+					break;
+				case R.id.newgame_sprite1:
+					selectedIconID = TileManager.CHAR_HERO_1;
+					break;
+				case R.id.newgame_sprite2:
+					selectedIconID = TileManager.CHAR_HERO_2;
+					break;
+				}
+			}
+		});
+		
+		OnClickListener l = new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				group.check(v.getId());
+			}
+		};
+		
+		for (int i = 0; i < group.getChildCount(); i++) {
+			ToggleButton tb = ((ToggleButton)group.getChildAt(i));
+			tb.setOnClickListener(l);
+		}
+		
+		Button b = (Button) root.findViewById(R.id.startscreen_newgame_start);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				createNewGame();
+			}
+		});
+		
+		b = (Button) root.findViewById(R.id.startscreen_newgame_cancel);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				gameCreationOver();
+			}
+		});
+		
+		return root;
+	}
+	
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+		listener = (GameCreationOverListener) activity;
+	}
+	
+	@Override
+	public void onDetach() {
+		super.onDetach();
+		listener = null;
+	}
+	
+	
+	private void continueGame(boolean createNewCharacter, int loadFromSlot, String name) {
+		final WorldSetup setup = AndorsTrailApplication.getApplicationFromActivity(getActivity()).getWorldSetup();
+		setup.createNewCharacter = createNewCharacter;
+		setup.loadFromSlot = loadFromSlot;
+		setup.newHeroName = name;
+		setup.newHeroIcon = selectedIconID;
+		gameCreationOver();
+		startActivity(new Intent(getActivity(), LoadingActivity.class));
+	}
+
+	private void createNewGame() {
+		String name = startscreen_enterheroname.getText().toString().trim();
+		if (name == null || name.length() <= 0) {
+			Toast.makeText(getActivity(), R.string.startscreen_enterheroname, Toast.LENGTH_SHORT).show();
+			return;
+		}
+		continueGame(true, 0, name);
+	}
+	
+	public interface GameCreationOverListener {
+		public void onGameCreationCancelled();
+	}
+	
+	private GameCreationOverListener listener = null;
+	
+	private void gameCreationOver() {
+		if (listener != null) {
+			listener.onGameCreationCancelled();
+		}
+	}
+	
+	
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
index 4a3bc50b9..cb09e8a77 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
@@ -1,11 +1,23 @@
 package com.gpl.rpg.AndorsTrail.context;
 
+import java.lang.ref.WeakReference;
+
 import android.content.res.Resources;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail.controller.*;
-
-import java.lang.ref.WeakReference;
+import com.gpl.rpg.AndorsTrail.controller.ActorStatsController;
+import com.gpl.rpg.AndorsTrail.controller.CombatController;
+import com.gpl.rpg.AndorsTrail.controller.ConversationController;
+import com.gpl.rpg.AndorsTrail.controller.GameRoundController;
+import com.gpl.rpg.AndorsTrail.controller.InputController;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.controller.MapController;
+import com.gpl.rpg.AndorsTrail.controller.MonsterMovementController;
+import com.gpl.rpg.AndorsTrail.controller.MonsterSpawningController;
+import com.gpl.rpg.AndorsTrail.controller.MovementController;
+import com.gpl.rpg.AndorsTrail.controller.SkillController;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController;
 
 public final class ControllerContext {
 	//Controllers
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index de6e01757..5f6807781 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -84,7 +84,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	}
 	public void setCombatSelection(Monster selectedMonster, Coord selectedPosition) {
 		if (selectedMonster != null) {
-			if (!selectedMonster.isAgressive()) return;
+			if (!selectedMonster.isAgressive(world.model.player)) return;
 		}
 		Coord previousSelection = world.model.uiSelections.selectedPosition;
 		if (previousSelection != null) {
@@ -321,12 +321,12 @@ public final class CombatController implements VisualEffectCompletedCallback {
 
 		for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) {
 			for (Monster m : a.monsters) {
-				if (!m.isAgressive()) continue;
+				if (!m.isAgressive(world.model.player)) continue;
 
 				if (shouldAttackWithMonsterInCombat(m, playerPosition)) {
 					currentActiveMonster = m;
 					return MonsterAction.attack;
-				} else if (shouldMoveMonsterInCombat(m, a, playerPosition)) {
+				} else if (shouldMoveMonsterInCombat(m, a, world.model.player, playerPosition)) {
 					currentActiveMonster = m;
 					return MonsterAction.move;
 				}
@@ -340,13 +340,13 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		if (!m.rectPosition.isAdjacentTo(playerPosition)) return false;
 		return true;
 	}
-	private static boolean shouldMoveMonsterInCombat(Monster m, MonsterSpawnArea a, Coord playerPosition) {
+	private static boolean shouldMoveMonsterInCombat(Monster m, MonsterSpawnArea a, Player p, Coord playerPosition) {
 		final MonsterType.AggressionType movementAggressionType = m.getMovementAggressionType();
 		if (movementAggressionType == MonsterType.AggressionType.none) return false;
 
 		if (!m.hasAPs(m.getMoveCost())) return false;
 		if (m.position.isAdjacentTo(playerPosition)) return false;
-		if (!m.isAgressive()) return false;
+		if (!m.isAgressive(p)) return false;
 
 		if (movementAggressionType == MonsterType.AggressionType.protectSpawn) {
 			if (a.area.contains(playerPosition)) return true;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
index cdc03d491..cf214f2c4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import java.util.Random;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.Range;
 
-import java.util.Random;
-
 public final class Constants {
 	public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;
 	public static final int LEVELUP_EFFECT_HEALTH = 5;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
index c97cbec6b..02a3f3431 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
@@ -4,6 +4,7 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
+
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.util.Coord;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
index 9674ee83c..8b716241c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
@@ -1,5 +1,8 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -8,11 +11,13 @@ import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
 import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.item.*;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
 import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
-
-import java.util.ArrayList;
-import java.util.Collection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
 
 public final class ItemController {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
index 4491c199c..2ddeb1a09 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
@@ -1,6 +1,9 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import java.util.List;
+
 import android.content.res.Resources;
+
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.listeners.MapLayoutListeners;
@@ -16,8 +19,6 @@ import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.map.ReplaceableMapSection;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
-import java.util.List;
-
 public final class MapController {
 
 	private final ControllerContext controllers;
@@ -107,7 +108,7 @@ public final class MapController {
 	}
 
 	public void steppedOnMonster(Monster m, Coord p) {
-		if (m.isAgressive()) {
+		if (m.isAgressive(world.model.player)) {
 			controllers.combatController.setCombatSelection(m, p);
 			if (controllers.preferences.confirmAttack) {
 				worldEventListeners.onPlayerSteppedOnMonster(m);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
index 117c5e188..673dd09bd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
@@ -39,7 +39,7 @@ public final class MonsterMovementController implements EvaluateWalkable {
 	public void attackWithAgressiveMonsters() {
 		for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) {
 			for (Monster m : a.monsters) {
-				if (!m.isAgressive()) continue;
+				if (!m.isAgressive(world.model.player)) continue;
 				if (!m.isAdjacentTo(world.model.player)) continue;
 
 				int aggressionChanceBias = world.model.player.getSkillLevel(SkillCollection.SkillID.evasion) * SkillCollection.PER_SKILLPOINT_INCREASE_EVASION_MONSTER_ATTACK_CHANCE_PERCENTAGE;
@@ -89,7 +89,7 @@ public final class MonsterMovementController implements EvaluateWalkable {
 				return;
 			}
 			if (m.nextPosition.contains(world.model.player.position)) {
-				if (!m.isAgressive()) {
+				if (!m.isAgressive(world.model.player)) {
 					cancelCurrentMonsterMovement(m);
 					return;
 				}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
index a67c2a1b3..6c26fe2df 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
@@ -2,6 +2,7 @@ package com.gpl.rpg.AndorsTrail.controller;
 
 import android.content.res.Resources;
 import android.os.AsyncTask;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -203,7 +204,7 @@ public final class MovementController implements TimedMessageTask.Callback {
 		if (aggressiveness == AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_NORMAL) return true;
 
 		Monster m = world.model.currentMap.getMonsterAt(player.nextPosition);
-		if (m != null && !m.isAgressive()) return true; // avoid MOVEMENTAGGRESSIVENESS settings for NPCs
+		if (m != null && !m.isAgressive(player)) return true; // avoid MOVEMENTAGGRESSIVENESS settings for NPCs
 
 		if (aggressiveness == AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_AGGRESSIVE && m == null) return false;
 		if (aggressiveness == AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_DEFENSIVE && m != null) return false;
@@ -346,13 +347,14 @@ public final class MovementController implements TimedMessageTask.Callback {
 	}
 
 	public static void refreshMonsterAggressiveness(final PredefinedMap map, final Player player) {
-		for(MonsterSpawnArea a : map.spawnAreas) {
-			for (Monster m : a.monsters) {
-				String faction = m.getFaction();
-				if (faction == null) continue;
-				if (player.getAlignment(faction) < 0) m.forceAggressive();
-			}
-		}
+//	Faction-related agressiveness now dynamic, and unrelated to "forceAgressive".
+//		for(MonsterSpawnArea a : map.spawnAreas) {
+//			for (Monster m : a.monsters) {
+//				String faction = m.getFaction();
+//				if (faction == null) continue;
+//				if (player.getAlignment(faction) < 0) m.forceAggressive();
+//			}
+//		}
 	}
 
 	public static boolean hasAdjacentAggressiveMonster(PredefinedMap map, Player player) {
@@ -361,7 +363,7 @@ public final class MovementController implements TimedMessageTask.Callback {
 	public static Monster getAdjacentAggressiveMonster(PredefinedMap map, Player player) {
 		for (MonsterSpawnArea a : map.spawnAreas) {
 			for (Monster m : a.monsters) {
-				if (!m.isAgressive()) continue;
+				if (!m.isAgressive(player)) continue;
 				if (m.isAdjacentTo(player)) return m;
 			}
 		}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
index 98ad9bd49..e82f46303 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import java.util.Arrays;
+
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
-import java.util.Arrays;
-
 public class PathFinder {
 	private final int maxWidth;
 	private final int maxHeight;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
index 3d7ee7514..0712c12b9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
@@ -1,5 +1,13 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -10,6 +18,7 @@ import android.graphics.Paint;
 import android.os.AsyncTask;
 import android.os.Environment;
 import android.widget.Toast;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity;
@@ -26,14 +35,6 @@ import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
 public final class WorldMapController {
 
 	private static final int WORLDMAP_SCREENSHOT_TILESIZE = 8;
@@ -158,6 +159,12 @@ public final class WorldMapController {
 		File noMediaFile = new File(dir, ".nomedia");
 		if (!noMediaFile.exists()) noMediaFile.createNewFile();
 	}
+	public static boolean fileForMapExists(PredefinedMap map) {
+		if (map.lastSeenLayoutHash.length() > 0) {
+			return getPngFile(map.name + '.' + map.lastSeenLayoutHash).exists();
+		}
+		return getPngFile(map.name).exists();
+	}
 	private static File getFileForMap(PredefinedMap map, boolean verifyFileExists) {
 		if (map.lastSeenLayoutHash.length() > 0) {
 			File fileWithHash = getPngFile(map.name + '.' + map.lastSeenLayoutHash);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListener.java
index 30f63ba0a..3c25ff3bd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListener.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.controller.listeners;
 
+import java.util.Collection;
+
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 
-import java.util.Collection;
-
 public interface WorldEventListener {
 	void onPlayerStartedConversation(Monster m, String phraseID);
 	void onScriptAreaStartedConversation(String phraseID);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
index b6d4ee0e3..dbb4a4f3a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
@@ -1,12 +1,12 @@
 package com.gpl.rpg.AndorsTrail.controller.listeners;
 
+import java.util.Collection;
+
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
-import java.util.Collection;
-
 public final class WorldEventListeners extends ListOfListeners<WorldEventListener> implements WorldEventListener {
 
 	private final Function2<WorldEventListener, Monster, String> onPlayerStartedConversation = new Function2<WorldEventListener, Monster, String>() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
index 20bf2ade2..fa2605ecb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
@@ -1,6 +1,18 @@
 package com.gpl.rpg.AndorsTrail.model;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
 import android.content.res.Resources;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
@@ -8,12 +20,6 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.quest.Quest;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.*;
-import java.util.Map.Entry;
-
 public final class GameStatistics {
 	private int deaths = 0;
 	private final HashMap<String, Integer> killedMonsters = new HashMap<String, Integer>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
index 3d368fc47..b595049a0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
@@ -1,13 +1,12 @@
 package com.gpl.rpg.AndorsTrail.model;
 
-import com.gpl.rpg.AndorsTrail.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail.util.Coord;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+
 public final class InterfaceData {
 	public boolean isMainActivityVisible = false;
 	public boolean isInCombat = false;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
index 2d365de32..628776afc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
@@ -1,15 +1,15 @@
 package com.gpl.rpg.AndorsTrail.model;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
 public final class ModelContainer {
 
 	public final Player player;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java
index 6e3d10078..94fee6a3c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.model.ability;
 
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+
 public final class ActorCondition {
 	public static final int MAGNITUDE_REMOVE_ALL = -99;
 	public static final int DURATION_FOREVER = 999;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java
index fed58432f..fdd15111c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.model.ability;
 
+import java.util.HashMap;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.resource.parsers.ActorConditionsTypeParser;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-import java.util.HashMap;
-
 public final class ActorConditionTypeCollection {
 	private final HashMap<String, ActorConditionType> conditionTypes = new HashMap<String, ActorConditionType>();
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
index 7fc01dc89..cf9b82069 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
@@ -1,13 +1,14 @@
 package com.gpl.rpg.AndorsTrail.model.ability;
 
-import android.util.SparseArray;
-import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-
 import java.util.ArrayList;
 import java.util.Collection;
 
+import android.util.SparseArray;
+
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+
 public final class SkillCollection {
 	public static enum SkillID {
 		weaponChance
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/HeroCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/HeroCollection.java
new file mode 100644
index 000000000..ff35938ba
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/HeroCollection.java
@@ -0,0 +1,58 @@
+package com.gpl.rpg.AndorsTrail.model.actor;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
+
+public class HeroCollection {
+
+	//Id in save is the index in the list +1
+	private static final List<HeroDesc> listOfHeroes = new LinkedList<HeroCollection.HeroDesc>();
+	public static boolean isInitialized = false;
+	
+	public static class HeroDesc {
+		int tileIdInSpritesheet, tileIdInManager, smallSpriteResId, largeSpriteResId;
+		public HeroDesc(int tileIdInSpritesheet, int smallSpriteResId, int largeSpriteResId) {
+			this.smallSpriteResId = smallSpriteResId;
+			this.largeSpriteResId = largeSpriteResId;
+			this.tileIdInSpritesheet = tileIdInSpritesheet;
+			//tileIdInManager will be filled by prepareHeroesTileId, called by ResourceLoader
+		}
+	}
+	
+	static {
+		listOfHeroes.add(new HeroDesc(0, R.drawable.char_hero, R.drawable.char_hero_large));
+		listOfHeroes.add(new HeroDesc(0, R.drawable.char_hero_maksiu_girl_01, R.drawable.char_hero_maksiu_girl_01_large));
+		listOfHeroes.add(new HeroDesc(0, R.drawable.char_hero_maksiu_boy_01, R.drawable.char_hero_maksiu_boy_01_large));
+	}
+	
+	public static int getHeroTileIdForTileManage(int heroId) {
+		//Id in save is the index in the list +1
+		heroId--;
+		if (heroId >= listOfHeroes.size()) return -1;
+		return listOfHeroes.get(heroId).tileIdInManager;
+	}
+
+	public static int getHeroSmallSpriteId(int heroId) {
+		//Id in save is the index in the list +1
+		heroId--;
+		if (heroId >= listOfHeroes.size()) return -1;
+		return listOfHeroes.get(heroId).smallSpriteResId;
+	}
+
+	public static int getHeroLargeSprite(int heroId) {
+		//Id in save is the index in the list +1
+		heroId--;
+		if (heroId >= listOfHeroes.size()) return -1;
+		return listOfHeroes.get(heroId).largeSpriteResId;
+	}
+	
+	public static void prepareHeroesTileId(DynamicTileLoader loader) {
+		for (HeroDesc hero : listOfHeroes) {
+			hero.tileIdInManager = loader.prepareTileID(hero.smallSpriteResId, hero.tileIdInSpritesheet);
+		}
+	}
+	
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
index b69170768..9ee06af2b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
@@ -1,5 +1,9 @@
 package com.gpl.rpg.AndorsTrail.model.actor;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
@@ -12,10 +16,6 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.Range;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
 public final class Monster extends Actor {
 
 	public Coord movementDestination = null;
@@ -87,8 +87,8 @@ public final class Monster extends Actor {
 		return this.rectPosition.isAdjacentTo(p.position);
 	}
 
-	public boolean isAgressive() {
-		return getPhraseID() == null || forceAggressive;
+	public boolean isAgressive(Player p) {
+		return getPhraseID() == null || forceAggressive || (p != null && getFaction() != null && p.getAlignment(getFaction()) < 0);
 	}
 
 	public void forceAggressive() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
index 6597b3b2b..870afcfba 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
@@ -1,12 +1,12 @@
 package com.gpl.rpg.AndorsTrail.model.actor;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.resource.parsers.MonsterTypeParser;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 public final class MonsterTypeCollection {
 	private final HashMap<String, MonsterType> monsterTypesById = new HashMap<String, MonsterType>();
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index c28e23e51..b8a466634 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -19,7 +19,6 @@ import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
 import com.gpl.rpg.AndorsTrail.model.item.Inventory;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForPlayer;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.Range;
@@ -90,8 +89,8 @@ public final class Player extends Actor {
 		this.inventory = new Inventory();
 	}
 
-	public void initializeNewPlayer(DropListCollection dropLists, String playerName) {
-		baseTraits.iconID = TileManager.CHAR_HERO;
+	public void initializeNewPlayer(DropListCollection dropLists, String playerName, int playerIcon) {
+		baseTraits.iconID = playerIcon;
 		baseTraits.maxAP = 10;
 		baseTraits.maxHP = 25;
 		baseTraits.moveCost = 6;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java
index 2c708c10b..97de49d44 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java
@@ -1,12 +1,12 @@
 package com.gpl.rpg.AndorsTrail.model.conversation;
 
+import java.util.Collection;
+import java.util.HashMap;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.resource.parsers.ConversationListParser;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-import java.util.Collection;
-import java.util.HashMap;
-
 public final class ConversationCollection {
 	public static final String PHRASE_CLOSE = "X";
 	public static final String PHRASE_SHOP = "S";
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
index 171a70288..f0e428b09 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.model.item;
 
+import java.util.HashMap;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.resource.parsers.DropListParser;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-import java.util.HashMap;
-
 public final class DropListCollection {
 	public static final String DROPLIST_STARTITEMS = "startitems";
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
index a5c29cd5d..535156460 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
@@ -1,18 +1,11 @@
 package com.gpl.rpg.AndorsTrail.model.item;
 
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
-import com.gpl.rpg.AndorsTrail.savegames.Savegames;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
+
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
 
 public final class Inventory extends ItemContainer {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java
index 2c22bae4a..ea52eb460 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.model.item;
 
+import java.util.HashMap;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.resource.parsers.ItemCategoryParser;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-import java.util.HashMap;
-
 public final class ItemCategoryCollection {
 	private final HashMap<String, ItemCategory> itemCategories = new HashMap<String, ItemCategory>();
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
index 9c203076f..6fb638d0f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
@@ -1,8 +1,5 @@
 package com.gpl.rpg.AndorsTrail.model.item;
 
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -10,6 +7,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+
 public class ItemContainer {
 	public final ArrayList<ItemEntry> items = new ArrayList<ItemEntry>();
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
index b7a0e8f3a..9a6d6324f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.model.item;
 
+import java.util.HashMap;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.resource.parsers.ItemTypeParser;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-import java.util.HashMap;
-
 public final class ItemTypeCollection {
 	private static final String ITEMTYPE_GOLD = "gold";
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java
index 441458872..52d6bb0fe 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java
@@ -1,13 +1,13 @@
 package com.gpl.rpg.AndorsTrail.model.item;
 
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
-import com.gpl.rpg.AndorsTrail.util.Coord;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+
 public final class Loot {
 	public int exp = 0;
 	public int gold = 0;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
index 3ae745566..d807fc78c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
@@ -1,14 +1,15 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
+import java.util.Collection;
+
 import android.graphics.ColorFilter;
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
+
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
-import java.util.Collection;
-
 public final class LayeredTileMap {
 	private static final ColorFilter colorFilterBlack20 = createGrayScaleColorFilter(0.8f);
 	private static final ColorFilter colorFilterBlack40 = createGrayScaleColorFilter(0.6f);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
index 160b83c9f..8f598c1cf 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
@@ -1,11 +1,5 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForMap;
-import com.gpl.rpg.AndorsTrail.util.L;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -14,6 +8,12 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForMap;
+import com.gpl.rpg.AndorsTrail.util.L;
+
 public final class MapCollection {
 	private final HashMap<String, PredefinedMap> predefinedMaps = new HashMap<String, PredefinedMap>();
 	public final HashMap<String, WorldMapSegment> worldMapSegments = new HashMap<String, WorldMapSegment>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
index 7279bb45d..72b71ba37 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
@@ -1,5 +1,10 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
@@ -8,11 +13,6 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.Range;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-
 public final class MonsterSpawnArea {
 	public final CoordRect area;
 	public final Range quantity;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
index 0634c6495..4502a2999 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
@@ -1,6 +1,11 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
-import android.app.ActivityManager.RecentTaskInfo;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
@@ -16,13 +21,6 @@ import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
 public final class PredefinedMap {
 	private static final long VISIT_RESET = 0;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java
index 959ddef5d..a94c61f0d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java
@@ -1,13 +1,5 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.util.Base64;
-import com.gpl.rpg.AndorsTrail.util.L;
-import com.gpl.rpg.AndorsTrail.util.XmlResourceParserUtils;
-import org.xmlpull.v1.XmlPullParserException;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.security.MessageDigest;
@@ -16,6 +8,16 @@ import java.util.ArrayList;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.InflaterInputStream;
 
+import org.xmlpull.v1.XmlPullParserException;
+
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.Base64;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.XmlResourceParserUtils;
+
 public final class TMXMapFileParser {
 	private static final int TILESIZE = 32;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
index ff5c54064..098bb72c6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
@@ -1,5 +1,15 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+
 import android.content.res.Resources;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
@@ -7,15 +17,22 @@ import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.item.DropList;
 import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
-import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.*;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXLayer;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXLayerMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXObject;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXObjectGroup;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXObjectMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXProperty;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXTileSet;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.model.script.Requirement;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileCache;
-import com.gpl.rpg.AndorsTrail.util.*;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Range;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class TMXMapTranslator {
 	private final ArrayList<TMXObjectMap> maps = new ArrayList<TMXObjectMap>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
index 384840fad..7be483428 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
@@ -1,10 +1,10 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
-import com.gpl.rpg.AndorsTrail.util.Coord;
-
 import java.util.HashMap;
 import java.util.HashSet;
 
+import com.gpl.rpg.AndorsTrail.util.Coord;
+
 public final class WorldMapSegment {
 	public final String name;
 	public final HashMap<String, WorldMapSegmentMap> maps = new HashMap<String, WorldMapSegmentMap>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
index f51bf8abd..9240eaa49 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
@@ -1,14 +1,14 @@
 package com.gpl.rpg.AndorsTrail.model.quest;
 
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.resource.parsers.QuestParser;
-import com.gpl.rpg.AndorsTrail.util.L;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.QuestParser;
+import com.gpl.rpg.AndorsTrail.util.L;
+
 public final class QuestCollection {
 	private final HashMap<String, Quest> quests = new HashMap<String, Quest>();
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java
index 271aa4148..d0d9c3f87 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java
@@ -1,13 +1,14 @@
 package com.gpl.rpg.AndorsTrail.resource;
 
-import android.content.res.Resources;
-import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection;
-import com.gpl.rpg.AndorsTrail.model.conversation.Phrase;
-import com.gpl.rpg.AndorsTrail.resource.parsers.ConversationListParser;
-
 import java.util.Collection;
 import java.util.HashMap;
 
+import android.content.res.Resources;
+
+import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection;
+import com.gpl.rpg.AndorsTrail.model.conversation.Phrase;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ConversationListParser;
+
 public final class ConversationLoader {
 	private final HashMap<String, Integer> resourceIDsPerPhraseID = new HashMap<String, Integer>();
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
index 102ef05dc..c1149bc8b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
@@ -1,115 +1,116 @@
-package com.gpl.rpg.AndorsTrail.resource;
-
-import android.util.SparseArray;
-import android.util.SparseIntArray;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.resource.tiles.ResourceFileTileset;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileCache;
-import com.gpl.rpg.AndorsTrail.util.L;
-import com.gpl.rpg.AndorsTrail.util.Size;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public final class DynamicTileLoader {
-	private final TileCache tileCache;
-
-	private final SparseArray<ResourceFileTilesetLoadList> preparedTilesetsByResourceId = new SparseArray<ResourceFileTilesetLoadList>();
-	private final HashMap<String, ResourceFileTilesetLoadList> preparedTilesetsByResourceName = new HashMap<String, ResourceFileTilesetLoadList>();
-	private int currentTileStoreIndex;
-
-	private static final class ResourceFileTilesetLoadList {
-		public final ResourceFileTileset tileset;
-		public final SparseIntArray tileIDsToLoadPerLocalID = new SparseIntArray();
-		public ResourceFileTilesetLoadList(ResourceFileTileset tileset) {
-			this.tileset = tileset;
-		}
-	}
-
-	public DynamicTileLoader(TileCache tileCache) {
-		this.tileCache = tileCache;
-		initialize();
-	}
-
-	private void initialize() {
-		preparedTilesetsByResourceId.clear();
-		preparedTilesetsByResourceName.clear();
-		currentTileStoreIndex = tileCache.getMaxTileID();
-	}
-
-	public void prepareTileset(int resourceId, String tilesetName, Size gridDimensions, Size spriteDimensionsInTiles, int tileSize) {
-		ResourceFileTileset b = new ResourceFileTileset(resourceId, tilesetName, gridDimensions, spriteDimensionsInTiles, tileSize);
-		ResourceFileTilesetLoadList loadList = new ResourceFileTilesetLoadList(b);
-		preparedTilesetsByResourceId.put(resourceId, loadList);
-		preparedTilesetsByResourceName.put(tilesetName, loadList);
-	}
-	private ResourceFileTilesetLoadList getTilesetBitmap(int tilesetImageResourceID) {
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-			if (preparedTilesetsByResourceId.get(tilesetImageResourceID) == null) {
-				L.log("WARNING: Cannot load tileset " + tilesetImageResourceID);
-				return null;
-			}
-		}
-		return preparedTilesetsByResourceId.get(tilesetImageResourceID);
-	}
-	private ResourceFileTilesetLoadList getTilesetBitmap(String tilesetName) {
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-			if (!preparedTilesetsByResourceName.containsKey(tilesetName)) {
-				L.log("WARNING: Cannot load tileset " + tilesetName);
-				return null;
-			}
-		}
-		return preparedTilesetsByResourceName.get(tilesetName);
-	}
-
-	public int prepareTileID(int tilesetImageResourceID, int localID) {
-		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetImageResourceID);
-		return prepareTileID(b, localID);
-	}
-
-	public int prepareTileID(String tilesetName, int localID) {
-		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetName);
-		return prepareTileID(b, localID);
-	}
-	public Size getTilesetSize(String tilesetName) {
-		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetName);
-		return b.tileset.destinationTileSize;
-	}
-	public Size getTilesetTileSize(String tilesetName) {
-		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetName);
-		return b.tileset.spriteDimensionsInTiles;
-	}
-
-	private int prepareTileID(ResourceFileTilesetLoadList tileset, int localID) {
-		int tileID = tileset.tileIDsToLoadPerLocalID.get(localID);
-		if (tileID == 0) {
-			++currentTileStoreIndex;
-			tileID = currentTileStoreIndex;
-			tileset.tileIDsToLoadPerLocalID.put(localID, tileID);
-		}
-		return tileID;
-	}
-
-	public void prepareAllMapTiles() {
-		for (Map.Entry<String, ResourceFileTilesetLoadList> tileset : preparedTilesetsByResourceName.entrySet()) {
-			if (!tileset.getKey().startsWith("map_")) continue;
-			ResourceFileTilesetLoadList b = tileset.getValue();
-			int numTiles = b.tileset.numTiles.width * b.tileset.numTiles.height;
-			for(int i = 0; i < numTiles; ++i) {
-				prepareTileID(b, i);
-			}
-		}
-	}
-
-	public void flush() {
-		tileCache.allocateMaxTileID(currentTileStoreIndex);
-		for (int i = 0; i < preparedTilesetsByResourceId.size(); ++i) {
-			ResourceFileTilesetLoadList e = preparedTilesetsByResourceId.valueAt(i);
-			ResourceFileTileset tileset = e.tileset;
-			SparseIntArray tileIDsToLoad = e.tileIDsToLoadPerLocalID;
-			for (int j = 0; j < tileIDsToLoad.size(); ++j) {
-				tileCache.setTile(tileIDsToLoad.valueAt(j), tileset, tileIDsToLoad.keyAt(j));
-			}
-		}
-	}
-}
+package com.gpl.rpg.AndorsTrail.resource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import android.util.SparseArray;
+import android.util.SparseIntArray;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.tiles.ResourceFileTileset;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCache;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Size;
+
+public final class DynamicTileLoader {
+	private final TileCache tileCache;
+
+	private final SparseArray<ResourceFileTilesetLoadList> preparedTilesetsByResourceId = new SparseArray<ResourceFileTilesetLoadList>();
+	private final HashMap<String, ResourceFileTilesetLoadList> preparedTilesetsByResourceName = new HashMap<String, ResourceFileTilesetLoadList>();
+	private int currentTileStoreIndex;
+
+	private static final class ResourceFileTilesetLoadList {
+		public final ResourceFileTileset tileset;
+		public final SparseIntArray tileIDsToLoadPerLocalID = new SparseIntArray();
+		public ResourceFileTilesetLoadList(ResourceFileTileset tileset) {
+			this.tileset = tileset;
+		}
+	}
+
+	public DynamicTileLoader(TileCache tileCache) {
+		this.tileCache = tileCache;
+		initialize();
+	}
+
+	private void initialize() {
+		preparedTilesetsByResourceId.clear();
+		preparedTilesetsByResourceName.clear();
+		currentTileStoreIndex = tileCache.getMaxTileID();
+	}
+
+	public void prepareTileset(int resourceId, String tilesetName, Size gridDimensions, Size spriteDimensionsInTiles, int tileSize) {
+		ResourceFileTileset b = new ResourceFileTileset(resourceId, tilesetName, gridDimensions, spriteDimensionsInTiles, tileSize);
+		ResourceFileTilesetLoadList loadList = new ResourceFileTilesetLoadList(b);
+		preparedTilesetsByResourceId.put(resourceId, loadList);
+		preparedTilesetsByResourceName.put(tilesetName, loadList);
+	}
+	private ResourceFileTilesetLoadList getTilesetBitmap(int tilesetImageResourceID) {
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			if (preparedTilesetsByResourceId.get(tilesetImageResourceID) == null) {
+				L.log("WARNING: Cannot load tileset " + tilesetImageResourceID);
+				return null;
+			}
+		}
+		return preparedTilesetsByResourceId.get(tilesetImageResourceID);
+	}
+	private ResourceFileTilesetLoadList getTilesetBitmap(String tilesetName) {
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			if (!preparedTilesetsByResourceName.containsKey(tilesetName)) {
+				L.log("WARNING: Cannot load tileset " + tilesetName);
+				return null;
+			}
+		}
+		return preparedTilesetsByResourceName.get(tilesetName);
+	}
+
+	public int prepareTileID(int tilesetImageResourceID, int localID) {
+		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetImageResourceID);
+		return prepareTileID(b, localID);
+	}
+
+	public int prepareTileID(String tilesetName, int localID) {
+		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetName);
+		return prepareTileID(b, localID);
+	}
+	public Size getTilesetSize(String tilesetName) {
+		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetName);
+		return b.tileset.destinationTileSize;
+	}
+	public Size getTilesetTileSize(String tilesetName) {
+		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetName);
+		return b.tileset.spriteDimensionsInTiles;
+	}
+
+	private int prepareTileID(ResourceFileTilesetLoadList tileset, int localID) {
+		int tileID = tileset.tileIDsToLoadPerLocalID.get(localID);
+		if (tileID == 0) {
+			++currentTileStoreIndex;
+			tileID = currentTileStoreIndex;
+			tileset.tileIDsToLoadPerLocalID.put(localID, tileID);
+		}
+		return tileID;
+	}
+
+	public void prepareAllMapTiles() {
+		for (Map.Entry<String, ResourceFileTilesetLoadList> tileset : preparedTilesetsByResourceName.entrySet()) {
+			if (!tileset.getKey().startsWith("map_")) continue;
+			ResourceFileTilesetLoadList b = tileset.getValue();
+			int numTiles = b.tileset.numTiles.width * b.tileset.numTiles.height;
+			for(int i = 0; i < numTiles; ++i) {
+				prepareTileID(b, i);
+			}
+		}
+	}
+
+	public void flush() {
+		tileCache.allocateMaxTileID(currentTileStoreIndex);
+		for (int i = 0; i < preparedTilesetsByResourceId.size(); ++i) {
+			ResourceFileTilesetLoadList e = preparedTilesetsByResourceId.valueAt(i);
+			ResourceFileTileset tileset = e.tileset;
+			SparseIntArray tileIDsToLoad = e.tileIDsToLoadPerLocalID;
+			for (int j = 0; j < tileIDsToLoad.size(); ++j) {
+				tileCache.setTile(tileIDsToLoad.valueAt(j), tileset, tileIDsToLoad.keyAt(j));
+			}
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
index ad85a91c0..e403d6115 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
@@ -1,22 +1,30 @@
 package com.gpl.rpg.AndorsTrail.resource;
 
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection;
-import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
-import com.gpl.rpg.AndorsTrail.resource.parsers.*;
-import com.gpl.rpg.AndorsTrail.util.L;
-import com.gpl.rpg.AndorsTrail.util.Size;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Collection;
 
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ActorConditionsTypeParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ConversationListParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.DropListParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ItemCategoryParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ItemTypeParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.MonsterTypeParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.QuestParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.WorldMapParser;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Size;
+
 public final class ResourceLoader {
 
 	private static final int itemCategoriesResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_itemcategories_debug : R.array.loadresource_itemcategories;
@@ -28,6 +36,8 @@ public final class ResourceLoader {
 	private static final int monstersResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_monsters_debug : R.array.loadresource_monsters;
 	private static final int mapsResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_maps_debug : R.array.loadresource_maps;
 
+	private static DynamicTileLoader loader;
+	private static TranslationLoader translationLoader; 
 	private static long taskStart;
 	private static void timingCheckpoint(String loaderName) {
 		long now = System.currentTimeMillis();
@@ -35,22 +45,24 @@ public final class ResourceLoader {
 		L.log(loaderName + " ran for " + duration + " ms.");
 		taskStart = now;
 	}
-
-	public static void loadResources(WorldContext world, Resources r) {
+	
+	public static void loadResourcesSync(WorldContext world, Resources r) {
 		long start = System.currentTimeMillis();
 		taskStart = start;
 
 		final int mTileSize = world.tileManager.tileSize;
 
-		final TranslationLoader translationLoader = new TranslationLoader(r.getAssets(), r);
 
-		DynamicTileLoader loader = new DynamicTileLoader(world.tileManager.tileCache);
+		loader = new DynamicTileLoader(world.tileManager.tileCache);
 		prepareTilesets(loader, mTileSize);
 		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("prepareTilesets");
 
 		// ========================================================================
 		// Load various ui icons
-		/*TileManager.iconID_CHAR_HERO = */loader.prepareTileID(R.drawable.char_hero, 0);
+//		HeroCollection.prepareHeroesTileId(loader);
+		/*TileManager.iconID_CHAR_HERO_0 = */loader.prepareTileID(R.drawable.char_hero, 0);
+		/*TileManager.iconID_CHAR_HERO_1 = */loader.prepareTileID(R.drawable.char_hero_maksiu_girl_01, 0);
+		/*TileManager.iconID_CHAR_HERO_2 = */loader.prepareTileID(R.drawable.char_hero_maksiu_boy_01, 0);
 		/*TileManager.iconID_selection_red = */loader.prepareTileID(R.drawable.ui_selections, 0);
 		/*TileManager.iconID_selection_yellow = */loader.prepareTileID(R.drawable.ui_selections, 1);
 		/*TileManager.iconID_groundbag = */loader.prepareTileID(R.drawable.ui_icon_equipment, 0);
@@ -64,13 +76,14 @@ public final class ResourceLoader {
 			loader.prepareTileID(R.drawable.ui_splatters1, i+8);
 		}
 		loader.prepareTileID(R.drawable.ui_icon_immunity, 0);
-
-
-		// ========================================================================
+	
 		// Load effects
 		world.visualEffectTypes.initialize(loader);
 		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("VisualEffectLoader");
-
+		
+		translationLoader = new TranslationLoader(r.getAssets(), r);
+		
+		
 		// ========================================================================
 		// Load skills
 		world.skills.initialize();
@@ -96,11 +109,16 @@ public final class ResourceLoader {
 		conditionsToLoad.recycle();
 		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ActorConditionsTypeParser");
 
+		
 		// ========================================================================
 		// Load preloaded tiles
 		loader.flush();
 		world.tileManager.loadPreloadedTiles(r);
+	}
 
+	public static void loadResourcesAsync(WorldContext world, Resources r) {
+		long start = System.currentTimeMillis();
+		taskStart = start;
 
 		// ========================================================================
 		// Load items
@@ -230,6 +248,8 @@ public final class ResourceLoader {
 		final Size mapTileSize = new Size(16, 8);
 
 		loader.prepareTileset(R.drawable.char_hero, "char_hero", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.char_hero_maksiu_girl_01, "char_hero_maksiu_girl_01", sz1x1, sz1x1, mTileSize);
+		loader.prepareTileset(R.drawable.char_hero_maksiu_boy_01, "char_hero_maksiu_boy_01", sz1x1, sz1x1, mTileSize);
 
 		loader.prepareTileset(R.drawable.ui_selections, "ui_selections", new Size(5, 1), sz1x1, mTileSize);
 		loader.prepareTileset(R.drawable.ui_quickslots, "ui_quickslots", sz2x1, sz1x1, mTileSize);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
index ef98e71e6..2620470ce 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
@@ -1,15 +1,16 @@
 package com.gpl.rpg.AndorsTrail.resource;
 
-import android.content.res.AssetManager;
-import android.content.res.Resources;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.util.L;
-
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.L;
+
 public final class TranslationLoader {
 	private final BinaryMoFileParser parser;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java
index 7bc0a6064..67f25b0a4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java
@@ -1,6 +1,7 @@
 package com.gpl.rpg.AndorsTrail.resource;
 
 import android.graphics.Color;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
index b5e385712..0efa4e057 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
@@ -1,13 +1,14 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
 import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
 import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.Pair;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 public final class ActorConditionsTypeParser extends JsonCollectionParserFor<ActorConditionType> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
index f6018f929..aef8b1c0f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
@@ -1,5 +1,8 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.model.conversation.Phrase;
 import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
@@ -11,8 +14,6 @@ import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.Pair;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 public final class ConversationListParser extends JsonCollectionParserFor<Phrase> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/DropListParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/DropListParser.java
index a770013ac..e9e1abaef 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/DropListParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/DropListParser.java
@@ -1,5 +1,8 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.model.item.DropList;
 import com.gpl.rpg.AndorsTrail.model.item.DropList.DropItem;
@@ -9,8 +12,6 @@ import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.Pair;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 public final class DropListParser extends JsonCollectionParserFor<DropList> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java
index 0bdc4b3b4..dcb4cb59f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java
@@ -1,13 +1,14 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import com.gpl.rpg.AndorsTrail.model.item.Inventory;
 import com.gpl.rpg.AndorsTrail.model.item.ItemCategory;
 import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.Pair;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 public final class ItemCategoryParser extends JsonCollectionParserFor<ItemCategory> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java
index 0cc627f3b..7b67f247a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java
@@ -1,5 +1,8 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
@@ -14,9 +17,6 @@ import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 public final class ItemTraitsParser {
 	private final JsonArrayParserFor<ActorConditionEffect> actorConditionEffectParser_withDuration;
 	private final JsonArrayParserFor<ActorConditionEffect> actorConditionEffectParser_withoutDuration;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
index e3777ac19..104398a50 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
@@ -1,5 +1,8 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.item.ItemCategoryCollection;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip;
@@ -12,9 +15,6 @@ import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.Pair;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 
 	private final DynamicTileLoader tileLoader;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
index e9dd8d0e0..0693e63d8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
@@ -1,5 +1,11 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
+import java.util.Arrays;
+import java.util.Comparator;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import com.gpl.rpg.AndorsTrail.model.quest.Quest;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
 import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
@@ -7,11 +13,6 @@ import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonArrayParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
 import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.Pair;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Arrays;
-import java.util.Comparator;
 
 public final class QuestParser extends JsonCollectionParserFor<Quest> {
 	private final TranslationLoader translationLoader;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java
index 98526b113..60f987ea3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java
@@ -1,5 +1,8 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
 import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
@@ -9,8 +12,6 @@ import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.Size;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 public final class ResourceParserUtils {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
index 9ec790362..5a050e829 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
@@ -1,7 +1,13 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.xmlpull.v1.XmlPullParserException;
+
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
+
 import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
 import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea;
@@ -11,10 +17,6 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.Pair;
 import com.gpl.rpg.AndorsTrail.util.XmlResourceParserUtils;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.ArrayList;
 
 public final class WorldMapParser {
 	public static void read(Resources r, int xmlResourceId, final MapCollection maps, TranslationLoader translationLoader) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java
index 9b56c20f2..c31615db3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers.json;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+
 public abstract class JsonArrayParserFor<T> extends JsonParserFor<T> {
 	private final Class<T> classType;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonCollectionParserFor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonCollectionParserFor.java
index 69ef744bd..59aeec324 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonCollectionParserFor.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonCollectionParserFor.java
@@ -1,17 +1,18 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers.json;
 
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.util.L;
-import com.gpl.rpg.AndorsTrail.util.Pair;
-import org.json.JSONArray;
-import org.json.JSONException;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Pair;
+
 public abstract class JsonCollectionParserFor<T> extends JsonParserFor<Pair<String, T>> {
 	public HashSet<String> parseRows(String input, HashMap<String, T> dest) {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonParserFor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonParserFor.java
index e6220cf12..db5c2078c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonParserFor.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonParserFor.java
@@ -1,11 +1,11 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers.json;
 
+import java.util.ArrayList;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-
 public abstract class JsonParserFor<T> {
 	public void parseRows(JSONArray array, ArrayList<T> dest) throws JSONException {
 		if (array == null) return;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java
index 7567bc8b3..f01c6dfb4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java
@@ -1,47 +1,48 @@
-package com.gpl.rpg.AndorsTrail.resource.tiles;
-
-import android.graphics.Matrix;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.util.Size;
-
-public final class ResourceFileTileset {
-	public final int resourceID;
-	public final String tilesetName;
-	public final Size spriteDimensionsInTiles;
-	public final Size destinationTileSize;
-	public final Size numTiles;
-	public Size sourceTileSize;
-	public Matrix scale;
-
-	public ResourceFileTileset(int resourceID, String tilesetName, Size gridDimensions, Size spriteDimensionsInTiles, int tileSize) {
-		this.resourceID = resourceID;
-		this.tilesetName = tilesetName;
-		this.spriteDimensionsInTiles = spriteDimensionsInTiles;
-		this.destinationTileSize = new Size(tileSize * spriteDimensionsInTiles.width, tileSize * spriteDimensionsInTiles.height);
-		this.numTiles = gridDimensions;
-	}
-
-	@Override public int hashCode() { return resourceID; }
-
-	public void calculateFromSourceImageSize(final int sourceWidth, final int sourceHeight) {
-		sourceTileSize = new Size(
-				sourceWidth / numTiles.width
-				,sourceHeight / numTiles.height
-			);
-
-		if (destinationTileSize.width == sourceTileSize.width && destinationTileSize.height == sourceTileSize.height) {
-			scale = null;
-		} else {
-			scale = new Matrix();
-			scale.postScale(
-					((float) destinationTileSize.width) / sourceTileSize.width
-					,((float) destinationTileSize.height) / sourceTileSize.height
-				);
-
-			if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-				//L.log("OPTIMIZE: Tileset " + tilesetName + " will be resized from " + sourceTileSize.toString() + " to " + destinationTileSize.toString());
-			}
-		}
-	}
-
-}
+package com.gpl.rpg.AndorsTrail.resource.tiles;
+
+import android.graphics.Matrix;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.Size;
+
+public final class ResourceFileTileset {
+	public final int resourceID;
+	public final String tilesetName;
+	public final Size spriteDimensionsInTiles;
+	public final Size destinationTileSize;
+	public final Size numTiles;
+	public Size sourceTileSize;
+	public Matrix scale;
+
+	public ResourceFileTileset(int resourceID, String tilesetName, Size gridDimensions, Size spriteDimensionsInTiles, int tileSize) {
+		this.resourceID = resourceID;
+		this.tilesetName = tilesetName;
+		this.spriteDimensionsInTiles = spriteDimensionsInTiles;
+		this.destinationTileSize = new Size(tileSize * spriteDimensionsInTiles.width, tileSize * spriteDimensionsInTiles.height);
+		this.numTiles = gridDimensions;
+	}
+
+	@Override public int hashCode() { return resourceID; }
+
+	public void calculateFromSourceImageSize(final int sourceWidth, final int sourceHeight) {
+		sourceTileSize = new Size(
+				sourceWidth / numTiles.width
+				,sourceHeight / numTiles.height
+			);
+
+		if (destinationTileSize.width == sourceTileSize.width && destinationTileSize.height == sourceTileSize.height) {
+			scale = null;
+		} else {
+			scale = new Matrix();
+			scale.postScale(
+					((float) destinationTileSize.width) / sourceTileSize.width
+					,((float) destinationTileSize.height) / sourceTileSize.height
+				);
+
+			if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+				//L.log("OPTIMIZE: Tileset " + tilesetName + " will be resized from " + sourceTileSize.toString() + " to " + destinationTileSize.toString());
+			}
+		}
+	}
+
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java
index 88308d8e4..0fde8963f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java
@@ -1,11 +1,5 @@
 package com.gpl.rpg.AndorsTrail.resource.tiles;
 
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.util.SparseArray;
-import android.util.SparseIntArray;
-import com.gpl.rpg.AndorsTrail.util.LruCache;
-
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
@@ -13,6 +7,13 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.util.SparseArray;
+import android.util.SparseIntArray;
+
+import com.gpl.rpg.AndorsTrail.util.LruCache;
+
 public final class TileCache {
 
 	private final ReferenceQueue<Bitmap> gcQueue = new ReferenceQueue<Bitmap>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
index 064b4c824..f9b788fbb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
@@ -1,503 +1,540 @@
-package com.gpl.rpg.AndorsTrail.resource.tiles;
-
-import java.util.HashMap;
-import java.util.HashSet;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
-import com.gpl.rpg.AndorsTrail.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.os.AsyncTask;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public final class TileManager {
-	public static final int CHAR_HERO = 1;
-	public static final int iconID_selection_red = 2;
-	public static final int iconID_selection_yellow = 3;
-	public static final int iconID_attackselect = iconID_selection_red;
-	public static final int iconID_moveselect = iconID_selection_yellow;
-	public static final int iconID_groundbag = 4;
-	public static final int iconID_boxopened = 5;
-	public static final int iconID_boxclosed = 6;
-	public static final int iconID_shop = iconID_groundbag;
-	public static final int iconID_unassigned_quickslot = iconID_groundbag;
-	public static final int iconID_selection_blue = 7;
-	public static final int iconID_selection_purple = 8;
-	public static final int iconID_selection_green = 9;
-
-	public static final int iconID_splatter_red_1a = 10;
-	public static final int iconID_splatter_red_1b = 11;
-	public static final int iconID_splatter_red_2a = 12;
-	public static final int iconID_splatter_red_2b = 13;
-	public static final int iconID_splatter_brown_1a = 14;
-	public static final int iconID_splatter_brown_1b = 15;
-	public static final int iconID_splatter_brown_2a = 16;
-	public static final int iconID_splatter_brown_2b = 17;
-	public static final int iconID_splatter_white_1a = 18;
-	public static final int iconID_splatter_white_1b = 19;
-	
-	public static final int iconID_immunity_overlay = 20;
-
-	public int tileSize;
-	public float density;
-	public float uiIconScale;
-
-	public int viewTileSize;
-	public float scale;
-
-
-	public final TileCache tileCache = new TileCache();
-	public TileCollection preloadedTiles;// = new TileCollection(118);
-	public TileCollection currentMapTiles;
-	public TileCollection adjacentMapTiles;
-	private final HashSet<Integer> preloadedTileIDs = new HashSet<Integer>();
-
-
-	public TileCollection loadTilesFor(HashSet<Integer> tileIDs, Resources r) {
-		return tileCache.loadTilesFor(tileIDs, r);
-	}
-
-	public TileCollection loadTilesFor(ItemContainer container, Resources r) {
-		return tileCache.loadTilesFor(getTileIDsFor(container), r);
-	}
-
-	public HashSet<Integer> getTileIDsFor(ItemContainer container) {
-		HashSet<Integer> iconIDs = new HashSet<Integer>();
-		for(ItemEntry i : container.items) {
-			iconIDs.add(i.itemType.iconID);
-		}
-		return iconIDs;
-	}
-
-	public TileCollection loadTilesFor(Inventory inventory, Resources r) {
-		HashSet<Integer> iconIDs = getTileIDsFor(inventory);
-		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
-			ItemType t = inventory.getItemTypeInWearSlot(slot);
-			if (t != null) iconIDs.add(t.iconID);
-		}
-		return tileCache.loadTilesFor(iconIDs, r);
-	}
-
-	public TileCollection loadTilesFor(PredefinedMap map, LayeredTileMap tileMap, WorldContext world, Resources r) {
-		HashSet<Integer> iconIDs = getTileIDsFor(map, tileMap, world);
-		TileCollection result = tileCache.loadTilesFor(iconIDs, r);
-		for(int i : preloadedTileIDs) {
-			result.setBitmap(i, preloadedTiles.getBitmap(i));
-		}
-		return result;
-	}
-
-	public HashSet<Integer> getTileIDsFor(PredefinedMap map, LayeredTileMap tileMap, WorldContext world) {
-		HashSet<Integer> iconIDs = new HashSet<Integer>();
-		for (MonsterSpawnArea a : map.spawnAreas) {
-			for (String monsterTypeID : a.monsterTypeIDs) {
-				iconIDs.add(world.monsterTypes.getMonsterType(monsterTypeID).iconID);
-			}
-			// Add icons for monsters that are already spawned, but that do not belong to the group of
-			// monsters that usually spawn here. This could happen if we change the contents of spawn-
-			// areas in a later release,
-			for (Monster m : a.monsters) {
-				iconIDs.add(m.iconID);
-			}
-		}
-		iconIDs.addAll(tileMap.usedTileIDs);
-		return iconIDs;
-	}
-
-	public void setDensity(Resources r) {
-		density = r.getDisplayMetrics().density;
-		uiIconScale = 100 * density;
-//		tileSize = (int) (32 * density);
-		if (density < 1) tileSize = (int) (32 * density);
-		else tileSize = 32;
-	}
-
-	public void updatePreferences(AndorsTrailPreferences prefs) {
-		float densityScaler = 1;
-		if (density > 1) densityScaler = density;
-		scale = prefs.scalingFactor * densityScaler;
-		viewTileSize = (int) (tileSize * prefs.scalingFactor * densityScaler);
-	}
-
-
-
-	public void setImageViewTile(Resources res, TextView textView, Monster monster) { setImageViewTileForMonster(res, textView, monster.iconID); }
-	public void setImageViewTile(Resources res, TextView textView, Player player) { setImageViewTileForPlayer(res, textView, player.iconID); }
-	public void setImageViewTileForMonster(Resources res, TextView textView, int iconID) { setImageViewTile(res, textView, currentMapTiles.getBitmap(iconID)); }
-	public void setImageViewTileForPlayer(Resources res, TextView textView, int iconID) { setImageViewTile(res, textView, preloadedTiles.getBitmap(iconID)); }
-	public void setImageViewTile(Resources res, TextView textView, ActorConditionType conditionType) { setImageViewTile(res, textView, preloadedTiles.getBitmap(conditionType.iconID)); }
-	public void setImageViewTile(Resources res, TextView textView, ActorConditionType conditionType, boolean immunityOverlay) { setImageViewTile(res, textView, preloadedTiles.getBitmap(conditionType.iconID), immunityOverlay); }
-	public void setImageViewTileForUIIcon(Resources res, TextView textView, int iconID) { setImageViewTile(res, textView, preloadedTiles.getBitmap(iconID)); }
-	private void setImageViewTile(Resources res, TextView textView, Bitmap b) { 
-		if (density > 1) {
-			setImageViewTile(textView, new BitmapDrawable(res, Bitmap.createScaledBitmap(b, (int)(tileSize*density), (int)(tileSize*density), true)));
-		} else {
-			setImageViewTile(textView, new BitmapDrawable(res, b)); 
-		}
-	}
-	public void setImageViewTile(Resources res, TextView textView, Bitmap b, boolean immunityOverlay) {
-		if (!immunityOverlay) setImageViewTile(res, textView, b);
-		else {
-			Drawable[] layers = new Drawable[2];
-			if (density > 1) {
-				layers[0] = new BitmapDrawable(res, Bitmap.createScaledBitmap(b, (int)(tileSize*density), (int)(tileSize*density), true));
-				layers[1] = new BitmapDrawable(res, preloadedTiles.getBitmap(iconID_immunity_overlay));
-			} else {
-				layers[0] = new BitmapDrawable(res, b);
-				layers[1] = new BitmapDrawable(res, preloadedTiles.getBitmap(iconID_immunity_overlay));
-			}
-			LayerDrawable layered = new LayerDrawable(layers);
-			setImageViewTile(textView, layered);
-		}
-	}
-	private void setImageViewTile(TextView textView, Drawable d) {
-		/*if (density > 1) {
-			ScaleDrawable sd = new ScaleDrawable(d, 0, uiIconScale, uiIconScale);
-			sd.setLevel(8000);
-			d.setBounds(0, 0, (int)(tileSize * density), (int)(tileSize * density));
-			textView.setCompoundDrawables(sd, null, null, null);
-		}
-		else */textView.setCompoundDrawablesWithIntrinsicBounds(d, null, null, null);
-	}
-	
-	public void setImageViewTileForSingleItemType(Resources res, TextView textView, ItemType itemType) {
-		final Bitmap icon = tileCache.loadSingleTile(itemType.iconID, res);
-		setImageViewTile(res, textView, itemType, icon);
-	}
-	public void setImageViewTile(Resources res, TextView textView, ItemType itemType, TileCollection itemTileCollection) {
-		final Bitmap icon = itemTileCollection.getBitmap(itemType.iconID);
-		setImageViewTile(res, textView, itemType, icon);
-	}
-	private void setImageViewTile(Resources res, TextView textView, ItemType itemType, Bitmap icon) {
-		final int overlayIconID = itemType.getOverlayTileID();
-		if (overlayIconID != -1) {
-			
-			if (density > 1) {
-			
-			setImageViewTile(textView,
-				new LayerDrawable(new Drawable[] {
-					new BitmapDrawable(res, Bitmap.createScaledBitmap(preloadedTiles.getBitmap(overlayIconID), (int)(tileSize*density), (int)(tileSize*density), true))
-					,new BitmapDrawable(res, Bitmap.createScaledBitmap(icon, (int)(tileSize*density), (int)(tileSize*density), true))
-				})
-			);
-			} else {
-				setImageViewTile(textView,
-						new LayerDrawable(new Drawable[] {
-							new BitmapDrawable(res, preloadedTiles.getBitmap(overlayIconID))
-							,new BitmapDrawable(res, icon)
-						})
-					);	
-			}
-		} else {
-			setImageViewTile(res, textView, icon);
-		}
-	}
-
-	public void setImageViewTile(Resources res, ImageView imageView, Monster monster) { setImageViewTileForMonster(res, imageView, monster.iconID); }
-	public void setImageViewTile(Resources res, ImageView imageView, Player player) { setImageViewTileForPlayer(res, imageView, player.iconID); }
-	public void setImageViewTileForMonster(Resources res, ImageView imageView, int iconID) {  setImageViewTile(res, imageView, currentMapTiles.getBitmap(iconID)); }
-	public void setImageViewTileForPlayer(Resources res, ImageView imageView, int iconID) {  setImageViewTile(res, imageView, preloadedTiles.getBitmap(iconID)); }
-//	public void setImageViewTile(Resources res, ImageView imageView, ActorConditionType conditionType) {  setImageViewTile(res, imageView, preloadedTiles.getBitmap(conditionType.iconID)); }
-	public void setImageViewTile(Resources res, ImageView imageView, ActorConditionType conditionType, boolean immunityOverlay) {  setImageViewTile(res, imageView, preloadedTiles.getBitmap(conditionType.iconID), immunityOverlay); }
-	public void setImageViewTile(Resources res, ImageView imageView, ActorConditionType conditionType, boolean immunityOverlay, String exponent, String index) {  setImageViewTile(res, imageView, preloadedTiles.getBitmap(conditionType.iconID), immunityOverlay, exponent, index); }
-	public void setImageViewTileForUIIcon(Resources res, ImageView imageView, int iconID) { setImageViewTile(res, imageView, preloadedTiles.getBitmap(iconID)); }
-	public void setImageViewTile(Resources res, ImageView imageView, Bitmap b) {
-		if (density > 1) {
-			setImageViewTile(imageView, new BitmapDrawable(res, Bitmap.createScaledBitmap(b, (int)(tileSize*density), (int)(tileSize*density), true)));
-		} else {
-			setImageViewTile(imageView, new BitmapDrawable(res, b)); 
-		}
-	}
-	public void setImageViewTile(Resources res, ImageView imageView, Bitmap b, boolean immunityOverlay) {
-		setImageViewTile(res, imageView, b, immunityOverlay, null, null);
-	}
-	public void setImageViewTile(Resources res, ImageView imageView, Bitmap b, boolean immunityOverlay, String exponent, String index) {
-		if (!immunityOverlay && exponent == null && index == null) setImageViewTile(res, imageView, b);
-		else {
-			Drawable[] layers = new Drawable[1+
-			                                 (immunityOverlay ? 1 : 0)+
-			                                 (exponent != null ? 1 : 0)+
-			                                 (index != null ? 1 : 0)];
-			int tileWidth;
-			if (density > 1) {
-				tileWidth = (int)(tileSize*density);
-				layers[0] = new BitmapDrawable(res, Bitmap.createScaledBitmap(b, tileWidth, tileWidth, true));
-			} else {
-				tileWidth = tileSize;
-				layers[0] = new BitmapDrawable(res, b);
-			}
-			int nextIndex = 1;
-			if (immunityOverlay) {
-				layers[nextIndex] = new BitmapDrawable(res, preloadedTiles.getBitmap(iconID_immunity_overlay));
-				nextIndex++;
-			}
-			if (exponent != null) {
-				layers[nextIndex] = new TextDrawable(res, tileWidth, tileWidth, exponent, TextDrawable.Align.TOP_RIGHT);
-				nextIndex++;
-			}
-			if (index != null) {
-				layers[nextIndex] = new TextDrawable(res, tileWidth, tileWidth, index, TextDrawable.Align.BOTTOM_RIGHT);
-				nextIndex++;
-			}
-			LayerDrawable layered = new LayerDrawable(layers);
-			setImageViewTile(imageView, layered);
-		}
-	}
-	
-	public void setImageViewTile(ImageView imageView, Drawable d) {
-		imageView.setImageDrawable(d);
-	}
-	
-	public void setImageViewTile(Resources res, ImageView imageView, ItemType itemType, TileCollection itemTileCollection) {
-		final Bitmap icon = itemTileCollection.getBitmap(itemType.iconID);
-		setImageViewTile(res, imageView, itemType, icon);
-	}
-	public void setImageViewTileWithOverlay(Resources res, ImageView imageView, int overlayIconID, Bitmap icon, boolean overlayAbove) {
-		if (overlayIconID != -1) {
-			Drawable overlayDrawable, iconDrawable;
-			if (density > 1) {
-				overlayDrawable = new BitmapDrawable(res, Bitmap.createScaledBitmap(preloadedTiles.getBitmap(overlayIconID), (int)(tileSize*density), (int)(tileSize*density), true));
-				iconDrawable = new BitmapDrawable(res, Bitmap.createScaledBitmap(icon, (int)(tileSize*density), (int)(tileSize*density), true));
-			} else {
-				overlayDrawable = new BitmapDrawable(res, preloadedTiles.getBitmap(overlayIconID));
-				iconDrawable = new BitmapDrawable(res, icon);
-				}
-			
-			if (overlayAbove) {
-				LayerDrawable layered = new LayerDrawable(new Drawable[] {
-						iconDrawable
-						,overlayDrawable
-				});
-				setImageViewTile(imageView, layered);
-			} else {
-				LayerDrawable layered = new LayerDrawable(new Drawable[] {
-						overlayDrawable
-						,iconDrawable
-				});
-				setImageViewTile(imageView, layered);
-			}
-		} else {
-			setImageViewTile(res, imageView, icon);
-		}
-	}
-	private void setImageViewTile(Resources res, ImageView imageView, ItemType itemType, Bitmap icon) {
-		final int overlayIconID = itemType.getOverlayTileID();
-		setImageViewTileWithOverlay(res, imageView, overlayIconID, icon, false);
-	}
-
-	public void loadPreloadedTiles(Resources r) {
-		int maxTileID = tileCache.getMaxTileID();
-//		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-//			if (maxTileID > preloadedTiles.maxTileID) {
-//				L.log("ERROR: TileManager.preloadedTiles needs to be initialized with at least " + maxTileID + " slots. Application will crash now.");
-//				throw new IndexOutOfBoundsException("ERROR: TileManager.preloadedTiles needs to be initialized with at least " + maxTileID + " slots. Application will crash now.");
-//			}
-//		}
-		preloadedTiles = new TileCollection(maxTileID);
-		for(int i = TileManager.CHAR_HERO; i <= maxTileID; ++i) {
-			preloadedTileIDs.add(i);
-		}
-		tileCache.loadTilesFor(preloadedTileIDs, r, preloadedTiles);
-	}
-
-	private final HashMap<String, HashSet<Integer>> tileIDsPerMap = new HashMap<String, HashSet<Integer>>();
-	private void addTileIDsFor(HashSet<Integer> dest, String mapName, final Resources res, final WorldContext world) {
-		HashSet<Integer> cachedTileIDs = tileIDsPerMap.get(mapName);
-		if (cachedTileIDs == null) {
-			PredefinedMap adjacentMap = world.maps.findPredefinedMap(mapName);
-			if (adjacentMap == null) return;
-			LayeredTileMap adjacentMapTiles = TMXMapTranslator.readLayeredTileMap(res, tileCache, adjacentMap);
-			cachedTileIDs = getTileIDsFor(adjacentMap, adjacentMapTiles, world);
-			tileIDsPerMap.put(mapName, cachedTileIDs);
-		}
-		dest.addAll(cachedTileIDs);
-	}
-	public void cacheAdjacentMaps(final Resources res, final WorldContext world, final PredefinedMap nextMap) {
-		(new AsyncTask<Void, Void, Void>() {
-			@Override
-			protected Void doInBackground(Void... arg0) {
-				adjacentMapTiles = null;
-
-				HashSet<String> adjacentMapNames = new HashSet<String>();
-				for (MapObject o : nextMap.eventObjects) {
-					if (o.type != MapObject.MapObjectType.newmap) continue;
-					if (o.map == null) continue;
-					adjacentMapNames.add(o.map);
-				}
-
-				HashSet<Integer> tileIDs = new HashSet<Integer>();
-				for (String mapName : adjacentMapNames) {
-					addTileIDsFor(tileIDs, mapName, res, world);
-				}
-
-				long freeMemRequired = tileSize * tileSize * tileIDs.size() * 4 /*RGBA_8888*/ * 2 /*Require twice the needed size, to leave room for others*/;
-				Runtime r = Runtime.getRuntime();
-				
-				if (r.maxMemory() - r.totalMemory() > freeMemRequired) {
-					adjacentMapTiles = tileCache.loadTilesFor(tileIDs, res);
-				}
-				return null;
-			}
-		}).execute();
-	}
-	
-	private static class TextDrawable extends Drawable {
-
-		private String text;
-		private int size = 15;
-		private Align align = Align.CENTER;
-		private Paint mPaint;
-		private Rect textBounds;
-		private int cHeight;
-		private int cWidth;
-		
-		public enum Align {
-			TOP,
-			TOP_LEFT,
-			TOP_RIGHT,
-			CENTER,
-			LEFT,
-			RIGHT,
-			BOTTOM,
-			BOTTOM_LEFT,
-			BOTTOM_RIGHT
-		}
-		
-		public TextDrawable(Resources res, int cWidth, int cHeight, String text, Align align, int size) {
-			this.text= text;
-			this.align = align;
-			this.size = size;
-			this.cWidth = cWidth;
-			this.cHeight = cHeight;
-			init(res);
-		}
-
-		public TextDrawable(Resources res, int cWidth, int cHeight,  String text, Align align) {
-			this.text= text;
-			this.align = align;
-			this.cWidth = cWidth;
-			this.cHeight = cHeight;
-			init(res);
-		}
-		
-		public TextDrawable(Resources res, int cWidth, int cHeight,  String text) {
-			this.text= text;
-			this.cWidth = cWidth;
-			this.cHeight = cHeight;
-			init(res);
-		}
-		
-		public void init(Resources res) {
-			mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-
-			mPaint.setColor(res.getColor(android.R.color.black));
-			mPaint.setShadowLayer(1, 1, 1, res.getColor(android.R.color.white));
-			mPaint.setStyle(Paint.Style.FILL);
-			mPaint.setTextSize(size * res.getDisplayMetrics().scaledDensity);
-			textBounds = new Rect();
-			mPaint.getTextBounds(text, 0, text.length(), textBounds);
-		}
-		
-		
-		
-		@Override
-		public void draw(Canvas canvas) {
-			float x,y;
-			switch (align) {
-			case BOTTOM:
-			case BOTTOM_LEFT:
-			case BOTTOM_RIGHT:
-				y = cHeight - textBounds.bottom;
-				break;
-			case CENTER:
-			case LEFT:
-			case RIGHT:
-				y = (cHeight - textBounds.height()) / 2;
-				break;
-			case TOP:
-			case TOP_LEFT:
-			case TOP_RIGHT:
-			default:
-				y = 0 - textBounds.top;
-				break;
-			}
-			
-			switch (align) {
-			case BOTTOM:
-			case CENTER:
-			case TOP:
-				x = (cWidth - textBounds.width()) / 2;
-				break;
-			case BOTTOM_LEFT:
-			case LEFT:
-			case TOP_LEFT:
-			default:
-				x = 0 - textBounds.left;
-				break;
-			case BOTTOM_RIGHT:
-			case RIGHT:
-			case TOP_RIGHT:
-				x = cWidth - textBounds.right;
-				break;
-			
-			}
-			canvas.drawText(text, x, y, mPaint);
-		}
-
-		@Override
-		public void setAlpha(int alpha) {
-			mPaint.setAlpha(alpha);
-		}
-
-		@Override
-		public void setColorFilter(ColorFilter cf) {
-			mPaint.setColorFilter(cf);
-		}
-
-		@Override
-		public int getOpacity() {
-			return mPaint.getAlpha();
-		}
-		
-		@Override
-		public int getIntrinsicWidth() {
-			return cWidth;
-		}
-		
-		@Override
-		public int getIntrinsicHeight() {
-			return cHeight;
-		}
-		
-		@Override
-		public boolean getPadding(Rect padding) {
-			padding.bottom = 0;
-			padding.top = 0;
-			padding.left = 0;
-			padding.right = 0;
-			return false;
-		}
-		
-	}
-}
+package com.gpl.rpg.AndorsTrail.resource.tiles;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.os.AsyncTask;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+
+public final class TileManager {
+	
+	public static final int BEGIN_ID = 1;
+	
+	public static final int CHAR_HERO_0 = BEGIN_ID;
+	public static final int CHAR_HERO_1 = CHAR_HERO_0+1;
+	public static final int CHAR_HERO_2 = CHAR_HERO_1+1;
+	//Default hero
+	public static final int CHAR_HERO = CHAR_HERO_0;
+	//Max hero icon ID in this version.
+	public static final int LAST_HERO = CHAR_HERO_2;
+	
+	public static final int iconID_selection_red = CHAR_HERO_2+1;
+	public static final int iconID_selection_yellow = iconID_selection_red+1;
+	public static final int iconID_attackselect = iconID_selection_red;
+	public static final int iconID_moveselect = iconID_selection_yellow;
+	public static final int iconID_groundbag = iconID_moveselect+1;
+	public static final int iconID_boxopened = iconID_groundbag+1;
+	public static final int iconID_boxclosed = iconID_boxopened+1;
+	public static final int iconID_shop = iconID_groundbag;
+	public static final int iconID_unassigned_quickslot = iconID_groundbag;
+	public static final int iconID_selection_blue = iconID_boxclosed+1;
+	public static final int iconID_selection_purple = iconID_selection_blue+1;
+	public static final int iconID_selection_green = iconID_selection_purple+1;
+
+	public static final int iconID_splatter_red_1a = iconID_selection_green+1;
+	public static final int iconID_splatter_red_1b = iconID_splatter_red_1a+1;
+	public static final int iconID_splatter_red_2a = iconID_splatter_red_1b+1;
+	public static final int iconID_splatter_red_2b = iconID_splatter_red_2a+1;
+	public static final int iconID_splatter_brown_1a = iconID_splatter_red_2b+1;
+	public static final int iconID_splatter_brown_1b = iconID_splatter_brown_1a+1;
+	public static final int iconID_splatter_brown_2a = iconID_splatter_brown_1b+1;
+	public static final int iconID_splatter_brown_2b = iconID_splatter_brown_2a+1;
+	public static final int iconID_splatter_white_1a = iconID_splatter_brown_2b+1;
+	public static final int iconID_splatter_white_1b = iconID_splatter_white_1a+1;
+	
+	public static final int iconID_immunity_overlay = iconID_splatter_white_1b+1;
+
+
+	public int tileSize;
+	public float density;
+	public float uiIconScale;
+
+	public int viewTileSize;
+	public float scale;
+
+
+	public final TileCache tileCache = new TileCache();
+	public TileCollection preloadedTiles;// = new TileCollection(116);
+	public TileCollection currentMapTiles;
+	public TileCollection adjacentMapTiles;
+	private final HashSet<Integer> preloadedTileIDs = new HashSet<Integer>();
+
+
+	public TileCollection loadTilesFor(Collection<Integer> tileIDs, Resources r) {
+		return tileCache.loadTilesFor(tileIDs, r);
+	}
+
+	public TileCollection loadTilesFor(ItemContainer container, Resources r) {
+		return tileCache.loadTilesFor(getTileIDsFor(container), r);
+	}
+
+	public HashSet<Integer> getTileIDsFor(ItemContainer container) {
+		HashSet<Integer> iconIDs = new HashSet<Integer>();
+		for(ItemEntry i : container.items) {
+			iconIDs.add(i.itemType.iconID);
+		}
+		return iconIDs;
+	}
+
+	public TileCollection loadTilesFor(Inventory inventory, Resources r) {
+		HashSet<Integer> iconIDs = getTileIDsFor(inventory);
+		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
+			ItemType t = inventory.getItemTypeInWearSlot(slot);
+			if (t != null) iconIDs.add(t.iconID);
+		}
+		return tileCache.loadTilesFor(iconIDs, r);
+	}
+
+	public TileCollection loadTilesFor(PredefinedMap map, LayeredTileMap tileMap, WorldContext world, Resources r) {
+		HashSet<Integer> iconIDs = getTileIDsFor(map, tileMap, world);
+		TileCollection result = tileCache.loadTilesFor(iconIDs, r);
+		for(int i : preloadedTileIDs) {
+			result.setBitmap(i, preloadedTiles.getBitmap(i));
+		}
+		return result;
+	}
+
+	public HashSet<Integer> getTileIDsFor(PredefinedMap map, LayeredTileMap tileMap, WorldContext world) {
+		HashSet<Integer> iconIDs = new HashSet<Integer>();
+		for (MonsterSpawnArea a : map.spawnAreas) {
+			for (String monsterTypeID : a.monsterTypeIDs) {
+				iconIDs.add(world.monsterTypes.getMonsterType(monsterTypeID).iconID);
+			}
+			// Add icons for monsters that are already spawned, but that do not belong to the group of
+			// monsters that usually spawn here. This could happen if we change the contents of spawn-
+			// areas in a later release,
+			for (Monster m : a.monsters) {
+				iconIDs.add(m.iconID);
+			}
+		}
+		iconIDs.addAll(tileMap.usedTileIDs);
+		return iconIDs;
+	}
+
+	public void setDensity(Resources r) {
+		density = r.getDisplayMetrics().density;
+		uiIconScale = 100 * density;
+//		tileSize = (int) (32 * density);
+		if (density < 1) tileSize = (int) (32 * density);
+		else tileSize = 32;
+	}
+
+	public void updatePreferences(AndorsTrailPreferences prefs) {
+		float densityScaler = 1;
+		if (density > 1) densityScaler = density;
+		scale = prefs.scalingFactor * densityScaler;
+		viewTileSize = (int) (tileSize * prefs.scalingFactor * densityScaler);
+	}
+
+
+
+	public void setImageViewTile(Resources res, TextView textView, Monster monster) { setImageViewTileForMonster(res, textView, monster.iconID); }
+	public void setImageViewTile(Resources res, TextView textView, Player player) { setImageViewTileForPlayer(res, textView, player.iconID); }
+	public void setImageViewTileForMonster(Resources res, TextView textView, int iconID) { setImageViewTile(res, textView, currentMapTiles.getBitmap(iconID)); }
+	public void setImageViewTileForPlayer(Resources res, TextView textView, int iconID) { setImageViewTile(res, textView, preloadedTiles.getBitmap(iconID)); }
+	public void setImageViewTile(Resources res, TextView textView, ActorConditionType conditionType) { setImageViewTile(res, textView, preloadedTiles.getBitmap(conditionType.iconID)); }
+	public void setImageViewTile(Resources res, TextView textView, ActorConditionType conditionType, boolean immunityOverlay) { setImageViewTile(res, textView, preloadedTiles.getBitmap(conditionType.iconID), immunityOverlay); }
+	public void setImageViewTileForUIIcon(Resources res, TextView textView, int iconID) { setImageViewTile(res, textView, preloadedTiles.getBitmap(iconID)); }
+	private void setImageViewTile(Resources res, TextView textView, Bitmap b) { 
+		if (density > 1) {
+			setImageViewTile(textView, new BitmapDrawable(res, Bitmap.createScaledBitmap(b, (int)(tileSize*density), (int)(tileSize*density), true)));
+		} else {
+			setImageViewTile(textView, new BitmapDrawable(res, b)); 
+		}
+	}
+	public void setImageViewTile(Resources res, TextView textView, Bitmap b, boolean immunityOverlay) {
+		if (!immunityOverlay) setImageViewTile(res, textView, b);
+		else {
+			Drawable[] layers = new Drawable[2];
+			if (density > 1) {
+				layers[0] = new BitmapDrawable(res, Bitmap.createScaledBitmap(b, (int)(tileSize*density), (int)(tileSize*density), true));
+				layers[1] = new BitmapDrawable(res, preloadedTiles.getBitmap(iconID_immunity_overlay));
+			} else {
+				layers[0] = new BitmapDrawable(res, b);
+				layers[1] = new BitmapDrawable(res, preloadedTiles.getBitmap(iconID_immunity_overlay));
+			}
+			LayerDrawable layered = new LayerDrawable(layers);
+			setImageViewTile(textView, layered);
+		}
+	}
+	private void setImageViewTile(TextView textView, Drawable d) {
+		/*if (density > 1) {
+			ScaleDrawable sd = new ScaleDrawable(d, 0, uiIconScale, uiIconScale);
+			sd.setLevel(8000);
+			d.setBounds(0, 0, (int)(tileSize * density), (int)(tileSize * density));
+			textView.setCompoundDrawables(sd, null, null, null);
+		}
+		else */textView.setCompoundDrawablesWithIntrinsicBounds(d, null, null, null);
+	}
+	
+	public void setImageViewTileForSingleItemType(Resources res, TextView textView, ItemType itemType) {
+		final Bitmap icon = tileCache.loadSingleTile(itemType.iconID, res);
+		setImageViewTile(res, textView, itemType, icon);
+	}
+	public void setImageViewTile(Resources res, TextView textView, ItemType itemType, TileCollection itemTileCollection) {
+		final Bitmap icon = itemTileCollection.getBitmap(itemType.iconID);
+		setImageViewTile(res, textView, itemType, icon);
+	}
+	private void setImageViewTile(Resources res, TextView textView, ItemType itemType, Bitmap icon) {
+		final int overlayIconID = itemType.getOverlayTileID();
+		if (overlayIconID != -1) {
+			
+			if (density > 1) {
+			
+			setImageViewTile(textView,
+				new LayerDrawable(new Drawable[] {
+					new BitmapDrawable(res, Bitmap.createScaledBitmap(preloadedTiles.getBitmap(overlayIconID), (int)(tileSize*density), (int)(tileSize*density), true))
+					,new BitmapDrawable(res, Bitmap.createScaledBitmap(icon, (int)(tileSize*density), (int)(tileSize*density), true))
+				})
+			);
+			} else {
+				setImageViewTile(textView,
+						new LayerDrawable(new Drawable[] {
+							new BitmapDrawable(res, preloadedTiles.getBitmap(overlayIconID))
+							,new BitmapDrawable(res, icon)
+						})
+					);	
+			}
+		} else {
+			setImageViewTile(res, textView, icon);
+		}
+	}
+
+	public void setImageViewTile(Resources res, ImageView imageView, Monster monster) { setImageViewTileForMonster(res, imageView, monster.iconID); }
+	public void setImageViewTile(Resources res, ImageView imageView, Player player) { setImageViewTileForPlayer(res, imageView, player.iconID); }
+	public void setImageViewTileForMonster(Resources res, ImageView imageView, int iconID) {  setImageViewTile(res, imageView, currentMapTiles.getBitmap(iconID)); }
+	public void setImageViewTileForPlayer(Resources res, ImageView imageView, int iconID) {  setImageViewTile(res, imageView, preloadedTiles.getBitmap(iconID)); }
+//	public void setImageViewTile(Resources res, ImageView imageView, ActorConditionType conditionType) {  setImageViewTile(res, imageView, preloadedTiles.getBitmap(conditionType.iconID)); }
+	public void setImageViewTile(Context ctx, ImageView imageView, ActorConditionType conditionType, boolean immunityOverlay) {  setImageViewTile(ctx, imageView, preloadedTiles.getBitmap(conditionType.iconID), immunityOverlay); }
+	public void setImageViewTile(Context ctx, ImageView imageView, ActorConditionType conditionType, boolean immunityOverlay, String exponent, String index) {  setImageViewTile(ctx, imageView, preloadedTiles.getBitmap(conditionType.iconID), immunityOverlay, exponent, index); }
+	public void setImageViewTileForUIIcon(Resources res, ImageView imageView, int iconID) { setImageViewTile(res, imageView, preloadedTiles.getBitmap(iconID)); }
+	public void setImageViewTile(Resources res, ImageView imageView, Bitmap b) {
+		if (density > 1) {
+			setImageViewTile(imageView, new BitmapDrawable(res, Bitmap.createScaledBitmap(b, (int)(tileSize*density), (int)(tileSize*density), true)));
+		} else {
+			setImageViewTile(imageView, new BitmapDrawable(res, b)); 
+		}
+	}
+	public void setImageViewTile(Context ctx, ImageView imageView, Bitmap b, boolean immunityOverlay) {
+		setImageViewTile(ctx, imageView, b, immunityOverlay, null, null);
+	}
+	public void setImageViewTile(Context ctx, ImageView imageView, Bitmap b, boolean immunityOverlay, String exponent, String index) {
+		if (!immunityOverlay && exponent == null && index == null) setImageViewTile(ctx.getResources(), imageView, b);
+		else {
+			Drawable[] layers = new Drawable[1+
+			                                 (immunityOverlay ? 1 : 0)+
+			                                 (exponent != null ? 1 : 0)+
+			                                 (index != null ? 1 : 0)];
+			int tileWidth;
+			if (density > 1) {
+				tileWidth = (int)(tileSize*density);
+				layers[0] = new BitmapDrawable(ctx.getResources(), Bitmap.createScaledBitmap(b, tileWidth, tileWidth, true));
+			} else {
+				tileWidth = tileSize;
+				layers[0] = new BitmapDrawable(ctx.getResources(), b);
+			}
+			int nextIndex = 1;
+			if (immunityOverlay) {
+				layers[nextIndex] = new BitmapDrawable(ctx.getResources(), preloadedTiles.getBitmap(iconID_immunity_overlay));
+				nextIndex++;
+			}
+			if (exponent != null) {
+				layers[nextIndex] = new TextDrawable(ctx, tileWidth, tileWidth, exponent, TextDrawable.Align.TOP_RIGHT);
+				nextIndex++;
+			}
+			if (index != null) {
+				layers[nextIndex] = new TextDrawable(ctx, tileWidth, tileWidth, index, TextDrawable.Align.BOTTOM_RIGHT);
+				nextIndex++;
+			}
+			LayerDrawable layered = new LayerDrawable(layers);
+			setImageViewTile(imageView, layered);
+		}
+	}
+	
+	public void setImageViewTile(ImageView imageView, Drawable d) {
+		imageView.setImageDrawable(d);
+	}
+	
+	public void setImageViewTile(Resources res, ImageView imageView, ItemType itemType, TileCollection itemTileCollection) {
+		final Bitmap icon = itemTileCollection.getBitmap(itemType.iconID);
+		setImageViewTile(res, imageView, itemType, icon);
+	}
+	public void setImageViewTileWithOverlay(Resources res, ImageView imageView, int overlayIconID, Bitmap icon, boolean overlayAbove) {
+		if (overlayIconID != -1) {
+			Drawable overlayDrawable, iconDrawable;
+			if (density > 1) {
+				overlayDrawable = new BitmapDrawable(res, Bitmap.createScaledBitmap(preloadedTiles.getBitmap(overlayIconID), (int)(tileSize*density), (int)(tileSize*density), true));
+				iconDrawable = new BitmapDrawable(res, Bitmap.createScaledBitmap(icon, (int)(tileSize*density), (int)(tileSize*density), true));
+			} else {
+				overlayDrawable = new BitmapDrawable(res, preloadedTiles.getBitmap(overlayIconID));
+				iconDrawable = new BitmapDrawable(res, icon);
+			}
+			
+			if (overlayAbove) {
+				LayerDrawable layered = new LayerDrawable(new Drawable[] {
+						iconDrawable
+						,overlayDrawable
+				});
+				setImageViewTile(imageView, layered);
+			} else {
+				LayerDrawable layered = new LayerDrawable(new Drawable[] {
+						overlayDrawable
+						,iconDrawable
+				});
+				setImageViewTile(imageView, layered);
+			}
+		} else {
+			setImageViewTile(res, imageView, icon);
+		}
+	}
+	private void setImageViewTile(Resources res, ImageView imageView, ItemType itemType, Bitmap icon) {
+		final int overlayIconID = itemType.getOverlayTileID();
+		setImageViewTileWithOverlay(res, imageView, overlayIconID, icon, false);
+	}
+	
+
+
+	public Drawable getDrawableForItem(Resources res, int iconID, TileCollection itemTileCollection) {
+		final Bitmap icon = itemTileCollection.getBitmap(iconID);
+		if (density > 1) {
+			return new BitmapDrawable(res, Bitmap.createScaledBitmap(icon, (int)(tileSize*density), (int)(tileSize*density), true));
+		} else {
+			return new BitmapDrawable(res, icon);
+			}
+	}
+
+	public void loadPreloadedTiles(Resources r) {
+		int maxTileID = tileCache.getMaxTileID();
+//		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+//			if (maxTileID > preloadedTiles.maxTileID) {
+//				L.log("ERROR: TileManager.preloadedTiles needs to be initialized with at least " + maxTileID + " slots. Application will crash now.");
+//				throw new IndexOutOfBoundsException("ERROR: TileManager.preloadedTiles needs to be initialized with at least " + maxTileID + " slots. Application will crash now.");
+//			}
+//		}
+		preloadedTiles = new TileCollection(maxTileID);
+		for(int i = TileManager.BEGIN_ID; i <= maxTileID; ++i) {
+			preloadedTileIDs.add(i);
+		}
+		tileCache.loadTilesFor(preloadedTileIDs, r, preloadedTiles);
+	}
+
+	private final HashMap<String, HashSet<Integer>> tileIDsPerMap = new HashMap<String, HashSet<Integer>>();
+	private void addTileIDsFor(HashSet<Integer> dest, String mapName, final Resources res, final WorldContext world) {
+		HashSet<Integer> cachedTileIDs = tileIDsPerMap.get(mapName);
+		if (cachedTileIDs == null) {
+			PredefinedMap adjacentMap = world.maps.findPredefinedMap(mapName);
+			if (adjacentMap == null) return;
+			LayeredTileMap adjacentMapTiles = TMXMapTranslator.readLayeredTileMap(res, tileCache, adjacentMap);
+			cachedTileIDs = getTileIDsFor(adjacentMap, adjacentMapTiles, world);
+			tileIDsPerMap.put(mapName, cachedTileIDs);
+		}
+		dest.addAll(cachedTileIDs);
+	}
+	public void cacheAdjacentMaps(final Resources res, final WorldContext world, final PredefinedMap nextMap) {
+		(new AsyncTask<Void, Void, Void>() {
+			@Override
+			protected Void doInBackground(Void... arg0) {
+				adjacentMapTiles = null;
+
+				HashSet<String> adjacentMapNames = new HashSet<String>();
+				for (MapObject o : nextMap.eventObjects) {
+					if (o.type != MapObject.MapObjectType.newmap) continue;
+					if (o.map == null) continue;
+					adjacentMapNames.add(o.map);
+				}
+
+				HashSet<Integer> tileIDs = new HashSet<Integer>();
+				for (String mapName : adjacentMapNames) {
+					addTileIDsFor(tileIDs, mapName, res, world);
+				}
+
+				long freeMemRequired = tileSize * tileSize * tileIDs.size() * 4 /*RGBA_8888*/ * 2 /*Require twice the needed size, to leave room for others*/;
+				Runtime r = Runtime.getRuntime();
+				
+				if (r.maxMemory() - r.totalMemory() > freeMemRequired) {
+					adjacentMapTiles = tileCache.loadTilesFor(tileIDs, res);
+				}
+				return null;
+			}
+		}).execute();
+	}
+	
+	private static class TextDrawable extends Drawable {
+
+		private String text;
+		private int size = 15;
+		private Align align = Align.CENTER;
+		private Paint mFillPaint;
+		private Paint mStrokePaint;
+		private Rect textBounds;
+		private int cHeight;
+		private int cWidth;
+		
+		public enum Align {
+			TOP,
+			TOP_LEFT,
+			TOP_RIGHT,
+			CENTER,
+			LEFT,
+			RIGHT,
+			BOTTOM,
+			BOTTOM_LEFT,
+			BOTTOM_RIGHT
+		}
+		
+		public TextDrawable(Context ctx, int cWidth, int cHeight, String text, Align align, int size) {
+			this.text= text;
+			this.align = align;
+			this.size = size;
+			this.cWidth = cWidth;
+			this.cHeight = cHeight;
+			init(ctx);
+		}
+
+		public TextDrawable(Context ctx, int cWidth, int cHeight,  String text, Align align) {
+			this.text= text;
+			this.align = align;
+			this.cWidth = cWidth;
+			this.cHeight = cHeight;
+			init(ctx);
+		}
+		
+		public TextDrawable(Context ctx, int cWidth, int cHeight,  String text) {
+			this.text= text;
+			this.cWidth = cWidth;
+			this.cHeight = cHeight;
+			init(ctx);
+		}
+		
+		public void init(Context ctx) {
+			mFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+			mFillPaint.setColor(ThemeHelper.getThemeColor(ctx, R.attr.ui_theme_dialogue_light_color));
+//			mFillPaint.setShadowLayer(5f * res.getDisplayMetrics().scaledDensity, 1, 1, res.getColor(android.R.color.black));
+			mFillPaint.setStyle(Paint.Style.FILL);
+			mFillPaint.setTextSize(size * ctx.getResources().getDisplayMetrics().scaledDensity);
+			textBounds = new Rect();
+			mFillPaint.getTextBounds(text, 0, text.length(), textBounds);
+			mStrokePaint=new Paint(mFillPaint);
+//			mStrokePaint.setStyle(Paint.Style.FILL);
+//			mStrokePaint.setStrokeWidth(1f * res.getDisplayMetrics().scaledDensity);
+			mStrokePaint.setColor(ThemeHelper.getThemeColor(ctx, R.attr.ui_theme_buttonbar_bg_color));
+		}
+		
+		
+		
+		@Override
+		public void draw(Canvas canvas) {
+			float x,y;
+			switch (align) {
+			case BOTTOM:
+			case BOTTOM_LEFT:
+			case BOTTOM_RIGHT:
+				y = cHeight - textBounds.bottom;
+				break;
+			case CENTER:
+			case LEFT:
+			case RIGHT:
+				y = (cHeight - textBounds.height()) / 2;
+				break;
+			case TOP:
+			case TOP_LEFT:
+			case TOP_RIGHT:
+			default:
+				y = 0 - textBounds.top;
+				break;
+			}
+			
+			switch (align) {
+			case BOTTOM:
+			case CENTER:
+			case TOP:
+				x = (cWidth - textBounds.width()) / 2;
+				break;
+			case BOTTOM_LEFT:
+			case LEFT:
+			case TOP_LEFT:
+			default:
+				x = 0 - textBounds.left;
+				break;
+			case BOTTOM_RIGHT:
+			case RIGHT:
+			case TOP_RIGHT:
+				x = cWidth - textBounds.right;
+				break;
+			
+			}
+			canvas.drawRect(x, y - textBounds.height(), x + textBounds.width(), y, mStrokePaint);
+			canvas.drawText(text, x, y, mFillPaint);
+//			canvas.drawText(text, x, y, mStrokePaint);
+		}
+
+		@Override
+		public void setAlpha(int alpha) {
+			mFillPaint.setAlpha(alpha);
+//			mStrokePaint.setAlpha(alpha);
+		}
+
+		@Override
+		public void setColorFilter(ColorFilter cf) {
+			mFillPaint.setColorFilter(cf);
+//			mStrokePaint.setColorFilter(cf);
+		}
+
+		@Override
+		public int getOpacity() {
+			return mFillPaint.getAlpha();
+		}
+		
+		@Override
+		public int getIntrinsicWidth() {
+			return cWidth;
+		}
+		
+		@Override
+		public int getIntrinsicHeight() {
+			return cHeight;
+		}
+		
+		@Override
+		public boolean getPadding(Rect padding) {
+			padding.bottom = 0;
+			padding.top = 0;
+			padding.left = 0;
+			padding.right = 0;
+			return false;
+		}
+		
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java
index 2b88477f8..4729a6275 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java
@@ -1,13 +1,13 @@
 package com.gpl.rpg.AndorsTrail.savegames;
 
+import java.io.DataInputStream;
+import java.io.IOException;
+
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
-import java.io.DataInputStream;
-import java.io.IOException;
-
 public final class LegacySavegameFormatReaderForMonster {
 	public static Monster newFromParcel_pre_v25(DataInputStream src, int fileversion, MonsterType monsterType, MonsterSpawnArea area) throws IOException {
 		Monster m = new Monster(monsterType, area);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
index 25c53f83a..d34b4494f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
@@ -1,22 +1,35 @@
 package com.gpl.rpg.AndorsTrail.savegames;
 
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Environment;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail.util.L;
-
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Environment;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.L;
+
 public final class Savegames {
 	public static final int SLOT_QUICKSAVE = 0;
 
@@ -46,8 +59,9 @@ public final class Savegames {
 	}
 	public static LoadSavegameResult loadWorld(WorldContext world, ControllerContext controllers, Context androidContext, int slot) {
 		try {
+			FileHeader fh = quickload(androidContext, slot);
 			FileInputStream fos = getInputFile(androidContext, slot);
-			LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, fos);
+			LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, fos, fh);
 			fos.close();
 			return result;
 		} catch (IOException e) {
@@ -94,15 +108,15 @@ public final class Savegames {
 
 	public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException {
 		DataOutputStream dest = new DataOutputStream(outStream);
-		FileHeader.writeToParcel(dest, world.model.player.getName(), displayInfo);
+		FileHeader.writeToParcel(dest, world.model.player.getName(), displayInfo, world.model.player.iconID);
 		world.maps.writeToParcel(dest, world);
 		world.model.writeToParcel(dest);
 		dest.close();
 	}
 
-	public static LoadSavegameResult loadWorld(Resources res, WorldContext world, ControllerContext controllers, InputStream inState) throws IOException {
+	public static LoadSavegameResult loadWorld(Resources res, WorldContext world, ControllerContext controllers, InputStream inState, FileHeader fh) throws IOException {
 		DataInputStream src = new DataInputStream(inState);
-		final FileHeader header = new FileHeader(src);
+		final FileHeader header = new FileHeader(src, fh.skipIcon);
 		if (header.fileversion > AndorsTrailApplication.CURRENT_VERSION) return LoadSavegameResult.savegameIsFromAFutureVersion;
 
 		world.maps.readFromParcel(src, world, controllers, header.fileversion);
@@ -129,7 +143,7 @@ public final class Savegames {
 			}
 			FileInputStream fos = getInputFile(androidContext, slot);
 			DataInputStream src = new DataInputStream(fos);
-			final FileHeader header = new FileHeader(src);
+			final FileHeader header = new FileHeader(src, false);
 			src.close();
 			fos.close();
 			return header;
@@ -164,7 +178,9 @@ public final class Savegames {
 		public final int fileversion;
 		public final String playerName;
 		public final String displayInfo;
-
+		public final int iconID;
+		public boolean skipIcon = false;
+		
 		public String describe() {
 			return playerName + ", " + displayInfo;
 		}
@@ -172,7 +188,7 @@ public final class Savegames {
 
 		// ====== PARCELABLE ===================================================================
 
-		public FileHeader(DataInputStream src) throws IOException {
+		public FileHeader(DataInputStream src, boolean skipIcon) throws IOException {
 			int fileversion = src.readInt();
 			if (fileversion == 11) fileversion = 5; // Fileversion 5 had no version identifier, but the first byte was 11.
 			this.fileversion = fileversion;
@@ -183,12 +199,24 @@ public final class Savegames {
 				this.playerName = null;
 				this.displayInfo = null;
 			}
+			if (fileversion >= 43 && !skipIcon) {
+				int id = src.readInt();
+				if (id > TileManager.LAST_HERO) {
+					this.iconID = TileManager.CHAR_HERO_0;
+					this.skipIcon = true;
+				} else {
+					this.iconID = id;
+				}
+			} else {
+				this.iconID = TileManager.CHAR_HERO_0;
+			}
 		}
 
-		public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo) throws IOException {
+		public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo, int iconID) throws IOException {
 			dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
 			dest.writeUTF(playerName);
 			dest.writeUTF(displayInfo);
+			dest.writeInt(iconID);
 		}
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
index eadc71c0c..71ee062f7 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
@@ -1,6 +1,7 @@
 package com.gpl.rpg.AndorsTrail.util;
 
 import android.util.Log;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
 public final class L {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java
index cb187590f..6a8e5b808 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java
@@ -1,10 +1,10 @@
 package com.gpl.rpg.AndorsTrail.util;
 
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+
 public class ListOfListeners<T> {
 	private final ArrayList<WeakReference<T>> listeners = new ArrayList<WeakReference<T>>();
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
new file mode 100644
index 000000000..26224a527
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
@@ -0,0 +1,87 @@
+package com.gpl.rpg.AndorsTrail.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.gpl.rpg.AndorsTrail.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+
+public class ThemeHelper {
+	
+	private static final class ThemeSet {
+		int baseThemeRes, noBackgroundThemeRes, dialogThemeRes;
+		public ThemeSet(int baseThemeRes, int noBackgroundThemeRes, int dialogThemeRes) {
+			this.baseThemeRes = baseThemeRes;
+			this.noBackgroundThemeRes = noBackgroundThemeRes;
+			this.dialogThemeRes = dialogThemeRes;
+		}
+	}
+	
+	public static enum Theme {
+		blue,
+		green,
+		charcoal
+	}
+	
+	private static final Map<Theme, ThemeSet> THEME_SETS = new HashMap<ThemeHelper.Theme, ThemeHelper.ThemeSet>();
+	private static Theme SELECTED_THEME = Theme.blue;
+	private static boolean first = true;
+	
+	static {
+		THEME_SETS.put(Theme.blue, new ThemeSet(R.style.AndorsTrailTheme_Blue, R.style.AndorsTrailTheme_Blue_NoBackground, R.style.AndorsTrailDialogTheme_Blue));
+		THEME_SETS.put(Theme.green, new ThemeSet(R.style.AndorsTrailTheme_Green, R.style.AndorsTrailTheme_Green_NoBackground, R.style.AndorsTrailDialogTheme_Green));
+		THEME_SETS.put(Theme.charcoal, new ThemeSet(R.style.AndorsTrailTheme_Charcoal, R.style.AndorsTrailTheme_Charcoal_NoBackground, R.style.AndorsTrailDialogTheme_Charcoal));
+	}
+	
+	public static int getThemeColor(Context context, int attrResId) {
+		TypedArray ta = context.getTheme().obtainStyledAttributes(new int[] {attrResId});
+		int c = ta.getColor(0, Color.BLACK);
+		ta.recycle();
+		return c;
+	}
+	
+	public static int getThemeResource(Context context, int attrResId) {
+		TypedArray ta = context.getTheme().obtainStyledAttributes(new int[] {attrResId});
+		int resId = ta.getResourceId(0, 0);
+		ta.recycle();
+		return resId;
+	}
+	
+	public static Drawable getThemeDrawable(Context context, int attrResId) {
+		TypedArray ta = context.getTheme().obtainStyledAttributes(new int[] {attrResId});
+		Drawable d = ta.getDrawable(0);
+		ta.recycle();
+		return d;
+	}
+	
+	public static int getBaseTheme() {
+		return THEME_SETS.get(SELECTED_THEME).baseThemeRes;
+	}
+	
+	public static int getNoBackgroundTheme() {
+		return THEME_SETS.get(SELECTED_THEME).noBackgroundThemeRes;
+	}
+	
+	public static int getDialogTheme() {
+		return THEME_SETS.get(SELECTED_THEME).dialogThemeRes;
+	}
+	
+	//Returns true if theme has changed after startup.
+	public static boolean changeTheme(int id) {
+		Theme t = Theme.values()[id];
+		if (t == SELECTED_THEME) {
+			first = false;
+			return false;
+		}
+		SELECTED_THEME = t;
+		if (first) {
+			first = false;
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java
index 526bd4de1..ddfbf9bb0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java
@@ -1,9 +1,10 @@
 package com.gpl.rpg.AndorsTrail.util;
 
-import android.content.res.XmlResourceParser;
+import java.io.IOException;
+
 import org.xmlpull.v1.XmlPullParserException;
 
-import java.io.IOException;
+import android.content.res.XmlResourceParser;
 
 public final class XmlResourceParserUtils {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
index 242fc6f91..6d1daf839 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
@@ -6,6 +6,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
index c8a215e6b..7030a2caa 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
@@ -1,5 +1,7 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import java.util.Collection;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.text.SpannableString;
@@ -8,14 +10,13 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
 
-import java.util.Collection;
-
 public final class ActorConditionEffectList extends LinearLayout {
 
 	public ActorConditionEffectList(Context context, AttributeSet attr) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
index a5d184142..85eed77b3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
@@ -8,6 +8,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
@@ -48,7 +49,7 @@ public final class ActorConditionList extends LinearLayout {
 
 	private void addConditionEffect(final Context context, final Resources res, LinearLayout.LayoutParams layoutParams,
 			ActorCondition c, boolean immunity) {
-		TextView v = (TextView) View.inflate(context, R.layout.inventoryitemview, null);
+		TextView v = (TextView) View.inflate(context, R.layout.actorconditionitemview, null);
 		world.tileManager.setImageViewTile(res, v, c.conditionType, immunity);
 		SpannableString content = new SpannableString(describeEffect(res, c));
 		content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java
new file mode 100644
index 000000000..53dcfba4d
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java
@@ -0,0 +1,223 @@
+package com.gpl.rpg.AndorsTrail.view;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.Transformation;
+import android.view.animation.TranslateAnimation;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+import com.gpl.rpg.AndorsTrail.R;
+
+public class CloudsAnimatorView extends FrameLayout {
+
+	private static final int DEFAULT_DURATION = 80000;
+	private static final float SPEED_VARIANCE = 0.08f;
+	private static final float BELOW_SPEED_FACTOR = 0.8f;
+	private static final float CENTER_SPEED_FACTOR = 1.0f;
+	private static final float ABOVE_SPEED_FACTOR = 1.2f;
+
+	public static enum Layer {
+		below,
+		center,
+		above
+	}
+	
+	private static final int[] belowDrawablesId = new int[]{R.drawable.ts_clouds_s_01, R.drawable.ts_clouds_s_02, R.drawable.ts_clouds_s_03};
+	private static final int[] centerDrawablesId = new int[]{R.drawable.ts_clouds_m_01, R.drawable.ts_clouds_m_02};
+	private static final int[] aboveDrawablesId = new int[]{R.drawable.ts_clouds_l_01, R.drawable.ts_clouds_l_02, R.drawable.ts_clouds_l_03, R.drawable.ts_clouds_l_04};
+	
+	private int[] drawableIds = centerDrawablesId;
+	private float speedFactor = CENTER_SPEED_FACTOR;
+	private int count = 15;
+	private ViewGroup layer;
+	private int duration = DEFAULT_DURATION;
+	private int yMax = 100;
+	private float scalingRatio = 1.0f;
+	
+	private ConcurrentHashMap<ImageView, PausableTranslateAnimation> animations;
+
+
+	public CloudsAnimatorView(Context context) {
+		super(context);
+		init();
+	}
+
+	public CloudsAnimatorView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		init();
+	}
+
+	public CloudsAnimatorView(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+		init();
+	}
+	
+	private void init() {
+		setFocusable(false);
+		inflate(getContext(), R.layout.clouds_animator, this);
+		layer =  (ViewGroup) findViewById(R.id.ts_clouds_layer);
+	}
+	
+	public void setCloudsCountAndLayer(int count, Layer layer) {
+		this.count = count;
+		switch (layer) {
+		case above:
+			drawableIds = aboveDrawablesId;
+			speedFactor = ABOVE_SPEED_FACTOR;
+			break;
+		case below:
+			drawableIds = belowDrawablesId;
+			speedFactor = BELOW_SPEED_FACTOR;
+			break;
+		case center:
+			drawableIds = centerDrawablesId;
+			speedFactor = CENTER_SPEED_FACTOR;
+			break;
+		
+		}
+		animations = new ConcurrentHashMap<ImageView, PausableTranslateAnimation>(count);
+	}
+	
+	private void createCloud() {
+		final ImageView iv = new ImageView(getContext());
+		iv.setImageDrawable(getResources().getDrawable(drawableIds[(int)(drawableIds.length * Math.random())]));
+		RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams((int) (iv.getDrawable().getIntrinsicWidth() * scalingRatio), (int) (iv.getDrawable().getIntrinsicHeight() * scalingRatio));//RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+		layer.addView(iv, lp);
+
+		final float y = (float) (Math.random() * yMax) - (int) (iv.getDrawable().getIntrinsicHeight() * scalingRatio);
+		float ratio = (float)Math.random();
+		final float x = (float) (((1-ratio) * (iv.getDrawable().getMinimumWidth() + layer.getWidth())) - iv.getDrawable().getMinimumWidth());
+		final long d = (long)((ratio * duration) / (speedFactor + (Math.random() * SPEED_VARIANCE)));
+		
+		prepareAnimation(iv, layer, speedFactor, x, y, d);
+	}
+	
+	private void resetCloud(final ImageView iv) {
+		final float y = (float) (Math.random() * yMax) - (int) (iv.getDrawable().getIntrinsicHeight() * scalingRatio);
+		final float x = -iv.getWidth();
+		final long d = (long)(duration / (speedFactor + (Math.random() * SPEED_VARIANCE)));
+		
+		prepareAnimation(iv, layer, speedFactor, x, y, d);
+	}
+	
+	private void prepareAnimation(final ImageView iv, final ViewGroup layer, final float speedFactor, final float x, final float y, final long d) {
+		PausableTranslateAnimation anim = new PausableTranslateAnimation(
+				TranslateAnimation.ABSOLUTE, x, TranslateAnimation.ABSOLUTE, layer.getWidth(), 
+				TranslateAnimation.ABSOLUTE, y, TranslateAnimation.ABSOLUTE, y);
+		
+		anim.setAnimationListener(new Animation.AnimationListener() {
+			@Override
+			public void onAnimationStart(Animation animation) {
+				iv.setVisibility(View.VISIBLE);
+			}
+			@Override
+			public void onAnimationRepeat(Animation animation) {}
+			@Override
+			public void onAnimationEnd(Animation animation) {
+				iv.setVisibility(View.GONE);
+				resetCloud(iv);
+			}
+		});
+		anim.setInterpolator(new LinearInterpolator());
+		anim.setDuration(d);
+		animations.put(iv, anim);
+		iv.startAnimation(anim);
+		if (paused) {
+			anim.pause();
+		}
+	}
+
+	public void startAnimation() {
+		int i = count;
+		while (i-- > 0) {
+			createCloud();
+		}
+	}
+	
+	
+	boolean started = false;
+	
+	@Override
+	public void onWindowFocusChanged(boolean hasWindowFocus) {
+		super.onWindowFocusChanged(hasWindowFocus);
+		if (hasWindowFocus) {
+			if (!started) {
+				startAnimation();
+				started = true;
+			}
+		}
+	}
+	
+	private boolean paused = false;
+	
+	public void resumeAnimation() {
+		paused = false;
+		if (started) {
+			for (PausableTranslateAnimation a : animations.values()) {
+				a.resume();
+			}
+		}
+	}
+	
+	public void pauseAnimation() {
+		paused = true;
+		for (PausableTranslateAnimation a : animations.values()) {
+			a.pause();
+		}
+	}
+	
+	public void setScalingRatio(float ratio) {
+		this.scalingRatio = ratio;
+		duration = (int) (DEFAULT_DURATION * getWidth() / (1024 * ratio)); 
+		
+	}
+	
+	public void setYMax(int yMax) {
+		this.yMax = yMax;
+	}
+
+	private static class PausableTranslateAnimation extends TranslateAnimation {
+		
+		private long elapsedAtPause = 0;
+		private boolean paused = false;
+		private boolean resume = false;
+		
+		public PausableTranslateAnimation(int fromXType, float fromXValue, int toXType, float toXValue,
+	            int fromYType, float fromYValue, int toYType, float toYValue) {
+			super(fromXType, fromXValue, toXType, toXValue, fromYType, fromYValue, toYType, toYValue);
+		}
+		
+		@Override
+		public boolean getTransformation(long currentTime, Transformation outTransformation) {
+			if (paused && elapsedAtPause == 0) {
+				elapsedAtPause = currentTime - getStartTime();
+			}
+			if (paused) {
+				setStartTime(currentTime - elapsedAtPause); 
+				if (resume) {
+					paused = false;
+					resume = false;
+				}
+			}
+			return super.getTransformation(currentTime, outTransformation);
+		}
+		
+		public void pause() {
+			elapsedAtPause = 0;
+			paused = true;
+		}
+		
+		public void resume() {
+			if (paused) resume = true;
+		}
+	}
+	
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
index c1a5a8f06..8b24330fe 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
@@ -1,6 +1,5 @@
 package com.gpl.rpg.AndorsTrail.view;
 
-import android.R.color;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
@@ -33,7 +32,7 @@ import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class CombatView extends RelativeLayout implements CombatSelectionListener, CombatTurnListener, ActorStatsListener, ActorConditionListener {
-	private final TextView statusTextView;
+	private final RangeBar playerAPBar;
 	private final Button attackMoveButton;
 	private final ImageButton monsterInfo;
 	private final RangeBar monsterHealth;
@@ -70,11 +69,13 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 
 		setFocusable(false);
 		inflate(context, R.layout.combatview, this);
-		findViewById(R.id.combatview_fixedarea).setBackgroundResource(R.drawable.ui_gradientshape_translucent);
-//		this.setBackgroundResource(R.drawable.ui_gradientshape_translucent);
+		//Prevents mis-taps from registering as main area taps by going through the combat view.
+		findViewById(R.id.combatview_fixedarea).setClickable(true);
 
 		final CombatController c = controllers.combatController;
 		attackMoveButton = (Button) findViewById(R.id.combatview_moveattack);
+		//Enable marquee if text is too long.
+		attackMoveButton.setSelected(true);
 		attackMoveButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
@@ -83,6 +84,8 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 		});
 
 		Button endTurnButton = (Button) findViewById(R.id.combatview_endturn);
+		//Enable marquee if text is too long.
+		endTurnButton.setSelected(true);
 		endTurnButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
@@ -90,6 +93,8 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 			}
 		});
 		Button fleeButton = (Button) findViewById(R.id.combatview_flee);
+		//Enable marquee if text is too long.
+		fleeButton.setSelected(true);
 		fleeButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
@@ -97,7 +102,8 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 			}
 		});
 
-		statusTextView = (TextView) findViewById(R.id.combatview_status);
+		playerAPBar = (RangeBar) findViewById(R.id.combatview_status);
+		playerAPBar.init(R.drawable.ui_progress_ap, R.string.status_ap);
 
 		monsterInfo = (ImageButton) findViewById(R.id.combatview_monsterinfo);
 		monsterInfo.setOnClickListener(new OnClickListener() {
@@ -125,8 +131,8 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 		activeConditions = new DisplayActiveActorConditionIcons(controllers, world, context, activeConditionsBar);
 		
 		
-		monsterBar.setBackgroundColor(res.getColor(color.transparent));
-		actionBar.setBackgroundColor(res.getColor(color.transparent));
+//		monsterBar.setBackgroundColor(res.getColor(color.transparent));
+//		actionBar.setBackgroundColor(res.getColor(color.transparent));
 
 		displayAnimation = AnimationUtils.loadAnimation(context, R.anim.showcombatbar);
 		hideAnimation = AnimationUtils.loadAnimation(context, R.anim.hidecombatbar);
@@ -180,7 +186,7 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 		monsterHealth.update(m.getMaxHP(), m.getCurrentHP());
 	}
 	private void updatePlayerAP() {
-		statusTextView.setText(res.getString(R.string.combat_status_ap, player.getCurrentAP()));
+		playerAPBar.update(player.getMaxAP(), player.getCurrentAP());
 		updateAttackMoveButtonText();
 	}
 	private void updateSelectedMonster(Monster selectedMonster) {
@@ -206,8 +212,8 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 			return;
 		}
 		if (currentMonster.conditions.size()+currentMonster.immunities.size() > 0) {
-			if (currentMonster.conditions.size() > 0) world.tileManager.setImageViewTile(res, monsterConditionsButton, currentMonster.conditions.get(0).conditionType, false, Integer.toString(currentMonster.conditions.size()+currentMonster.immunities.size()), null);
-			else world.tileManager.setImageViewTile(res, monsterConditionsButton, currentMonster.immunities.get(0).conditionType, true, Integer.toString(currentMonster.conditions.size()+currentMonster.immunities.size()), null);
+			if (currentMonster.conditions.size() > 0) world.tileManager.setImageViewTile(getContext(), monsterConditionsButton, currentMonster.conditions.get(0).conditionType, false, Integer.toString(currentMonster.conditions.size()+currentMonster.immunities.size()), null);
+			else world.tileManager.setImageViewTile(getContext(), monsterConditionsButton, currentMonster.immunities.get(0).conditionType, true, Integer.toString(currentMonster.conditions.size()+currentMonster.immunities.size()), null);
 			showConditionsButton();
 			if (conditionsBarToggled) showConditionsBar();
 		} else {
@@ -240,9 +246,6 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 		if (activeConditionsBar.getVisibility() != View.VISIBLE) {
 			activeConditionsBar.setVisibility(View.VISIBLE);
 			if (preferences.enableUiAnimations) {
-//				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-//					monsterBar.getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
-//				}
 				activeConditionsBar.startAnimation(displayConditionsBarAnimation);
 			}
 		}
@@ -253,9 +256,6 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 	private void hideConditionsBar() {
 		if (activeConditionsBar.getVisibility() == View.VISIBLE) {
 			if (preferences.enableUiAnimations) {
-//				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-//					monsterBar.getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
-//				}
 				activeConditionsBar.startAnimation(hideConditionsBarAnimation);
 			} else {
 				activeConditionsBar.setVisibility(View.GONE);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java
new file mode 100644
index 000000000..77feae0c8
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java
@@ -0,0 +1,177 @@
+package com.gpl.rpg.AndorsTrail.view;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface.OnDismissListener;
+import android.graphics.Rect;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.ContextThemeWrapper;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+
+public class CustomDialogFactory {
+	
+	public static class CustomDialog extends Dialog {
+		public CustomDialog(Context context) {
+			super(context);
+		}
+		
+	}
+	
+	public static CustomDialog createDialog(final Context context, String title, Drawable icon, String desc, View content, boolean hasButtons) {
+		return createDialog(context, title, icon, desc, content, hasButtons, true);
+	}
+		
+	public static CustomDialog createDialog(final Context context, String title, Drawable icon, String desc, View content, boolean hasButtons, final boolean canDismiss) {
+		final CustomDialog dialog = new CustomDialog(new ContextThemeWrapper(context, ThemeHelper.getDialogTheme())) {
+			@Override
+			public boolean onTouchEvent(MotionEvent event) {
+				Rect r = new Rect();
+				this.getWindow().getDecorView().findViewById(R.id.dialog_hitrect).getHitRect(r);
+				
+				if (r.contains((int)event.getX(), (int)event.getY())) {
+					return super.onTouchEvent(event);
+				} else {
+					if (canDismiss) {
+						this.dismiss();
+						return true;
+					}
+					return false;
+				}
+			}
+			
+			@Override
+			public void onWindowFocusChanged(boolean hasFocus) {
+				super.onWindowFocusChanged(hasFocus);
+				TextView title = (TextView) this.getWindow().getDecorView().findViewById(R.id.dialog_title);
+				if (title != null && title.getCompoundDrawables() != null && title.getCompoundDrawables()[0] != null) {
+					if (title.getCompoundDrawables()[0] instanceof AnimationDrawable) {
+						((AnimationDrawable)title.getCompoundDrawables()[0]).start();
+					}
+				}
+			}
+		};
+		
+		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		dialog.setContentView(R.layout.custom_dialog_title_icon);
+		dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+		if (((AndorsTrailApplication)context.getApplicationContext()).getPreferences().fullscreen) {
+			dialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		} else {
+			dialog.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
+		
+		setTitle(dialog, title, icon);
+		
+		setDesc(dialog, desc);
+		
+		setContent(dialog, content);
+		
+		ViewGroup buttonsHolder = (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
+		if (hasButtons) {
+			buttonsHolder.setVisibility(View.VISIBLE);
+		} else {
+			buttonsHolder.setVisibility(View.GONE);
+		}
+		
+		return dialog;
+	}
+	
+	public static CustomDialog setTitle(final CustomDialog dialog, String title, Drawable icon) {
+		TextView titleView = (TextView) dialog.findViewById(R.id.dialog_title);
+		if (title != null || icon != null) {
+			titleView.setText(title);
+			titleView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+			titleView.setVisibility(View.VISIBLE);
+		} else {
+			titleView.setVisibility(View.GONE);
+		}
+		return dialog;
+	}
+	
+	public static CustomDialog setDesc(final CustomDialog dialog, String desc) {
+		TextView descView = (TextView) dialog.findViewById(R.id.dialog_description);
+		ViewGroup descHolder = (ViewGroup) dialog.findViewById(R.id.dialog_description_container);
+		if (desc != null) {
+			descView.setText(desc);
+			descHolder.setVisibility(View.VISIBLE);
+			descView.setVisibility(View.VISIBLE);
+		} else {
+			descHolder.setVisibility(View.GONE);
+		}
+		return dialog;
+	}
+	
+	public static CustomDialog setContent(final CustomDialog dialog, View content) {
+		ViewGroup contentHolder = (ViewGroup) dialog.findViewById(R.id.dialog_content_container);
+		if (content != null) {
+			contentHolder.addView(content);
+			contentHolder.setVisibility(View.VISIBLE);
+		} else {
+			contentHolder.setVisibility(View.GONE);
+		}
+		return dialog;
+	}
+	
+	public static Dialog addButton(final Dialog dialog, int textId, final OnClickListener listener) {
+		
+		Button template = (Button) dialog.findViewById(R.id.dialog_template_button);
+		LayoutParams params = template.getLayoutParams();
+		ViewGroup buttonsHolder = (ViewGroup) dialog.findViewById(R.id.dialog_button_container);
+		
+		Button b = new Button(dialog.getContext());
+		b.setLayoutParams(params);
+		//Old android versions need this "reminder"
+		b.setBackgroundDrawable(ThemeHelper.getThemeDrawable(dialog.getContext(), R.attr.ui_theme_textbutton_drawable));
+		b.setTextColor(ThemeHelper.getThemeColor(dialog.getContext(), R.attr.ui_theme_dialogue_light_color));
+		
+		b.setText(textId);
+		b.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				listener.onClick(v);
+				dialog.dismiss();
+			}
+		});
+		
+		buttonsHolder.addView(b, params);
+		return dialog;
+	}
+	
+	public static Dialog addDismissButton(final Dialog dialog, int textId) {
+		return CustomDialogFactory.addButton(dialog, textId, new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				dialog.dismiss();
+			}
+		});
+	}
+	
+	public static Dialog setDismissListener(Dialog dialog, OnDismissListener listener) {
+		dialog.setOnDismissListener(listener);
+		
+		return dialog;
+	}
+	
+	public static void show(Dialog dialog) {
+		
+		dialog.findViewById(R.id.dialog_template_button).setVisibility(View.GONE);
+		dialog.show();
+		
+	}
+
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java
new file mode 100644
index 000000000..f04c32d6b
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java
@@ -0,0 +1,101 @@
+package com.gpl.rpg.AndorsTrail.view;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
+
+public class CustomListPreference extends ListPreference {
+
+	//Extensive constructor support
+	public CustomListPreference(Context context) {
+		super(context);
+	}
+	public CustomListPreference(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+	//	Min API 21
+//	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+//	public CustomListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+//		super(context, attrs, defStyleAttr);
+//	}
+//	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+//	public CustomListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+//		super(context, attrs, defStyleAttr, defStyleRes);
+//	}
+
+	CustomDialog d = null;
+	int clickedEntryIndex = 0;
+
+	@Override
+	public Dialog getDialog() {
+		if (d == null) createDialog();
+		return d;
+	}
+
+	private void createDialog() {
+		final ListView choicesList = new ListView(getContext());
+		choicesList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+		choicesList.setBackgroundResource(android.R.color.transparent);
+		ArrayAdapter<CharSequence> choicesAdapter = new ArrayAdapter<CharSequence>(getContext(), R.layout.custom_checkedlistitem_layout, getEntries());
+		choicesList.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
+		choicesList.setAdapter(choicesAdapter);
+		choicesList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				if (getValue() != getEntryValues()[position]) {
+					CustomListPreference.this.notifyChanged();
+					clickedEntryIndex = position;
+					CustomListPreference.this.onClick(d, DialogInterface.BUTTON_POSITIVE);
+				} else {
+					CustomListPreference.this.onClick(d, DialogInterface.BUTTON_NEGATIVE);
+				}
+				d.dismiss();
+			}
+		});
+		choicesList.setItemChecked(getValueIndex(), true);
+		
+		d = CustomDialogFactory.createDialog(getContext(), getTitle().toString(), null, null, choicesList, false);
+	}
+
+	public int getValueIndex() {
+		int selectedPosition;
+		for (selectedPosition = getEntryValues().length - 1; selectedPosition >= 0; selectedPosition--) {
+			if (getValue().equals(getEntryValues()[selectedPosition].toString())) break;
+		}
+		return selectedPosition;
+	}
+	
+	@Override
+	protected void onDialogClosed(boolean positiveResult) {
+		CharSequence[] entryValues = getEntryValues();
+		if (positiveResult && clickedEntryIndex >= 0 && entryValues != null) {
+			String value = entryValues[clickedEntryIndex].toString();
+			if (callChangeListener(value)) {
+				setValue(value);
+			}
+		}
+	}
+
+	@Override
+	protected void showDialog(Bundle state) {
+		getDialog().setOnDismissListener(this);
+		getDialog().show();
+	}
+
+	@Override
+	public void onDismiss(DialogInterface dialog) {
+		d = null;
+		super.onDismiss(dialog);
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomMenuInflater.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomMenuInflater.java
new file mode 100644
index 000000000..b8c075bcd
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomMenuInflater.java
@@ -0,0 +1,562 @@
+package com.gpl.rpg.AndorsTrail.view;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.view.ActionProvider;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+import android.widget.TextView;
+
+public class CustomMenuInflater {
+	
+	public interface MenuItemSelectedListener {
+		public void onMenuItemSelected(MenuItem item, Object data);
+	}
+	
+	public static Dialog showMenuInDialog(Activity activity, Menu menu, Drawable icon, String title, Object data, MenuItemSelectedListener listener ) {
+		Dialog d = getMenuDialog(activity, menu, icon, title, data, listener);
+		d.show();
+		return d;
+	}
+	
+	public static Dialog getMenuDialog(Activity activity, Menu menu, Drawable icon, String title, Object data, MenuItemSelectedListener listener ) {
+		final CustomDialog dialog = CustomDialogFactory.createDialog(activity, title, icon, null, null, false);
+		View v = getMenuView(activity, menu, icon, title, data, dialog, listener);
+		v.setLayoutParams(getItemLayoutParams());
+		CustomDialogFactory.setContent(dialog, v);
+		v.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dialog.dismiss();
+			}
+		});
+		return dialog;
+	}
+
+	public static View getMenuView(Activity activity, Menu menu, Drawable icon, String title, Object data, Dialog dialog, MenuItemSelectedListener listener ) {
+		ViewGroup scroll = (ViewGroup) activity.getLayoutInflater().inflate(R.layout.custom_menu_layout, null);
+		ViewGroup vg = (ViewGroup) scroll.findViewById(R.id.custom_menu_items_wrapper);
+		MenuItem item;
+		boolean first =true;
+		for (int i = 0; i < menu.size(); i++) {
+			item = menu.getItem(i);
+			if (item.isVisible()) {
+				if (first) {
+					first = false;
+				} else {
+					addMenuItemSeparator(activity, vg);
+				}
+				if (item.hasSubMenu()) {
+					addSubMenuItemView(activity, vg, icon, title, item, data, dialog, listener);
+				} else {
+					addMenuItemView(activity, vg, item, data, dialog, listener);
+				}
+			}
+		}
+		return scroll;
+	}
+	
+	private static void addMenuItemView(Activity activity, ViewGroup vg, final MenuItem item, final Object data, final Dialog dialog, final MenuItemSelectedListener listener) {
+		TextView tv = (TextView) activity.getLayoutInflater().inflate(R.layout.custom_menu_item_layout, null);
+		tv.setText(item.getTitle());
+		tv.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				listener.onMenuItemSelected(item, data);
+				dialog.dismiss();
+			}
+		});
+		tv.setLayoutParams(getItemLayoutParams());
+		vg.addView(tv);
+	}
+	
+
+	
+	private static void addSubMenuItemView(final Activity activity, ViewGroup vg, final Drawable icon, final String title, final MenuItem item, final Object data, final Dialog dialog, final MenuItemSelectedListener listener) {
+		TextView tv = (TextView) activity.getLayoutInflater().inflate(R.layout.custom_menu_submenu_layout, null);
+		tv.setText(item.getTitle());
+		tv.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				showMenuInDialog(activity, item.getSubMenu(), icon, title, data, listener);
+				dialog.dismiss();
+			}
+		});
+		tv.setLayoutParams(getItemLayoutParams());
+		vg.addView(tv);
+	}
+	
+	
+	private static void addMenuItemSeparator(final Activity activity, ViewGroup vg) {
+		View v = activity.getLayoutInflater().inflate(R.layout.custom_menu_item_separator_layout, null);
+		v.setLayoutParams(getItemLayoutParams());
+		vg.addView(v);
+	}
+	
+	private static LayoutParams getItemLayoutParams() {
+		return new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+	}
+
+	public static Menu newMenuInstance(Context context) {
+		return new DummyMenu(context);
+	}
+	
+	private static class DummyMenu implements Menu {
+		
+		Context context;
+		List<MenuItem> items = new ArrayList<MenuItem>();
+		
+		public DummyMenu(Context context) {
+			this.context = context;
+		}
+
+		@Override
+		public MenuItem add(CharSequence title) {
+			MenuItem item = new DummyMenuItem(context, title, -1, null);
+			items.add(item);
+			return item;
+		}
+
+		@Override
+		public MenuItem add(int titleRes) {
+			return add(context.getString(titleRes));
+		}
+
+		@Override
+		public MenuItem add(int groupId, int itemId, int order, CharSequence title) {
+			MenuItem item = new DummyMenuItem(context, title, itemId, null);
+			items.add(item);
+			return item;
+		}
+
+		@Override
+		public MenuItem add(int groupId, int itemId, int order, int titleRes) {
+			return add(groupId, itemId, order, context.getString(titleRes));
+		}
+
+		@Override
+		public int addIntentOptions(int groupId, int itemId, int order, ComponentName caller, Intent[] specifics,
+				Intent intent, int flags, MenuItem[] outSpecificItems) {
+			return 0;
+		}
+
+		@Override
+		public SubMenu addSubMenu(CharSequence title) {
+			DummySubMenu sm = new DummySubMenu(context, title);
+			MenuItem item = new DummyMenuItem(context, title, 0, sm);
+			items.add(item);
+			return sm;
+		}
+
+		@Override
+		public SubMenu addSubMenu(int titleRes) {
+			return addSubMenu(context.getString(titleRes));
+		}
+
+		@Override
+		public SubMenu addSubMenu(int groupId, int itemId, int order, CharSequence title) {
+			DummySubMenu sm = new DummySubMenu(context, title);
+			MenuItem item = new DummyMenuItem(context, title, itemId, sm);
+			items.add(item);
+			return sm;
+		}
+
+		@Override
+		public SubMenu addSubMenu(int groupId, int itemId, int order, int titleRes) {
+			return addSubMenu(groupId, itemId, order, context.getString(titleRes));
+		}
+
+		@Override
+		public void clear() {
+			items.clear();
+		}
+
+		@Override
+		public void close() {
+			// TODO Auto-generated method stub
+			
+		}
+
+		@Override
+		public MenuItem findItem(int id) {
+			MenuItem found = null;
+			for (MenuItem item : items) {
+				if (item.getItemId() == id) return item;
+				if (item.hasSubMenu()) {
+					found = item.getSubMenu().findItem(id);
+					if (found != null) return found;
+				}
+			}
+			return null;
+		}
+
+		@Override
+		public MenuItem getItem(int index) {
+			return items.get(index);
+		}
+
+		@Override
+		public boolean hasVisibleItems() {
+			for (MenuItem item : items) {
+				if (item.isVisible()) return true;
+			}
+			return false;
+		}
+
+		@Override
+		public boolean isShortcutKey(int keyCode, KeyEvent event) {
+			return false;
+		}
+
+		@Override
+		public boolean performIdentifierAction(int id, int flags) {
+			return false;
+		}
+
+		@Override
+		public boolean performShortcut(int keyCode, KeyEvent event, int flags) {
+			return false;
+		}
+
+		@Override
+		public void removeGroup(int groupId) {
+		}
+
+		@Override
+		public void removeItem(int id) {
+			MenuItem found = null;
+			for (MenuItem item : items) {
+				if (item.getItemId() == id) found=item;
+				if (item.hasSubMenu()) {
+					item.getSubMenu().removeItem(id);
+				}
+			}
+		}
+
+		@Override
+		public void setGroupCheckable(int group, boolean checkable, boolean exclusive) {
+		}
+
+		@Override
+		public void setGroupEnabled(int group, boolean enabled) {
+		}
+
+		@Override
+		public void setGroupVisible(int group, boolean visible) {
+		}
+
+		@Override
+		public void setQwertyMode(boolean isQwerty) {
+		}
+
+		@Override
+		public int size() {
+			return items.size();
+		}
+		
+	}
+	
+	private static class DummyMenuItem implements MenuItem {
+
+		Context context;
+		CharSequence title;
+		int id;
+		DummySubMenu subMenu;
+		boolean visible = true;
+		
+		public DummyMenuItem(Context context, CharSequence title, int id, DummySubMenu subMenu) {
+			this.context = context;
+			this.title = title;
+			this.id = id;
+			this.subMenu = subMenu;
+			if (subMenu != null) subMenu.setItem(this);
+		}
+		
+		@Override
+		public boolean collapseActionView() {
+			return false;
+		}
+
+		@Override
+		public boolean expandActionView() {
+			return false;
+		}
+
+		@Override
+		public ActionProvider getActionProvider() {
+			return null;
+		}
+
+		@Override
+		public View getActionView() {
+			return null;
+		}
+
+		@Override
+		public char getAlphabeticShortcut() {
+			return 0;
+		}
+
+		@Override
+		public int getGroupId() {
+			return 0;
+		}
+
+		@Override
+		public Drawable getIcon() {
+			return null;
+		}
+
+		@Override
+		public Intent getIntent() {
+			return null;
+		}
+
+		@Override
+		public int getItemId() {
+			return id;
+		}
+
+		@Override
+		public ContextMenuInfo getMenuInfo() {
+			return null;
+		}
+
+		@Override
+		public char getNumericShortcut() {
+			return 0;
+		}
+
+		@Override
+		public int getOrder() {
+			return 0;
+		}
+
+		@Override
+		public SubMenu getSubMenu() {
+			return subMenu;
+		}
+
+		@Override
+		public CharSequence getTitle() {
+			return title;
+		}
+
+		@Override
+		public CharSequence getTitleCondensed() {
+			return null;
+		}
+
+		@Override
+		public boolean hasSubMenu() {
+			return subMenu != null;
+		}
+
+		@Override
+		public boolean isActionViewExpanded() {
+			return false;
+		}
+
+		@Override
+		public boolean isCheckable() {
+			return false;
+		}
+
+		@Override
+		public boolean isChecked() {
+			return false;
+		}
+
+		@Override
+		public boolean isEnabled() {
+			return true;
+		}
+
+		@Override
+		public boolean isVisible() {
+			return visible;
+		}
+
+		@Override
+		public MenuItem setActionProvider(ActionProvider actionProvider) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setActionView(View view) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setActionView(int resId) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setAlphabeticShortcut(char alphaChar) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setCheckable(boolean checkable) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setChecked(boolean checked) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setEnabled(boolean enabled) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setIcon(Drawable icon) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setIcon(int iconRes) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setIntent(Intent intent) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setNumericShortcut(char numericChar) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setOnActionExpandListener(OnActionExpandListener listener) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setOnMenuItemClickListener(OnMenuItemClickListener menuItemClickListener) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setShortcut(char numericChar, char alphaChar) {
+			return this;
+		}
+
+		@Override
+		public void setShowAsAction(int actionEnum) {
+		}
+
+		@Override
+		public MenuItem setShowAsActionFlags(int actionEnum) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setTitle(CharSequence title) {
+			this.title = title;
+			return this;
+		}
+
+		@Override
+		public MenuItem setTitle(int title) {
+			setTitle(context.getString(title));
+			return this;
+		}
+
+		@Override
+		public MenuItem setTitleCondensed(CharSequence title) {
+			return this;
+		}
+
+		@Override
+		public MenuItem setVisible(boolean visible) {
+			this.visible = visible;
+			return this;
+		}
+		
+	}
+	
+	private static class DummySubMenu extends DummyMenu implements SubMenu {
+
+		CharSequence title;
+		MenuItem parent;
+		
+		public DummySubMenu(Context context, CharSequence title) {
+			super(context);
+			this.title = title;
+		}
+		
+		@Override
+		public void clearHeader() {
+		}
+		
+		public void setItem(MenuItem item) {
+			this.parent = item;
+		}
+
+		@Override
+		public MenuItem getItem() {
+			return parent;
+		}
+
+		@Override
+		public SubMenu setHeaderIcon(int iconRes) {
+			return this;
+		}
+
+		@Override
+		public SubMenu setHeaderIcon(Drawable icon) {
+			return this;
+		}
+
+		@Override
+		public SubMenu setHeaderTitle(int titleRes) {
+			return this;
+		}
+
+		@Override
+		public SubMenu setHeaderTitle(CharSequence title) {
+			return this;
+		}
+
+		@Override
+		public SubMenu setHeaderView(View view) {
+			return this;
+		}
+
+		@Override
+		public SubMenu setIcon(int iconRes) {
+			return this;
+		}
+
+		@Override
+		public SubMenu setIcon(Drawable icon) {
+			return this;
+		}
+		
+		
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
index e8d0a967c..cab9df2d8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
@@ -5,9 +5,6 @@ import java.util.ArrayList;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Color;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.GradientDrawable.Orientation;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.Animation.AnimationListener;
@@ -15,7 +12,6 @@ import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
-import android.widget.TextView;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.R;
@@ -25,6 +21,7 @@ import com.gpl.rpg.AndorsTrail.controller.listeners.ActorConditionListener;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
 import com.gpl.rpg.AndorsTrail.model.actor.Actor;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class DisplayActiveActorConditionIcons implements ActorConditionListener {
 
@@ -63,6 +60,7 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 		ActiveConditionIcon icon = getFirstFreeIcon();
 		icon.setActiveCondition(condition, false);
 		icon.show();
+		updateIconState();
 	}
 
 	@Override
@@ -71,10 +69,15 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 		ActiveConditionIcon icon = getIconFor(condition, false);
 		if (icon == null) return;
 		icon.hide(true);
+		updateIconState();
 	}
 
 	@Override
-	public void onActorConditionDurationChanged(Actor actor, ActorCondition condition) {
+	public void onActorConditionDurationChanged(Actor actor, ActorCondition condition) { 
+		if (actor != target) return;
+		ActiveConditionIcon icon = getIconFor(condition, false);
+		if (icon == null) return;
+		icon.setIconAndText();
 	}
 
 	@Override
@@ -82,7 +85,7 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 		if (actor != target) return;
 		ActiveConditionIcon icon = getIconFor(condition, false);
 		if (icon == null) return;
-		icon.setIconText();
+		icon.setIconAndText();
 	}
 
 	@Override
@@ -100,6 +103,7 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 		ActiveConditionIcon icon = getFirstFreeIcon();
 		icon.setActiveCondition(condition, true);
 		icon.show();
+		updateIconState();
 	}
 
 	@Override
@@ -108,10 +112,15 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 		ActiveConditionIcon icon = getIconFor(condition, true);
 		if (icon == null) return;
 		icon.hide(true);
+		updateIconState();
 	}
 
 	@Override
 	public void onActorConditionImmunityDurationChanged(Actor actor, ActorCondition condition) {
+		if (actor != target) return;
+		ActiveConditionIcon icon = getIconFor(condition, false);
+		if (icon == null) return;
+		icon.setIconAndText();
 	}
 	
 	public void unsubscribe() {
@@ -134,14 +143,117 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 				getFirstFreeIcon().setActiveCondition(condition, true);
 			}
 		}
+		updateIconState();
+	}
+	
+	private static class ActiveConditionIconImageView extends ImageView {
+		enum Position { first, mid, last, single }
+		enum Direction { horizontal, vertical }
+		
+		private Position pos=Position.single;
+		private Direction dir=Direction.horizontal;
+		private boolean reverse=false;
+		
+		public ActiveConditionIconImageView(Context context) {
+			super(context);
+		}
+		
+		@Override
+		public int[] onCreateDrawableState(int extraSpace) {
+			int[] parentState =  super.onCreateDrawableState(extraSpace+3);
+			switch (pos) {
+			case first:
+				mergeDrawableStates(parentState, new int[]{R.attr.first});
+				break;
+			case last:
+				mergeDrawableStates(parentState, new int[]{R.attr.last});
+				break;
+			case single:
+				mergeDrawableStates(parentState, new int[]{R.attr.single});
+				break;
+			case mid:
+			default:
+				break;
+			}
+			switch (dir) {
+			case horizontal:
+				mergeDrawableStates(parentState, new int[]{R.attr.horizontal});
+				break;
+			case vertical:
+				mergeDrawableStates(parentState, new int[]{R.attr.vertical});
+				break;
+			default:
+				break;
+			}
+			if (reverse) mergeDrawableStates(parentState, new int[]{R.attr.reverse});
+			return parentState;
+		}
+		
+		public void setVertical() {
+			dir = Direction.vertical;
+			refreshDrawableState();
+		}
+		
+		public void setHorizontal() {
+			dir = Direction.horizontal;
+			refreshDrawableState();
+		}
+		
+		public void reverse() {
+			reverse = !reverse;
+			refreshDrawableState();
+		}
+		
+		public void setFirst() {
+			pos = Position.first;
+			refreshDrawableState();
+		}
+
+		public void setMid() {
+			pos = Position.mid;
+			refreshDrawableState();
+		}
+
+		public void setLast() {
+			pos = Position.last;
+			refreshDrawableState();
+		}
+
+		public void setSingle() {
+			pos = Position.single;
+			refreshDrawableState();
+		}
+		
+	}
+	
+	private void updateIconState() {
+		ActiveConditionIcon first = null;
+		ActiveConditionIcon last = null;
+		for (ActiveConditionIcon icon : currentConditionIcons) {
+			if (icon.isVisible()) {
+				if (first == null) {
+					first = icon;
+				} else {
+					icon.image.setMid();
+				}
+				last = icon;
+			}
+		}
+		if (first == null) return; 
+		if (first == last) {
+			first.image.setSingle();
+		} else if (last != null) {
+			first.image.setFirst();
+			last.image.setLast();
+		}
 	}
 
 	private final class ActiveConditionIcon implements AnimationListener {
 		public final int id;
 		private boolean immunity = false;
 		public ActorCondition condition;
-		public final ImageView image;
-		public final TextView text;
+		public final ActiveConditionIconImageView image;
+//		public final TextView text;
 		private final Animation onNewIconAnimation;
 		private final Animation onRemovedIconAnimation;
 		private final Animation onAppliedEffectAnimation;
@@ -149,39 +261,42 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 		
 		public ActiveConditionIcon(Context context, int id) {
 			this.id = id;
-			this.image = new ImageView(context);
+			this.image = new ActiveConditionIconImageView(context);
 			this.image.setId(id);
-			GradientDrawable grad = new GradientDrawable(target == world.model.player ? Orientation.BOTTOM_TOP : Orientation.TOP_BOTTOM, new int[]{Color.argb(190, 68, 68, 68), Color.argb(10, 34, 34, 34)});
-			grad.setCornerRadius(3);
-			this.image.setBackgroundDrawable(grad);
-			this.text = new TextView(context);
+			this.image.setBackgroundResource(ThemeHelper.getThemeResource(context, R.attr.ui_theme_buttonbar_drawable));
+			this.image.setHorizontal();
+			this.image.reverse();
 			this.onNewIconAnimation = AnimationUtils.loadAnimation(context, R.anim.scaleup);
 			this.onRemovedIconAnimation = AnimationUtils.loadAnimation(context, R.anim.scaledown);
 			this.onAppliedEffectAnimation = AnimationUtils.loadAnimation(context, R.anim.scalebeat);
 			this.onRemovedIconAnimation.setAnimationListener(this);
 
 			res = context.getResources();
-
-			text.setTextColor(res.getColor(android.R.color.white));
-			text.setShadowLayer(1, 1, 1, res.getColor(android.R.color.black));
 		}
 
 		private void setActiveCondition(ActorCondition condition, boolean immunity) {
 			this.immunity = immunity;
 			this.condition = condition;
-			tileManager.setImageViewTile(res, image, condition.conditionType, immunity);
+			
+			
+			setIconAndText();
 			image.setVisibility(View.VISIBLE);
-			setIconText();
 		}
 
-		public void setIconText() {
+		public void setIconAndText() {
+			String duration = null;
+			String magnitude = null;
 			boolean showMagnitude = (condition.magnitude != 1 && condition.magnitude != ActorCondition.MAGNITUDE_REMOVE_ALL);
 			if (showMagnitude) {
-				text.setText(Integer.toString(condition.magnitude));
-				text.setVisibility(View.VISIBLE);
-			} else {
-				text.setVisibility(View.GONE);
+				magnitude = "x"+Integer.toString(condition.magnitude);
 			}
+			if (condition.duration == ActorCondition.DURATION_FOREVER || condition.duration == ActorCondition.DURATION_NONE) {
+				duration = "\u221e";
+			} else {
+				duration = Integer.toString(condition.duration);
+			}
+			tileManager.setImageViewTile(DisplayActiveActorConditionIcons.this.androidContext.get(), image, condition.conditionType, immunity, magnitude, duration);
+			
 		}
 
 		public void hide(boolean useAnimation) {
@@ -195,12 +310,12 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 				image.setVisibility(View.GONE);
 				condition = null;
 			}
-			text.setVisibility(View.GONE);
+//			text.setVisibility(View.GONE);
 		}
 		public void show() {
 			if (!preferences.enableUiAnimations) return;
 			image.startAnimation(onNewIconAnimation);
-			if (text.getVisibility() == View.VISIBLE) text.startAnimation(onNewIconAnimation);
+//			if (text.getVisibility() == View.VISIBLE) text.startAnimation(onNewIconAnimation);
 		}
 
 		public void pulseAnimate() {
@@ -217,6 +332,7 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 			if (animation == this.onRemovedIconAnimation) {
 				hide(false);
 				rearrangeIconsLeftOf(this);
+				updateIconState();
 			}
 		}
 
@@ -265,10 +381,10 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 
 		activeConditions.addView(icon.image, getLayoutParamsForIconIndex(index));
 
-		RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-		layout.addRule(RelativeLayout.ALIGN_RIGHT, icon.id);
-		layout.addRule(RelativeLayout.ALIGN_BOTTOM, icon.id);
-		activeConditions.addView(icon.text, layout);
+//		RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+//		layout.addRule(RelativeLayout.ALIGN_RIGHT, icon.id);
+//		layout.addRule(RelativeLayout.ALIGN_BOTTOM, icon.id);
+//		activeConditions.addView(icon.text, layout);
 
 		currentConditionIcons.add(icon);
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
index e6dd5d639..0b22b5e19 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.controller.ItemController;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
index 607e9a63f..6452cae7d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
@@ -1,5 +1,8 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
@@ -11,9 +14,6 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 public final class ItemEffectsView extends LinearLayout {
 	private final TextView itemeffect_onequip_title;
 	private final AbilityModifierInfoView itemeffect_onequip_abilitymodifierinfo;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnHitReceived.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnHitReceived.java
index 911c871e5..03703fdeb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnHitReceived.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnHitReceived.java
@@ -1,5 +1,9 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.util.AttributeSet;
@@ -12,10 +16,6 @@ import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
 import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
 public final class ItemEffectsView_OnHitReceived extends LinearLayout {
 	private final LinearLayout itemeffect_onhitreceived_onsource_list;
 	private final LinearLayout itemeffect_onhitreceived_ontarget_list;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
index 61293d707..3ddd2de09 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
@@ -1,20 +1,21 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
 import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
 public final class ItemEffectsView_OnUse extends LinearLayout {
 	private final LinearLayout itemeffect_onuse_list;
 	private final ActorConditionEffectList itemeffect_onuse_conditions_source;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
index d533cde95..fddb124a4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
@@ -103,7 +103,6 @@ public final class MainView extends SurfaceView
 	private long scrollStartTime;
 	//TODO restore private final modifiers before release
 	public static long SCROLL_DURATION = Constants.MINIMUM_INPUT_INTERVAL;
-	
 	private int movingSprites = 0;
 	private SpriteMoveAnimationHandler movingSpritesRedrawTick = new SpriteMoveAnimationHandler(this);
 	
@@ -222,8 +221,10 @@ public final class MainView extends SurfaceView
 	}
 
 	private void redrawAll(RedrawAllDebugReason why) {
-		if (scrolling && why != RedrawAllDebugReason.MapScrolling) return;
-		if (!scrolling && movingSprites > 0 && why != RedrawAllDebugReason.SpriteMoved) return;
+		if (preferences.enableUiAnimations) {
+			if (scrolling && why != RedrawAllDebugReason.MapScrolling) return;
+			if (!scrolling && movingSprites > 0 && why != RedrawAllDebugReason.SpriteMoved) return;
+		}
 		redrawArea_(mapViewArea, null, 0, 0);
 	}
 	private void redrawTile(final Coord p, RedrawTileDebugReason why) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
index 660d6cadc..cd926cf9a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
@@ -7,6 +7,7 @@ import android.graphics.ColorMatrixColorFilter;
 import android.util.AttributeSet;
 import android.view.ContextMenu;
 import android.widget.Button;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
@@ -26,7 +27,7 @@ public final class QuickButton extends Button {
 	private final int textPadding;
 
 	public QuickButton(Context context, AttributeSet attrs) {
-		super(context, attrs);
+		super(context, attrs, R.attr.buttonQuickslotsButtonStyle);
 		menuInfo = new QuickButtonContextMenuInfo();
 		textPadding = getResources().getDimensionPixelSize(R.dimen.boxshape_margin);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
index 2fe1118a8..c66919c13 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
@@ -1,5 +1,7 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import java.util.HashSet;
+
 import android.R.color;
 import android.content.Context;
 import android.content.res.Resources;
@@ -9,6 +11,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.R;
@@ -20,8 +23,6 @@ import com.gpl.rpg.AndorsTrail.model.item.Inventory;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
 
-import java.util.HashSet;
-
 public final class QuickitemView extends LinearLayout implements OnClickListener, QuickSlotListener {
 	private static final int NUM_QUICK_SLOTS = Inventory.NUM_QUICK_SLOTS;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickslotsItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickslotsItemContainerAdapter.java
index 1c43dbfed..55dd89b1a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickslotsItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickslotsItemContainerAdapter.java
@@ -1,12 +1,5 @@
 package com.gpl.rpg.AndorsTrail.view;
 
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
-
 import android.content.Context;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
@@ -15,6 +8,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+
 public class QuickslotsItemContainerAdapter extends ItemContainerAdapter {
 	
 	public static final ItemEntry EMPTY_ENTRY = new ItemEntry(null, 0);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
index 0f4e26eee..60987ad86 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
@@ -5,6 +5,7 @@ import android.util.AttributeSet;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.util.Range;
 
@@ -29,6 +30,16 @@ public final class RangeBar extends RelativeLayout {
 		progressBar.setProgressDrawable(getResources().getDrawable(drawableID));
 		progressBar.setProgressDrawable(getResources().getDrawable(drawableID));
 		labelText.setText(labelTextID);
+		labelText.setSelected(true);
+	}
+	
+	public void setLargeLabel(boolean large) {
+		if (large) {
+			labelText.getLayoutParams().width = getResources().getDimensionPixelSize(R.dimen.rangebar_labelwidth_large);
+		} else {
+			labelText.getLayoutParams().width = getResources().getDimensionPixelSize(R.dimen.rangebar_labelwidth_small);
+		}
+		this.postInvalidate();
 	}
 
 	public void update(final Range range) { update(range.max, range.current); }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SelectableTextView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SelectableTextView.java
new file mode 100644
index 000000000..d85eb95df
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SelectableTextView.java
@@ -0,0 +1,62 @@
+package com.gpl.rpg.AndorsTrail.view;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.widget.Checkable;
+import android.widget.TextView;
+
+//Thanks to https://stackoverflow.com/questions/6205339/listview-item-selected-state-not-working
+
+public class SelectableTextView extends TextView implements Checkable {
+	private static final int[] CHECKED_STATE_SET = {
+			android.R.attr.state_checked
+	};
+
+	private boolean mChecked;
+
+	public SelectableTextView(Context context) {
+		super(context);
+	}
+
+	public SelectableTextView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public SelectableTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+	}
+
+//	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+//	public SelectableTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+//		super(context, attrs, defStyleAttr, defStyleRes);
+//	}
+
+	@Override
+	public void setChecked(boolean checked) {
+		if (mChecked != checked) {
+			mChecked = checked;
+			refreshDrawableState();
+		}
+	}
+
+	@Override
+	public boolean isChecked() {
+		return mChecked;
+	}
+
+	@Override
+	public void toggle() {
+		setSelected(!mChecked);
+	}
+
+	@Override
+	protected int[] onCreateDrawableState(int extraSpace) {
+		final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+		if (isChecked()) {
+			mergeDrawableStates(drawableState, CHECKED_STATE_SET);
+		}
+		return drawableState;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
index 0d2c7f36a..8cc80fcf4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
@@ -9,6 +9,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.controller.ItemController;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
index 930420511..d9c628bd3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
@@ -1,5 +1,11 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.view.View;
@@ -7,6 +13,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity;
 import com.gpl.rpg.AndorsTrail.controller.SkillController;
@@ -14,8 +21,6 @@ import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
 import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
-import java.util.*;
-
 public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
 	private final Resources r;
 	private final Player player;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SpinnerEmulator.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SpinnerEmulator.java
new file mode 100644
index 000000000..85dfa7da8
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SpinnerEmulator.java
@@ -0,0 +1,75 @@
+package com.gpl.rpg.AndorsTrail.view;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+
+/**
+ * Simply instantiate this class, implement abstract methods in an anonymous type, and tada, your Button is a Spinner! 
+ */
+public abstract class SpinnerEmulator {
+	
+	private Button spinnerButton;
+	private Dialog spinnerDialog = null;
+	private ListView choicesList;
+	private Context context;
+	
+	public SpinnerEmulator(Button b, int arrayResId, int promptResId) {
+		spinnerButton = b;
+		context=b.getContext();
+		initializeSpinnerEmulation(arrayResId, promptResId);
+	}
+	
+
+	public SpinnerEmulator(View v, int buttonId, int arrayResId, int promptResId) {
+		spinnerButton = (Button) v.findViewById(buttonId);
+		context=v.getContext();
+		initializeSpinnerEmulation(arrayResId, promptResId);
+	}
+	
+	public void initializeSpinnerEmulation(final int arrayResId, final int promptResId) {
+		choicesList = new ListView(context);//(Spinner) v.findViewById(R.id.inventorylist_category_filters);
+		choicesList.setBackgroundResource(android.R.color.transparent);
+		ArrayAdapter<CharSequence> skillCategoryFilterAdapter = ArrayAdapter.createFromResource(context, arrayResId, android.R.layout.simple_list_item_1);
+		choicesList.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
+		choicesList.setAdapter(skillCategoryFilterAdapter);
+		choicesList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				if (getValue() == position) {
+					spinnerDialog.dismiss();
+					return;
+				}
+				setValue(position);
+				spinnerButton.setText(context.getResources().getStringArray(arrayResId)[position]);
+				spinnerDialog.dismiss();
+				selectionChanged(position);
+			}
+		});
+		choicesList.setSelection(getValue());
+		
+		spinnerButton.setText(context.getResources().getStringArray(arrayResId)[getValue()]);
+		spinnerButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (spinnerDialog == null) {
+					spinnerDialog = CustomDialogFactory.createDialog(context, context.getString(promptResId), null, null, choicesList, false);
+				}
+				CustomDialogFactory.show(spinnerDialog);
+			}
+		});
+		
+		
+	}
+	
+	public abstract int getValue();
+	public abstract void setValue(int value);
+	public abstract void selectionChanged(int value);
+
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
index 2283eaf94..ffc1c9f38 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
@@ -3,13 +3,11 @@ package com.gpl.rpg.AndorsTrail.view;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.RelativeLayout;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
index c0e5743d0..6d72fc30e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
@@ -14,6 +14,7 @@ import android.view.animation.Animation.AnimationListener;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.Dialogs;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
index 32826865f..bba515af4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
@@ -5,6 +5,7 @@ import android.view.ViewGroup;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
+
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.model.actor.Actor;
 import com.gpl.rpg.AndorsTrail.util.Range;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
index 66d1db1ee..5155e5127 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
@@ -8,6 +8,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.R;