diff --git a/AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml b/AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml
index 086075947..f272c6b4e 100644
--- a/AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml
+++ b/AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml
@@ -5,4 +5,5 @@
  	<item android:state_enabled="true" android:state_checked="true" android:color="#ffffffff"/>
  	<item android:state_enabled="true" android:state_checked="false" android:color="#fff0f0f0"/>
  	<item android:state_enabled="false" android:color="#ff858585"/>
+ 	<item android:color="#fff0f0f0"/>
 </selector>
diff --git a/AndorsTrail/res/drawable/title_logo.png b/AndorsTrail/res/drawable/title_logo.png
index d97ce0bfb..dc1778b5c 100644
Binary files a/AndorsTrail/res/drawable/title_logo.png and b/AndorsTrail/res/drawable/title_logo.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_arrow.9.png b/AndorsTrail/res/drawable/ui_blue_spinner_arrow.9.png
index 67cbdac66..8f35afef1 100644
Binary files a/AndorsTrail/res/drawable/ui_blue_spinner_arrow.9.png and b/AndorsTrail/res/drawable/ui_blue_spinner_arrow.9.png differ
diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_blue_spinner_disabled_pressed.9.png
index 6ab60afed..f667c736f 100644
Binary files a/AndorsTrail/res/drawable/ui_blue_spinner_disabled_pressed.9.png 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
index 3f594b71a..409a1c431 100644
Binary files a/AndorsTrail/res/drawable/ui_blue_spinner_disabled_unpressed.9.png 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
index 999136796..e5e716199 100644
Binary files a/AndorsTrail/res/drawable/ui_blue_spinner_enabled_pressed.9.png 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
index a5663cef6..313e48ff7 100644
Binary files a/AndorsTrail/res/drawable/ui_blue_spinner_enabled_unpressed.9.png and b/AndorsTrail/res/drawable/ui_blue_spinner_enabled_unpressed.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..9d2f8bae0
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_blue_tabframe.9.png differ
diff --git a/AndorsTrail/res/layout-land/heroinfo_inventory.xml b/AndorsTrail/res/layout-land/heroinfo_inventory.xml
index 756db5ab4..57da0ca71 100644
--- a/AndorsTrail/res/layout-land/heroinfo_inventory.xml
+++ b/AndorsTrail/res/layout-land/heroinfo_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/AndorsTrail_Blue_StdFrame"
+    style="@style/AndorsTrail_Blue_TabFrame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal" >
@@ -65,7 +65,6 @@
                     android:id="@+id/inventorylist_sort_filters"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="5dp"
                     android:orientation="horizontal"
                     android:prompt="@string/heroinfo_inventory_sort" />
             </LinearLayout>
diff --git a/AndorsTrail/res/layout/combatview.xml b/AndorsTrail/res/layout/combatview.xml
index 456689017..07a3ea9f4 100644
--- a/AndorsTrail/res/layout/combatview.xml
+++ b/AndorsTrail/res/layout/combatview.xml
@@ -28,10 +28,9 @@
 
             <TextView
                 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"
diff --git a/AndorsTrail/res/layout/custom_dialog_title_icon.xml b/AndorsTrail/res/layout/custom_dialog_title_icon.xml
index 73e2016c1..26a595ce3 100644
--- a/AndorsTrail/res/layout/custom_dialog_title_icon.xml
+++ b/AndorsTrail/res/layout/custom_dialog_title_icon.xml
@@ -1,62 +1,84 @@
 <?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:fitsSystemWindows="true"
+    android:minHeight="53dip"
+    android:minWidth="50dp"
     android:orientation="vertical"
-    android:fitsSystemWindows="true" >
-    
-	<LinearLayout android:id="@+id/title_container"
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:orientation="horizontal"
-	    android:gravity="center_vertical"
-	    android:minHeight="53dp"
-	    android:paddingTop="6dp"
-	    android:paddingBottom="9dp"
-	    android:paddingStart="10dp"
-	    android:paddingEnd="10dp"
-	    android:background="@drawable/ui_blue_richframe"
-	    >
-	    
-	    <ImageView android:id="@+id/left_icon"
-	        android:layout_width="32dp"
-	        android:layout_height="32dp"
-	        android:layout_marginTop="6dp"
-	        android:layout_gravity="top"
-	        android:scaleType="fitCenter"
-	        />
-	    
-	    <TextView android:id="@+id/title"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_weight="0"
-	        android:paddingTop="2dp"
-	        android:paddingBottom="1dp"
-	        android:paddingStart="14dp"
-	        android:paddingEnd="14dp"
-	        />
-	    
-	    
-	</LinearLayout>
-	
-	<FrameLayout 
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_weight="1"
-	    android:orientation="vertical"
-	    android:background="@drawable/ui_blue_stdframe"
-	    >
-	    
-	    <FrameLayout android:id="@+id/content"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"/>
-	    
-	</FrameLayout>	    
+    android:paddingBottom="9dip"
+    android:paddingEnd="20dip"
+    android:paddingStart="20dip"
+    android:paddingTop="9dip" >
 
-	<LinearLayout android:id="@+id/button_container"
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:orientation="horizontal"
-	    android:gravity="center_horizontal">
-	    
-	</LinearLayout>
-	
-</LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="horizontal" />
+
+    <TextView
+        android:id="@+id/dialog_title"
+        style="@style/titleWithIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/ui_blue_richframe"
+        android:drawableLeft="@drawable/char_hero"
+        android:gravity="center_vertical" />
+
+    <LinearLayout
+        android:id="@+id/dialog_description_container"
+        style="@style/AndorsTrail_Blue_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingBottom="5dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:paddingTop="5dp" >
+
+        <TextView
+            android:id="@+id/dialog_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/dialog_content_container"
+        style="@style/AndorsTrail_Blue_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingBottom="5dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:paddingTop="5dp" />
+
+    <LinearLayout
+        android:id="@+id/dialog_button_container"
+        style="@style/AndorsTrail_Blue_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"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="horizontal" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/heroinfo_inventory.xml b/AndorsTrail/res/layout/heroinfo_inventory.xml
index ac6f8e99d..2e0ee1755 100644
--- a/AndorsTrail/res/layout/heroinfo_inventory.xml
+++ b/AndorsTrail/res/layout/heroinfo_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/AndorsTrail_Blue_StdFrame"
+    style="@style/AndorsTrail_Blue_TabFrame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
@@ -59,7 +59,6 @@
                 android:id="@+id/inventorylist_sort_filters"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="5dp"
                 android:orientation="horizontal"
                 android:prompt="@string/heroinfo_inventory_sort" />
         </LinearLayout>
diff --git a/AndorsTrail/res/layout/heroinfo_skill_list.xml b/AndorsTrail/res/layout/heroinfo_skill_list.xml
index 9ad21c882..81f58d2f9 100644
--- a/AndorsTrail/res/layout/heroinfo_skill_list.xml
+++ b/AndorsTrail/res/layout/heroinfo_skill_list.xml
@@ -3,7 +3,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
-	style="@style/AndorsTrail_Blue_StdFrame">
+	style="@style/AndorsTrail_Blue_TabFrame">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -31,14 +31,13 @@
 				android:id="@+id/skillList_category_filters"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginRight="10dp"
+				android:layout_marginRight="5dp"
 				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_marginRight="10dp"
 				android:prompt="@string/heroinfo_skill_sort" />
 
 		</LinearLayout>
diff --git a/AndorsTrail/res/layout/heroinfo_stats.xml b/AndorsTrail/res/layout/heroinfo_stats.xml
index ccc2a7884..797117b82 100644
--- a/AndorsTrail/res/layout/heroinfo_stats.xml
+++ b/AndorsTrail/res/layout/heroinfo_stats.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:layout_gravity="center_horizontal"
     android:orientation="vertical"
-	style="@style/AndorsTrail_Blue_StdFrame" >
+	style="@style/AndorsTrail_Blue_TabFrame" >
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/AndorsTrail/res/layout/levelup.xml b/AndorsTrail/res/layout/levelup.xml
index 0ef0fc43b..db4d03723 100644
--- a/AndorsTrail/res/layout/levelup.xml
+++ b/AndorsTrail/res/layout/levelup.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ui_blue_stdframe"
+    android:orientation="vertical"
     android:padding="@dimen/dialog_margin" >
 
     <TextView
@@ -14,63 +14,69 @@
         android:drawableLeft="@drawable/char_hero"
         android:text="@string/levelup_title" />
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/levelup_description"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:background="@drawable/ui_blue_stdframe"
+        android:text="@string/levelup_description" />
 
-        <TextView
-            android:id="@+id/levelup_description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/ui_blue_stdframe"
-            android:text="@string/levelup_description" />
+    <ScrollView
+        style="@style/AndorsTrail_Blue_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
 
         <LinearLayout
-            style="@style/AndorsTrail_Blue_StdFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" >
 
-            <Button
-                android:id="@+id/levelup_add_health"
+            <LinearLayout
+                style="@style/AndorsTrail_Blue_StdFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/levelup_add_health" />
+                android:orientation="vertical" >
 
-            <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_health"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/levelup_add_health" />
 
-            <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_attackchance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/levelup_add_attackchance" />
 
-            <Button
-                android:id="@+id/levelup_add_blockchance"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/levelup_add_blockchance" />
+                <Button
+                    android:id="@+id/levelup_add_attackdamage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/levelup_add_attackdamage" />
 
-            <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" />
+                <Button
+                    android:id="@+id/levelup_add_blockchance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/levelup_add_blockchance" />
 
-            <!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
+                <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" />
 
-            <ListView
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@null" />
+                <!-- 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>
         </LinearLayout>
-    </LinearLayout>
+    </ScrollView>
 
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/loadsave.xml b/AndorsTrail/res/layout/loadsave.xml
index a699ccbda..d531dc9e5 100644
--- a/AndorsTrail/res/layout/loadsave.xml
+++ b/AndorsTrail/res/layout/loadsave.xml
@@ -42,7 +42,8 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@android:string/unknownName"
-				android:layout_marginBottom="5dp"
+				android:layout_marginTop="2dp"
+				android:layout_marginBottom="2dp"
 				/>
 		</LinearLayout>
 
diff --git a/AndorsTrail/res/layout/monsterencounter.xml b/AndorsTrail/res/layout/monsterencounter.xml
index dd7830e9a..70d6810d1 100644
--- a/AndorsTrail/res/layout/monsterencounter.xml
+++ b/AndorsTrail/res/layout/monsterencounter.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/ui_blue_richframe"
         android:drawableLeft="@drawable/equip_weapon"
-        android:gravity="center"
+        android:gravity="start"
         android:text="@string/dialog_monsterencounter_title" />
 
     <LinearLayout
diff --git a/AndorsTrail/res/layout/monsterinfo.xml b/AndorsTrail/res/layout/monsterinfo.xml
index d59fc71e9..7a38539c5 100644
--- a/AndorsTrail/res/layout/monsterinfo.xml
+++ b/AndorsTrail/res/layout/monsterinfo.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/ui_blue_richframe"
         android:drawableLeft="@drawable/char_hero"
-        android:gravity="center"
+        android:gravity="left"
         android:text="@string/dialog_monsterencounter_info" />
 
     <ScrollView
diff --git a/AndorsTrail/res/layout/questlog.xml b/AndorsTrail/res/layout/questlog.xml
index e755ebdd6..e2aa8b675 100644
--- a/AndorsTrail/res/layout/questlog.xml
+++ b/AndorsTrail/res/layout/questlog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/AndorsTrail_Blue_StdFrame"
+    style="@style/AndorsTrail_Blue_TabFrame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
@@ -9,11 +9,12 @@
         style="@style/AndorsTrail_Blue_StdFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="right"
         android:orientation="vertical" >
 
         <Spinner
             android:id="@+id/questlog_includecompleted"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:prompt="@string/questlog_includecompleted_prompt" />
     </LinearLayout>
diff --git a/AndorsTrail/res/layout/quickbuttons_usable_inventory.xml b/AndorsTrail/res/layout/quickbuttons_usable_inventory.xml
index ef213868f..c15fb49da 100644
--- a/AndorsTrail/res/layout/quickbuttons_usable_inventory.xml
+++ b/AndorsTrail/res/layout/quickbuttons_usable_inventory.xml
@@ -13,13 +13,11 @@
         android:background="@drawable/ui_blue_richframe"
         android:drawableLeft="@drawable/ui_icon_equipment"
         android:gravity="center"
-        android:paddingTop="3sp"
         android:text="@string/inventory_assign" />
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="5dp"
         android:background="@drawable/ui_blue_stdframe"
         android:text="@string/inventory_selectitem"
         android:textColor="@color/ui_blue_textbutton_textcolor" />
diff --git a/AndorsTrail/res/layout/rangebar.xml b/AndorsTrail/res/layout/rangebar.xml
index 45706aed4..77df26d95 100644
--- a/AndorsTrail/res/layout/rangebar.xml
+++ b/AndorsTrail/res/layout/rangebar.xml
@@ -10,9 +10,11 @@
 		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="#fff0f0f0"
 		android:shadowColor="#000"
 		/>
 
diff --git a/AndorsTrail/res/layout/shoplist.xml b/AndorsTrail/res/layout/shoplist.xml
index 233240252..ed6f66d01 100644
--- a/AndorsTrail/res/layout/shoplist.xml
+++ b/AndorsTrail/res/layout/shoplist.xml
@@ -3,13 +3,12 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:gravity="left"
+	style="@style/AndorsTrail_Blue_TabFrame"
 	android:orientation="vertical">
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="5dp"
-		android:layout_marginTop="10dp"
 		style="@style/AndorsTrail_Blue_StdFrame"
 		android:orientation="horizontal">
 
@@ -18,16 +17,21 @@
 			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"
 			android:layout_gravity="left"
 			/>
+		
+		<LinearLayout 
+		    android:layout_width="0dp"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="1"
+		    />
+		
 		<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_gravity="right"
 			android:prompt="@string/shop_item_sort" />
diff --git a/AndorsTrail/res/layout/skill_info_view.xml b/AndorsTrail/res/layout/skill_info_view.xml
index c0c2cf134..489b1aaa4 100644
--- a/AndorsTrail/res/layout/skill_info_view.xml
+++ b/AndorsTrail/res/layout/skill_info_view.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/ui_blue_richframe"
         android:drawableLeft="@drawable/ui_icon_skill"
-        android:gravity="center"
+        android:gravity="start"
         android:text="@string/heroinfo_skill" />
 
     <ScrollView
diff --git a/AndorsTrail/res/values-v14/ui_styles.xml b/AndorsTrail/res/values-v14/ui_styles.xml
index 4f3efac69..673e0f810 100644
--- a/AndorsTrail/res/values-v14/ui_styles.xml
+++ b/AndorsTrail/res/values-v14/ui_styles.xml
@@ -13,6 +13,7 @@
 	    <item name="android:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
 	    <item name="android:alertDialogTheme">@style/AndorsTrailStyle.Dialog</item>
 	    <item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
+		<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
 	    <!-- <item name="android:toastFrameBackground">@drawable/ui_blue_richframe</item> -->
 	</style>
 	
@@ -32,6 +33,7 @@
 	    <item name="android:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
 	    <item name="android:alertDialogTheme">@style/AndorsTrailStyle.Dialog.Alert</item>
 	    <item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
+		<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
 	</style>
 	
 	<style name="AndorsTrail_Blue_TextButton" parent="android:style/Widget.Button">
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index f5c50a110..a19d38568 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -553,6 +553,7 @@
 	<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>
diff --git a/AndorsTrail/res/values/ui_dimen.xml b/AndorsTrail/res/values/ui_dimen.xml
index 322b4246c..075a07d51 100644
--- a/AndorsTrail/res/values/ui_dimen.xml
+++ b/AndorsTrail/res/values/ui_dimen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<dimen name="smalltext">10sp</dimen>
+	<dimen name="smalltext">12sp</dimen>
 	<dimen name="smalltext_buttonheight">35sp</dimen>
 	<dimen name="titletext">20sp</dimen>
 
diff --git a/AndorsTrail/res/values/ui_styles.xml b/AndorsTrail/res/values/ui_styles.xml
index f891605b1..01bcc9b2d 100644
--- a/AndorsTrail/res/values/ui_styles.xml
+++ b/AndorsTrail/res/values/ui_styles.xml
@@ -1,144 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-	
-	<style name="AndorsTrailStyle" parent="android:Theme">
-	    <item name="android:buttonStyle">@style/AndorsTrail_Blue_TextButton</item>
-	    <item name="android:buttonStyleToggle">@style/AndorsTrail_Blue_ToggleButton</item>
-	    <item name="android:imageButtonStyle">@style/AndorsTrail_Blue_ImageButton</item>
-	    <item name="android:checkboxStyle">@style/AndorsTrail_Blue_Checkbox</item>
-	    <item name="android:radioButtonStyle">@style/AndorsTrail_Blue_RadioButton</item>
-	    <item name="android:listViewStyle">@style/AndorsTrail_Blue_List</item>
-	    <item name="android:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
-	    <item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
-	    <item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
-	</style>
-	<style name="AndorsTrailStyle.NoBackground" parent="AndorsTrailStyle">
-		<item name="android:windowBackground">@null</item>
-	</style>
-	<style name="AndorsTrailStyle.Dialog" parent="android:Theme.Dialog">
-	    <item name="android:buttonStyle">@style/AndorsTrail_Blue_TextButton</item>
-	    <item name="android:imageButtonStyle">@style/AndorsTrail_Blue_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_Blue_Checkbox</item>
-	    <item name="android:radioButtonStyle">@style/AndorsTrail_Blue_RadioButton</item>
-	    <item name="android:listViewStyle">@style/AndorsTrail_Blue_List</item>
-	    <item name="android:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
-	    <item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
-	    <item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
-	</style>
-	<style name="AndorsTrailStyle.Dialog.Alert" parent="AndorsTrailStyle.Dialog">
-		<item name="android:background">@null</item>
-		<item name="android:windowBackground">@drawable/ui_blue_stdframe</item>
-		<item name="android:windowTitleStyle">@style/AndorsTrailStyle.DialogWindowTitle</item>
-		<!-- <item name="android:dialogTitleDecorLayout">@layout/custom_dialog_title_icon</item>
+
+    <style name="AndorsTrailStyle" parent="android:Theme">
+        <item name="android:buttonStyle">@style/AndorsTrail_Blue_TextButton</item>
+        <item name="android:buttonStyleToggle">@style/AndorsTrail_Blue_ToggleButton</item>
+        <item name="android:imageButtonStyle">@style/AndorsTrail_Blue_ImageButton</item>
+        <item name="android:checkboxStyle">@style/AndorsTrail_Blue_Checkbox</item>
+        <item name="android:radioButtonStyle">@style/AndorsTrail_Blue_RadioButton</item>
+        <item name="android:listViewStyle">@style/AndorsTrail_Blue_List</item>
+        <item name="android:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
+        <item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
+        <item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
+        <item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
+    </style>
+
+    <style name="AndorsTrailStyle.NoBackground" parent="AndorsTrailStyle">
+        <item name="android:windowBackground">@null</item>
+    </style>
+
+    <style name="AndorsTrailStyle.Dialog" parent="android:Theme.Dialog">
+        <item name="android:buttonStyle">@style/AndorsTrail_Blue_TextButton</item>
+        <item name="android:imageButtonStyle">@style/AndorsTrail_Blue_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_Blue_Checkbox</item>
+        <item name="android:radioButtonStyle">@style/AndorsTrail_Blue_RadioButton</item>
+        <item name="android:listViewStyle">@style/AndorsTrail_Blue_List</item>
+        <item name="android:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
+        <item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
+        <item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
+        <item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
+    </style>
+
+    <style name="AndorsTrailStyle.Dialog.Alert" parent="AndorsTrailStyle.Dialog">
+        <item name="android:background">@null</item>
+        <item name="android:windowBackground">@drawable/ui_blue_stdframe</item>
+        <item name="android:windowTitleStyle">@style/AndorsTrailStyle.DialogWindowTitle</item>
+        <!--
+        <item name="android:dialogTitleDecorLayout">@layout/custom_dialog_title_icon</item>
 		<item name="android:dialogCustomTitleDecorLayout">@layout/custom_dialog_title_icon</item>
-		<item name="android:dialogTitleIconsDecorLayout">@layout/custom_dialog_title_icon</item> -->
-	</style>
-	
-	<style name="AndorsTrailStyle.DialogWindowTitle" > <!-- parent="android:style/DialogWindowTitle" -->
-	    <item name="android:background">@drawable/ui_blue_richframe</item>
-	    <item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
-	</style>
-	
-	<style name="AndorsTrail_Blue_List" parent="android:style/Widget.ListView">
-	    <item name="android:background">@drawable/ui_blue_stdframe</item>
-	</style>
-	    
-	
-	<style name="AndorsTrail_Blue_TextButton" parent="android:style/Widget.Button">
-	    <item name="android:background">@drawable/ui_blue_textbutton</item>
-	    <item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
-	</style>
-	<style name="AndorsTrail_Blue_ImageButton" parent="android:style/Widget.ImageButton">
-	    <item name="android:background">@drawable/ui_blue_textbutton</item>
-	</style>
-	<style name="AndorsTrail_Blue_ToggleButton" parent="android:style/Widget.Button.Toggle">
-	    <item name="android:background">@drawable/ui_blue_togglebutton</item>
-	</style>
-	<style name="AndorsTrail_Blue_RadioButton" parent="android:style/Widget.CompoundButton.RadioButton">
-	    <item name="android:button">@drawable/ui_blue_radiobutton</item>
-	    <item name="android:paddingLeft">20dp</item>
-	</style>
-	<style name="AndorsTrail_Blue_Checkbox" parent="android:style/Widget.CompoundButton.CheckBox">
-	    <item name="android:button">@drawable/ui_blue_radiobutton</item>
-	</style>
-	<style name="AndorsTrail_Blue_Spinner" parent="android:style/Widget.Spinner">
-	    <item name="android:background">@drawable/ui_blue_spinner</item>
-		<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
-		<item name="android:textAppearance">@color/ui_blue_textbutton_textcolor</item>
-	</style>
-	<style name="AndorsTrail_Blue_SpinnerDropDown" parent="android:style/Widget.DropDownItem.Spinner">
-	    <item name="android:background">@drawable/ui_blue_spinner_list_bg</item>
-		<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
-		<item name="android:checkMark">@drawable/ui_blue_radiobutton</item>
-	</style>
-	
-	
-	
-	<style name="AndorsTrail_Blue_RichFrame">
-	    <item name="android:background">@drawable/ui_blue_richframe</item>
-	</style>
-	
-	<style name="AndorsTrail_Blue_StdFrame">
-	    <item name="android:background">@drawable/ui_blue_stdframe</item>
-	</style>
-	
-	<style name="AndorsTrail_Blue_LightFrame">
-	    <item name="android:background">@drawable/ui_blue_lightframe</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>
+		<item name="android:dialogTitleIconsDecorLayout">@layout/custom_dialog_title_icon</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">@color/ui_blue_textbutton_textcolor</item>
-	</style>
+    <style name="AndorsTrailStyle.DialogWindowTitle"> <!-- parent="android:style/DialogWindowTitle" -->
+        <item name="android:background">@drawable/ui_blue_richframe</item>
+        <item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
+    </style>
 
-	<style name="statsBoxStyle" parent="android:Widget.TextView">
-		<item name="android:background">@drawable/ui_blue_richframe</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="AndorsTrail_Blue_List" parent="android:style/Widget.ListView">
+        <item name="android:background">@drawable/ui_blue_stdframe</item>
+    </style>
 
-	<style name="quickButton" parent="@style/AndorsTrail_Blue_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="AndorsTrail_Blue_TextButton" parent="android:style/Widget.Button">
+        <item name="android:background">@drawable/ui_blue_textbutton</item>
+        <item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
+    </style>
 
-	<style name="toolboxButtonTile" parent="@style/AndorsTrail_Blue_TextButton">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-	</style>
+    <style name="AndorsTrail_Blue_ImageButton" parent="android:style/Widget.ImageButton">
+        <item name="android:background">@drawable/ui_blue_textbutton</item>
+    </style>
 
-	<style name="toolboxButtonDrawable" parent="@style/AndorsTrail_Blue_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="AndorsTrail_Blue_ToggleButton" parent="android:style/Widget.Button.Toggle">
+        <item name="android:background">@drawable/ui_blue_togglebutton</item>
+    </style>
 
-	<style name="traitsinfo_label" parent="android:Widget.TextView">
-		<item name="android:layout_marginRight">10sp</item>
-	</style>
+    <style name="AndorsTrail_Blue_RadioButton" parent="android:style/Widget.CompoundButton.RadioButton">
+        <item name="android:button">@drawable/ui_blue_radiobutton</item>
+        <item name="android:paddingLeft">20dp</item>
+    </style>
 
-	<style name="traitsinfo_2linelabel" parent="android:Widget.TextView">
-	</style>
+    <style name="AndorsTrail_Blue_Checkbox" parent="android:style/Widget.CompoundButton.CheckBox">
+        <item name="android:button">@drawable/ui_blue_radiobutton</item>
+    </style>
+
+    <style name="AndorsTrail_Blue_Spinner" parent="android:style/Widget.Spinner">
+        <item name="android:background">@drawable/ui_blue_spinner</item>
+        <item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
+        <item name="android:textAppearance">@color/ui_blue_textbutton_textcolor</item>
+        <item name="android:gravity">start</item>
+    </style>
+
+    <style name="AndorsTrail_Blue_SpinnerDropDown" parent="android:style/Widget.DropDownItem.Spinner">
+        <item name="android:background">@drawable/ui_blue_spinner_list_bg</item>
+        <item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
+        <item name="android:checkMark">@drawable/ui_blue_radiobutton</item>
+    </style>
+
+    <style name="AndorsTrail_Blue_SpinnerCollapsed" parent="android:style/Widget.DropDownItem">
+        <item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
+    </style>
+
+    <style name="AndorsTrail_Blue_RichFrame">
+        <item name="android:background">@drawable/ui_blue_richframe</item>
+    </style>
+
+    <style name="AndorsTrail_Blue_StdFrame">
+        <item name="android:background">@drawable/ui_blue_stdframe</item>
+    </style>
+
+    <style name="AndorsTrail_Blue_TabFrame">
+        <item name="android:background">@drawable/ui_blue_tabframe</item>
+    </style>
+
+    <style name="AndorsTrail_Blue_LightFrame">
+        <item name="android:background">@drawable/ui_blue_lightframe</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>
+        <item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
+    </style>
+
+    <style name="statsBoxStyle" parent="android:Widget.TextView">
+        <item name="android:background">@drawable/ui_blue_richframe</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" parent="@style/AndorsTrail_Blue_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_Blue_TextButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="toolboxButtonDrawable" parent="@style/AndorsTrail_Blue_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>
 
-	<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/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index b66da7262..5b54fb3d6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -1,5 +1,10 @@
 package com.gpl.rpg.AndorsTrail;
 
+import java.util.Locale;
+
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
@@ -7,10 +12,6 @@ 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 {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
index 69f0d2d62..dc4c07076 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
@@ -1,25 +1,20 @@
 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.support.v4.app.Fragment;
-import android.view.ContextThemeWrapper;
-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 java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 
-import com.gpl.rpg.AndorsTrail.activity.*;
+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.CustomDialog;
+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;
@@ -33,9 +28,22 @@ 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;
+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.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+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;
 
 public final class Dialogs {
 
@@ -44,14 +52,14 @@ public final class Dialogs {
 	}
 	private static void showDialogAndPause(Dialog d, final ControllerContext context, final OnDismissListener onDismiss) {
 		context.gameRoundController.pause();
-		d.setOnDismissListener(new OnDismissListener() {
+		CustomDialog.setDismissListener(d, new OnDismissListener() {
 			@Override
 			public void onDismiss(DialogInterface arg0) {
 				if (onDismiss != null) onDismiss.onDismiss(arg0);
 				context.gameRoundController.resume();
 			}
 		});
-		d.show();
+		CustomDialog.show(d);
 	}
 
 	public static void showKeyArea(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
@@ -180,7 +188,7 @@ public final class Dialogs {
 	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.setPadding(20, 0, 20, 20);
 		itemList.setOnItemClickListener(new OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
@@ -202,24 +210,41 @@ public final class Dialogs {
 		});
 		itemList.setAdapter(new ItemContainerAdapter(mainActivity, world.tileManager, combinedLoot.items, world.model.player));
 
-		AlertDialog.Builder db = new AlertDialog.Builder(new ContextThemeWrapper(mainActivity, R.style.AndorsTrailStyle))
-		.setTitle(title)
-		.setMessage(msg)
-		.setIcon(new BitmapDrawable(mainActivity.getResources(), world.tileManager.preloadedTiles.getBitmap(TileManager.iconID_groundbag)))
-		.setNegativeButton(R.string.dialog_close, null)
-		.setView(itemList);
+//		AlertDialog.Builder db = new AlertDialog.Builder(new ContextThemeWrapper(mainActivity, R.style.AndorsTrailStyle))
+//		.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);
-				}
-			});
-		}
+//		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();
 
-		final Dialog d = db.create();
+		final Dialog d = CustomDialog.createDialog(mainActivity, 
+				mainActivity.getResources().getString(title), 
+				new BitmapDrawable(mainActivity.getResources(), world.tileManager.preloadedTiles.getBitmap(TileManager.iconID_groundbag)), 
+				msg, 
+				combinedLoot.items.isEmpty() ? null : itemList, 
+				true);
+		
 
+		CustomDialog.addButton(d, R.string.dialog_loot_pickall, new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				controllers.itemController.pickupAll(lootBags);
+			}
+		});
+		
+		CustomDialog.addDismissButton(d, R.string.dialog_close);
+		
 		showDialogAndPause(d, controllers, new OnDismissListener() {
 			@Override
 			public void onDismiss(DialogInterface arg0) {
@@ -245,36 +270,74 @@ public final class Dialogs {
 	}
 
 	public static void showConfirmRest(final Activity currentActivity, final ControllerContext controllerContext, final MapObject area) {
-		Dialog d = new AlertDialog.Builder(new ContextThemeWrapper(currentActivity, R.style.AndorsTrailStyle))
-		.setTitle(R.string.dialog_rest_title)
-		.setMessage(R.string.dialog_rest_confirm_message)
-		.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+//		Dialog d = new AlertDialog.Builder(new ContextThemeWrapper(currentActivity, R.style.AndorsTrailStyle))
+//		.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();
+		final Dialog d = CustomDialog.createDialog(currentActivity, 
+				currentActivity.getResources().getString(R.string.dialog_rest_title), 
+				null, 
+				currentActivity.getResources().getString(R.string.dialog_rest_confirm_message), 
+				null, 
+				true);
+		
+		CustomDialog.addButton(d, android.R.string.yes, new View.OnClickListener() {
 			@Override
-			public void onClick(DialogInterface dialog, int which) {
+			public void onClick(View v) {
 				controllerContext.mapController.rest(area);
 			}
-		})
-		.setNegativeButton(android.R.string.no, null)
-		.create();
+		});
+		
+		CustomDialog.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();
+//		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 = CustomDialog.createDialog(currentActivity, 
+				currentActivity.getResources().getString(R.string.dialog_rest_title), 
+				null, 
+				currentActivity.getResources().getString(R.string.dialog_rest_message), 
+				null, 
+				true);
+		
+		
+		CustomDialog.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();
+//		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 = CustomDialog.createDialog(currentActivity, 
+				currentActivity.getResources().getString(R.string.dialog_newversion_title), 
+				null, 
+				currentActivity.getResources().getString(R.string.dialog_newversion_message), 
+				null, 
+				true);
+		
+		
+		CustomDialog.addDismissButton(d, android.R.string.ok);
+
+		CustomDialog.show(d);
 	}
 
 	public static boolean showSave(final Activity mainActivity, final ControllerContext controllerContext, final WorldContext world) {
@@ -337,21 +400,37 @@ public final class Dialogs {
 	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));
+		ListView itemList = null;
+		String msg = null;
+		if (combatLogMessages.length > 0) {
+			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));
+		} else {
+			msg = context.getResources().getString(R.string.combat_log_noentries);
+		}
 
-		final Dialog d = new AlertDialog.Builder(new ContextThemeWrapper(context, R.style.AndorsTrailStyle))
-				.setTitle(R.string.combat_log_title)
-				.setIcon(R.drawable.ui_icon_combat)
-				.setNegativeButton(R.string.dialog_close, null)
-				.setView(itemList)
-				.create();
+//		final Dialog d = new AlertDialog.Builder(new ContextThemeWrapper(context, R.style.AndorsTrailStyle))
+//				.setTitle(R.string.combat_log_title)
+//				.setIcon(R.drawable.ui_icon_combat)
+//				.setNegativeButton(R.string.dialog_close, null)
+//				.setView(itemList)
+//				.create();
 
+		final Dialog d = CustomDialog.createDialog(context, 
+				context.getResources().getString(R.string.combat_log_title), 
+				context.getResources().getDrawable(R.drawable.ui_icon_combat), 
+				msg, 
+				itemList, 
+				true);
+		
+		
+		CustomDialog.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 e93999bf6..44dadbf73 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
@@ -1,15 +1,16 @@
 package com.gpl.rpg.AndorsTrail;
 
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.AsyncTask;
+import java.lang.ref.WeakReference;
+
 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;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.AsyncTask;
 
 public final class WorldSetup {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
index d65ecc1d0..18e5a657f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
@@ -1,5 +1,8 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+
 import android.app.Activity;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -11,8 +14,6 @@ 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;
 
 public final class AboutActivity extends Activity implements ImageGetter {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
index 2fbb327e3..ae1736a54 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
@@ -1,5 +1,12 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+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.view.AbilityModifierInfoView;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse;
+
 import android.app.Activity;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -9,12 +16,6 @@ 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.view.AbilityModifierInfoView;
-import com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse;
 
 public final class ActorConditionInfoActivity extends Activity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
index 20363130f..6345600f8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
@@ -1,8 +1,13 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+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 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 +22,6 @@ 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;
 
 /**
  * @author ejwessel
@@ -192,18 +192,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 = CustomDialog.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);
+					CustomDialog.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();
+					});
+					CustomDialog.addDismissButton(d, android.R.string.no);
+					CustomDialog.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 c7ea8c318..ad08e7a72 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -1,5 +1,22 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import java.util.ArrayList;
+
+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.controller.ConversationController;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+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 android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -16,26 +33,15 @@ 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.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;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.ConversationController;
-import com.gpl.rpg.AndorsTrail.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
-import com.gpl.rpg.AndorsTrail.model.item.Loot;
-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;
 
 public final class ConversationActivity
 		extends Activity
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/CustomDialog.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/CustomDialog.java
new file mode 100644
index 000000000..c903b00f9
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/CustomDialog.java
@@ -0,0 +1,111 @@
+package com.gpl.rpg.AndorsTrail.activity;
+
+import com.gpl.rpg.AndorsTrail.R;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface.OnDismissListener;
+import android.graphics.drawable.Drawable;
+import android.view.ContextThemeWrapper;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class CustomDialog {
+	
+	private static final int MIN_RES_ID=0x7f040000;
+	
+	public static Dialog createDialog(final Context context, String title, Drawable icon, String desc, View content, boolean hasButtons) {
+		Dialog dialog = new Dialog(new ContextThemeWrapper(context, R.style.AndorsTrailStyle_Dialog));
+		
+		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		dialog.setContentView(R.layout.custom_dialog_title_icon);
+		dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+
+		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);
+		}
+		
+		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);
+		}
+		
+		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);
+		}
+		
+		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 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);
+		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 CustomDialog.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/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
index 80edaf577..6e5da7bf3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
@@ -1,5 +1,12 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+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.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.view.View;
@@ -7,12 +14,6 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-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.item.ItemType;
-import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 
 public final class DebugInterface {
 	private final ControllerContext controllerContext;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
index 2f48611c8..8c0e671e5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
@@ -1,5 +1,15 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import java.io.File;
+
+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 android.annotation.SuppressLint;
 import android.app.Activity;
 import android.os.Build;
@@ -10,15 +20,6 @@ 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.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;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
index f17600a4e..6af3e397f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
@@ -1,11 +1,5 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTabHost;
-import android.widget.ImageView;
-
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Inventory;
@@ -14,6 +8,12 @@ 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 android.content.res.Resources;
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentTabHost;
+import android.widget.ImageView;
+
 public final class HeroinfoActivity extends FragmentActivity {
 	private WorldContext world;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
index 2a18d92d7..8302f2337 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
@@ -1,5 +1,13 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import java.util.Collections;
+
+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 android.app.Activity;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -8,13 +16,6 @@ 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 {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
index fd5bc7023..7997f26e2 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
@@ -1,5 +1,13 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+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.controller.ActorStatsController;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+
 import android.app.Activity;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -8,13 +16,6 @@ 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;
-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;
 
 public final class LevelUpActivity extends Activity {
 	private WorldContext world;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
index 455f25b62..61ac67595 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
@@ -1,16 +1,7 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.Button;
-import android.widget.TextView;
+import java.util.Collections;
+import java.util.List;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
@@ -20,8 +11,16 @@ 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 android.app.Activity;
+import android.app.Dialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.Button;
+import android.widget.TextView;
 
 public final class LoadSaveActivity extends Activity implements OnClickListener {
 	private boolean isLoading = true;
@@ -132,18 +131,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 = CustomDialog.createDialog(this, 
+					title, 
+					getResources().getDrawable(android.R.drawable.ic_dialog_alert), 
+					message, 
+					null, 
+					true);
+			
+			CustomDialog.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();
+				});
+			CustomDialog.addDismissButton(d, android.R.string.no);
+			
+			CustomDialog.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..ff9e1de79 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
@@ -1,13 +1,5 @@
 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.os.Bundle;
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.WorldSetup;
@@ -15,6 +7,14 @@ import com.gpl.rpg.AndorsTrail.WorldSetup.OnResourcesLoadedListener;
 import com.gpl.rpg.AndorsTrail.WorldSetup.OnSceneLoadedListener;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.Intent;
+import android.os.Bundle;
+
 public final class LoadingActivity extends Activity implements OnResourcesLoadedListener, OnSceneLoadedListener {
 
 	private WorldSetup setup;
@@ -65,17 +65,28 @@ 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() {
+//		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() {
+//			@Override
+//			public void onDismiss(DialogInterface dialog) {
+//				LoadingActivity.this.finish();
+//			}
+//		});
+//		d.show();
+		
+		final Dialog d = CustomDialog.createDialog(this, getResources().getString(R.string.dialog_loading_failed_title), null, getResources().getString(messageResourceID), null, true);
+		CustomDialog.addDismissButton(d, android.R.string.ok);
+		CustomDialog.setDismissListener(d, new OnDismissListener() {
 			@Override
 			public void onDismiss(DialogInterface dialog) {
 				LoadingActivity.this.finish();
 			}
 		});
-		d.show();
+		CustomDialog.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 59d38ce12..ab8dbbba6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
@@ -3,21 +3,6 @@ package com.gpl.rpg.AndorsTrail.activity;
 import java.lang.ref.WeakReference;
 import java.util.Collection;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.ContextThemeWrapper;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.RelativeLayout;
-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;
@@ -51,6 +36,20 @@ import com.gpl.rpg.AndorsTrail.view.StatusView;
 import com.gpl.rpg.AndorsTrail.view.ToolboxView;
 import com.gpl.rpg.AndorsTrail.view.VirtualDpadView;
 
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
 public final class MainActivity
 		extends Activity
 		implements
@@ -232,19 +231,22 @@ public final class MainActivity
 					
 					final int buttonId = ((QuickButton)v).getIndex();
 					
-					final AlertDialog dialog = new AlertDialog.Builder(new ContextThemeWrapper(v.getContext(), R.style.AndorsTrailStyle_Dialog)).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 = CustomDialog.createDialog(v.getContext(), null, null, null, lv, 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();
 						}
 					});
 					
@@ -257,9 +259,11 @@ public final class MainActivity
 //						}
 //					});
 					
-					dialog.setView(view);
-					dialog.setCancelable(true);
-					dialog.show();
+					CustomDialog.show(d);
+//					
+//					dialog.setView(view);
+//					dialog.setCancelable(true);
+//					dialog.show();
 				}
 				return true;
 			}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
index 39f759644..85c1b5d73 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
@@ -1,5 +1,12 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+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 android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
@@ -7,12 +14,6 @@ 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;
 
 public final class MonsterEncounterActivity extends Activity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
index e129e6a39..d2ccd6e18 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
@@ -1,13 +1,5 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-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;
@@ -18,6 +10,15 @@ import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
 import com.gpl.rpg.AndorsTrail.view.RangeBar;
 import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
 
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.TextView;
+
 public final class MonsterInfoActivity extends Activity {
 
 	private WorldContext world;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
index c72d6ff7a..87217fb0a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
@@ -1,8 +1,9 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+import com.gpl.rpg.AndorsTrail.R;
+
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import com.gpl.rpg.AndorsTrail.R;
 
 public final class Preferences extends PreferenceActivity {
 	@Override
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
index 3ef0821c7..d14e28aa9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
@@ -1,13 +1,14 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+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 android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTabHost;
-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;
 
 public final class ShopActivity extends FragmentActivity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
index d6996b682..a91e62572 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
@@ -1,5 +1,14 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
+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.SkillController;
+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 android.app.Activity;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -10,14 +19,6 @@ 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;
-import com.gpl.rpg.AndorsTrail.controller.SkillController;
-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;
 
 public final class SkillInfoActivity extends Activity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
index d3b3e62b1..c1c347686 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
@@ -1,7 +1,13 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
-import android.app.Activity;
-import android.app.Fragment;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+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 android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -10,14 +16,6 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu;
-import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame;
-import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
-import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame.GameCreationOverListener;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
-
 public final class StartScreenActivity extends FragmentActivity implements OnNewGameRequestedListener, GameCreationOverListener {
 
 
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 fadd85445..2d4ffdf3d 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,23 +1,5 @@
 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;
@@ -30,9 +12,29 @@ 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.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
 
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.LayoutInflater;
+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.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
 public final class HeroinfoActivity_Inventory extends Fragment {
 
 	private static final int INTENTREQUEST_ITEMINFO = 3;
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..a48979f95 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,17 @@
 package com.gpl.rpg.AndorsTrail.activity.fragment;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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 android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,19 +19,12 @@ 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;
 import android.widget.AdapterView.OnItemSelectedListener;
-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 android.widget.ArrayAdapter;
+import android.widget.ExpandableListView;
+import android.widget.SimpleExpandableListAdapter;
+import android.widget.Spinner;
 
 public final class HeroinfoActivity_Quests extends Fragment {
 
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..4336538ad 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,16 @@
 package com.gpl.rpg.AndorsTrail.activity.fragment;
 
+import java.util.ArrayList;
+
+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.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.view.SkillListAdapter;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -13,16 +24,6 @@ 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;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-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;
 public final class HeroinfoActivity_Skills extends Fragment {
 
 	private static final int INTENTREQUEST_SKILLINFO = 12;
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..4154fdfa9 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,17 +1,6 @@
 package com.gpl.rpg.AndorsTrail.activity.fragment;
 
-import android.content.Intent;
-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.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TableLayout;
-import android.widget.TableRow;
-import android.widget.TextView;
+import java.util.ArrayList;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.Dialogs;
@@ -26,7 +15,18 @@ 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;
+import android.content.Intent;
+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.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TableLayout;
+import android.widget.TableRow;
+import android.widget.TextView;
 
 public final class HeroinfoActivity_Stats extends Fragment {
 
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..eb639ddb5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
@@ -1,5 +1,18 @@
 package com.gpl.rpg.AndorsTrail.activity.fragment;
 
+import java.util.HashSet;
+
+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.ShopItemContainerAdapter.OnContainerItemClickedListener;
+
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -12,19 +25,6 @@ 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 {
 
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..1d5103116 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
@@ -1,13 +1,14 @@
 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;
 import com.gpl.rpg.AndorsTrail.controller.ItemController;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 
+import android.app.Activity;
+import android.content.Intent;
+
 public final class ShopActivity_Buy extends ShopActivityFragment {
 
 	@Override
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..f9109f05b 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
@@ -1,13 +1,14 @@
 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;
 import com.gpl.rpg.AndorsTrail.controller.ItemController;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 
+import android.app.Activity;
+import android.content.Intent;
+
 public final class ShopActivity_Sell extends ShopActivityFragment {
 
 	@Override
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
index 208cb1a9d..54ad1cc06 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
@@ -1,30 +1,12 @@
 package com.gpl.rpg.AndorsTrail.activity.fragment;
 
-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.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.ContextThemeWrapper;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-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.CustomDialog;
 import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
 import com.gpl.rpg.AndorsTrail.activity.Preferences;
 import com.gpl.rpg.AndorsTrail.controller.Constants;
@@ -32,6 +14,22 @@ import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
 
+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;
+
 public class StartScreenActivity_MainMenu extends Fragment {
 
 	private static final int INTENTREQUEST_PREFERENCES = 7;
@@ -189,21 +187,39 @@ public class StartScreenActivity_MainMenu extends Fragment {
 	}
 
 	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() {
+//		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 = CustomDialog.createDialog(getActivity(),
+				getString(R.string.startscreen_newgame), 
+				getResources().getDrawable(android.R.drawable.ic_delete), 
+				getResources().getString(R.string.startscreen_newgame_confirm),
+				null,
+				true);
+		CustomDialog.addButton(d, android.R.string.ok, new View.OnClickListener() {
 			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				//continueGame(true);
-//				hasExistingGame = false;
-//				setButtonState(null, null, 0);
+			public void onClick(View v) {
 				createNewGame();
 			}
-		})
-		.setNegativeButton(android.R.string.cancel, null)
-		.create().show();
+		});
+		CustomDialog.addDismissButton(d, android.R.string.cancel);
+		
+		CustomDialog.show(d);
+		
 	}
 	
 	private boolean isNewVersion() {
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
index cf3fb129c..9e5c8c288 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java
@@ -1,5 +1,11 @@
 package com.gpl.rpg.AndorsTrail.activity.fragment;
 
+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;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -10,17 +16,10 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.RadioGroup;
-import android.widget.ToggleButton;
 import android.widget.RadioGroup.OnCheckedChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
-
-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.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import android.widget.ToggleButton;
 
 public class StartScreenActivity_NewGame extends Fragment {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
index 4a3bc50b9..a397dafbc 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 android.content.res.Resources;
+import java.lang.ref.WeakReference;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail.controller.*;
+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;
 
-import java.lang.ref.WeakReference;
+import android.content.res.Resources;
 
 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..fcd38c13e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -2,9 +2,6 @@ package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 
-import android.os.Handler;
-import android.os.Message;
-
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
@@ -25,6 +22,9 @@ import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
+import android.os.Handler;
+import android.os.Message;
+
 public final class CombatController implements VisualEffectCompletedCallback {
 	private final ControllerContext controllers;
 	private final WorldContext world;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
index 26775eb71..700c17d69 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/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index f9a8aec25..be962fe47 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -2,8 +2,6 @@ package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 
-import android.content.res.Resources;
-
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -31,6 +29,8 @@ import com.gpl.rpg.AndorsTrail.model.script.ScriptEffect;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.L;
 
+import android.content.res.Resources;
+
 public final class ConversationController {
 
 	private final ControllerContext controllers;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
index c97cbec6b..c0c169f7a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
@@ -1,12 +1,13 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+
 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;
 
 public final class InputController implements OnClickListener, OnLongClickListener{
 	private final ControllerContext controllers;
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 acced11b8..0cd0fb261 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
@@ -1,6 +1,7 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
-import android.content.res.Resources;
+import java.util.List;
+
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.listeners.MapLayoutListeners;
@@ -16,7 +17,7 @@ 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;
+import android.content.res.Resources;
 
 public final class MapController {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
index 1183f89c8..d55ed3508 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
@@ -1,7 +1,5 @@
 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;
@@ -10,12 +8,19 @@ import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
-import com.gpl.rpg.AndorsTrail.model.map.*;
+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.resource.tiles.TileCollection;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
 
+import android.content.res.Resources;
+import android.os.AsyncTask;
+
 public final class MovementController implements TimedMessageTask.Callback {
 	private final ControllerContext controllers;
 	private final WorldContext world;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
index 94d551756..7a3b22ec0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
@@ -1,10 +1,10 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
+import java.util.Arrays;
+
 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/VisualEffectController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
index e7e67dd2f..fa60b511c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
@@ -1,11 +1,5 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.Rect;
-import android.os.Handler;
-
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -21,6 +15,12 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Align;
+import android.graphics.Rect;
+import android.os.Handler;
+
 public final class VisualEffectController {
 	private int effectCount = 0;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
index 3d7ee7514..552de5ee4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
@@ -1,15 +1,13 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.os.AsyncTask;
-import android.os.Environment;
-import android.widget.Toast;
+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 com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity;
@@ -26,13 +24,16 @@ 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;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.os.AsyncTask;
+import android.os.Environment;
+import android.widget.Toast;
 
 public final class WorldMapController {
 
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..294df1f14 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
@@ -1,6 +1,16 @@
 package com.gpl.rpg.AndorsTrail.model;
 
-import android.content.res.Resources;
+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 com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
@@ -8,11 +18,7 @@ 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;
+import android.content.res.Resources;
 
 public final class GameStatistics {
 	private int deaths = 0;
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..694835e44 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
@@ -1,12 +1,13 @@
 package com.gpl.rpg.AndorsTrail.model.ability;
 
-import android.util.SparseArray;
+import java.util.ArrayList;
+import java.util.Collection;
+
 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;
 
 public final class SkillCollection {
 	public static enum SkillID {
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 39d549671..d93c8079a 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;
@@ -11,10 +15,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;
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 2d6fad003..296e5a17c 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 42abbd3b8..efcd5ac69 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -7,8 +7,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map.Entry;
 
-import android.util.SparseIntArray;
-
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -19,12 +17,13 @@ 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;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
+import android.util.SparseIntArray;
+
 public final class Player extends Actor {
 
 	public static final int DEFAULT_PLAYER_ATTACKCOST = 4;
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..f7b5f8961 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
@@ -1,13 +1,14 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
-import android.graphics.ColorFilter;
-import android.graphics.ColorMatrixColorFilter;
-import android.graphics.Paint;
+import java.util.Collection;
+
 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;
+import android.graphics.ColorFilter;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Paint;
 
 public final class LayeredTileMap {
 	private static final ColorFilter colorFilterBlack20 = createGrayScaleColorFilter(0.8f);
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 cbde9931b..b59f4a548 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..c58421b33 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 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 android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+
 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 aed27b394..524265775 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
@@ -1,21 +1,38 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
-import android.content.res.Resources;
+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 com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 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 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;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import android.content.res.Resources;
 
 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..e07eb5ca7 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java
@@ -1,12 +1,13 @@
 package com.gpl.rpg.AndorsTrail.resource;
 
-import android.content.res.Resources;
+import java.util.Collection;
+import java.util.HashMap;
+
 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;
 
 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..2afde8996 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 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 android.util.SparseArray;
+import android.util.SparseIntArray;
+
+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 40ab41068..72208a79a 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 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;
+
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+
 public final class ResourceLoader {
 
 	private static final int itemCategoriesResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_itemcategories_debug : R.array.loadresource_itemcategories;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
index ef98e71e6..497fc9834 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 com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+
 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..1d9d26905 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java
@@ -1,9 +1,10 @@
 package com.gpl.rpg.AndorsTrail.resource;
 
-import android.graphics.Color;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
+import android.graphics.Color;
+
 public final class VisualEffectCollection {
 
 	public static enum VisualEffectID {
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..9f6bf3a80 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,10 @@
 package com.gpl.rpg.AndorsTrail.resource.parsers;
 
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.xmlpull.v1.XmlPullParserException;
+
 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 +14,9 @@ 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;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
 
 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..644d0a407 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 com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.Size;
+
+import android.graphics.Matrix;
+
+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..05fc4ad2f 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 com.gpl.rpg.AndorsTrail.util.LruCache;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.util.SparseArray;
+import android.util.SparseIntArray;
+
 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 ef8607b45..9ddb858d4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
@@ -3,19 +3,6 @@ package com.gpl.rpg.AndorsTrail.resource.tiles;
 import java.util.HashMap;
 import java.util.HashSet;
 
-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.context.WorldContext;
@@ -33,6 +20,19 @@ import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
 import com.gpl.rpg.AndorsTrail.util.L;
 
+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 BEGIN_ID = 1;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java
index 2e34a8c4d..a0620fd34 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java
@@ -1,12 +1,12 @@
 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.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) throws IOException {
 		Monster m = new Monster(monsterType);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
index bfe1f81d5..4263b39bb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
@@ -1,8 +1,22 @@
 package com.gpl.rpg.AndorsTrail.savegames;
 
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Environment;
+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 com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
@@ -12,12 +26,9 @@ import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-import java.io.*;
-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;
 
 public final class Savegames {
 	public static final int SLOT_QUICKSAVE = 0;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
index eadc71c0c..60cfbe6e8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
@@ -1,8 +1,9 @@
 package com.gpl.rpg.AndorsTrail.util;
 
-import android.util.Log;
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
+import android.util.Log;
+
 public final class L {
 	private static final String TAG = "AndorsTrail";
 
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/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..4f47c1824 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
@@ -1,13 +1,14 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
+
 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.traits.AbilityModifierTraits;
 
 public final class AbilityModifierInfoView extends LinearLayout {
 	private final TextView abilitymodifierinfo_change_maxap;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
index c8a215e6b..fca04a4f3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
@@ -1,5 +1,13 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import java.util.Collection;
+
+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 android.content.Context;
 import android.content.res.Resources;
 import android.text.SpannableString;
@@ -8,13 +16,6 @@ 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 {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
index a5d184142..f756c16ea 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
@@ -1,5 +1,14 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+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.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.text.SpannableString;
@@ -8,14 +17,6 @@ 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;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-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 com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class ActorConditionList extends LinearLayout {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
index c1a5a8f06..fb2167847 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
@@ -1,20 +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;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.Dialogs;
@@ -32,6 +17,21 @@ import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
+import android.R.color;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
+import android.view.animation.AnimationUtils;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
 public final class CombatView extends RelativeLayout implements CombatSelectionListener, CombatTurnListener, ActorStatsListener, ActorConditionListener {
 	private final TextView statusTextView;
 	private final Button attackMoveButton;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
index e8d0a967c..4eea031da 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
@@ -3,6 +3,15 @@ package com.gpl.rpg.AndorsTrail.view;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+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.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 android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
@@ -17,15 +26,6 @@ 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;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-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;
-
 public final class DisplayActiveActorConditionIcons implements ActorConditionListener {
 
 	private final AndorsTrailPreferences preferences;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
index e6dd5d639..040395d8f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
@@ -1,10 +1,5 @@
 package com.gpl.rpg.AndorsTrail.view;
 
-import android.content.Context;
-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;
@@ -13,6 +8,12 @@ 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.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
 public class ItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 	private final TileManager tileManager;
 	private final TileCollection tileCollection;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
index 607e9a63f..afc353cd3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
@@ -1,18 +1,18 @@
 package com.gpl.rpg.AndorsTrail.view;
 
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
+import java.util.Arrays;
+import java.util.Collection;
 
 import com.gpl.rpg.AndorsTrail.R;
 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;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 public final class ItemEffectsView extends LinearLayout {
 	private final TextView itemeffect_onequip_title;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnDeath.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnDeath.java
index 1f680a9cc..8b5fabb27 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnDeath.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnDeath.java
@@ -3,6 +3,11 @@ package com.gpl.rpg.AndorsTrail.view;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+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 android.content.Context;
 import android.content.res.Resources;
 import android.util.AttributeSet;
@@ -10,11 +15,6 @@ 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;
-
 public final class ItemEffectsView_OnDeath extends LinearLayout {
 	private final LinearLayout itemeffect_ondeath_ontarget_list;
 	private final ActorConditionEffectList itemeffect_ondeath_conditions_source;
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..1a7a70b79 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,14 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
+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_OnHitReceived;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.util.AttributeSet;
@@ -7,15 +16,6 @@ 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_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..88f555abd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
@@ -1,19 +1,20 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
+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 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;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
index c632ae72d..c221e12d9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
@@ -1,18 +1,5 @@
 package com.gpl.rpg.AndorsTrail.view;
 
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.os.Handler;
-import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
@@ -42,6 +29,19 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 import com.gpl.rpg.AndorsTrail.util.Size;
 
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.os.Handler;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+
 public final class MainView extends SurfaceView
 	implements SurfaceHolder.Callback,
 		PlayerMovementListener,
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
index 660d6cadc..17b802e4b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
@@ -1,5 +1,11 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+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.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.ColorFilter;
@@ -7,11 +13,6 @@ 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;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class QuickButton extends Button {
 	private final ColorFilter grayScaleFilter = new ColorMatrixColorFilter(
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
index 2fe1118a8..bba51f0d9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
@@ -1,14 +1,7 @@
 package com.gpl.rpg.AndorsTrail.view;
 
-import android.R.color;
-import android.content.Context;
-import android.content.res.Resources;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
+import java.util.HashSet;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.R;
@@ -20,7 +13,15 @@ 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;
+import android.R.color;
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 
 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/RangeBar.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
index 0f4e26eee..9bb2cedfe 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
@@ -1,12 +1,13 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.Range;
+
 import android.content.Context;
 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;
 
 public final class RangeBar extends RelativeLayout {
 	private final ProgressBar progressBar;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
index 0d2c7f36a..5d25158e6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
@@ -1,5 +1,14 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+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.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.view.View;
@@ -9,14 +18,6 @@ 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;
-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.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class ShopItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 	private final TileManager tileManager;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
index 930420511..277bf17f4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
@@ -1,5 +1,18 @@
 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 com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity;
+import com.gpl.rpg.AndorsTrail.controller.SkillController;
+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 android.content.Context;
 import android.content.res.Resources;
 import android.view.View;
@@ -7,14 +20,6 @@ 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;
-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;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
index 2283eaf94..8f78090d8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
@@ -1,15 +1,5 @@
 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;
@@ -21,6 +11,14 @@ import com.gpl.rpg.AndorsTrail.model.actor.Actor;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.RelativeLayout;
+
 public final class StatusView extends RelativeLayout implements PlayerStatsListener, ActorStatsListener {
 
 	private final ControllerContext controllers;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
index c0e5743d0..4a8a59410 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
@@ -1,5 +1,14 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+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.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
@@ -14,14 +23,6 @@ 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;
-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.controller.WorldMapController;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class ToolboxView extends LinearLayout implements OnClickListener {
 	private final WorldContext world;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
index 32826865f..47f88d0ac 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
@@ -1,13 +1,14 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.util.Range;
+
 import android.view.View;
 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;
 
 public final class TraitsInfoView {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
index 66d1db1ee..262f6c435 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
@@ -1,5 +1,12 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+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.controller.InputController;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
@@ -8,12 +15,6 @@ 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;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.InputController;
 
 public final class VirtualDpadView extends ImageView implements OnClickListener {
 	private final WorldContext world;