From e4be5d35a8e57ec6507a946c18d7a787e5a031c9 Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Sun, 5 Nov 2017 01:47:27 +0100
Subject: [PATCH] New Dialog system for better UI control. ALmost there...

---
 .../color/ui_blue_textbutton_textcolor.xml    |   1 +
 AndorsTrail/res/drawable/title_logo.png       | Bin 5868 -> 6696 bytes
 .../res/drawable/ui_blue_spinner_arrow.9.png  | Bin 501 -> 465 bytes
 .../ui_blue_spinner_disabled_pressed.9.png    | Bin 463 -> 379 bytes
 .../ui_blue_spinner_disabled_unpressed.9.png  | Bin 472 -> 402 bytes
 .../ui_blue_spinner_enabled_pressed.9.png     | Bin 466 -> 399 bytes
 .../ui_blue_spinner_enabled_unpressed.9.png   | Bin 474 -> 400 bytes
 .../res/drawable/ui_blue_tabframe.9.png       | Bin 0 -> 351 bytes
 .../res/layout-land/heroinfo_inventory.xml    |   3 +-
 AndorsTrail/res/layout/combatview.xml         |   3 +-
 .../res/layout/custom_dialog_title_icon.xml   | 138 +++++----
 AndorsTrail/res/layout/heroinfo_inventory.xml |   3 +-
 .../res/layout/heroinfo_skill_list.xml        |   5 +-
 AndorsTrail/res/layout/heroinfo_stats.xml     |   2 +-
 AndorsTrail/res/layout/levelup.xml            |  92 +++---
 AndorsTrail/res/layout/loadsave.xml           |   3 +-
 AndorsTrail/res/layout/monsterencounter.xml   |   2 +-
 AndorsTrail/res/layout/monsterinfo.xml        |   2 +-
 AndorsTrail/res/layout/questlog.xml           |   5 +-
 .../layout/quickbuttons_usable_inventory.xml  |   2 -
 AndorsTrail/res/layout/rangebar.xml           |   2 +
 AndorsTrail/res/layout/shoplist.xml           |  12 +-
 AndorsTrail/res/layout/skill_info_view.xml    |   2 +-
 AndorsTrail/res/values-v14/ui_styles.xml      |   2 +
 AndorsTrail/res/values/strings.xml            |   1 +
 AndorsTrail/res/values/ui_dimen.xml           |   2 +-
 AndorsTrail/res/values/ui_styles.xml          | 282 ++++++++++--------
 .../AndorsTrail/AndorsTrailApplication.java   |   9 +-
 .../src/com/gpl/rpg/AndorsTrail/Dialogs.java  | 221 +++++++++-----
 .../com/gpl/rpg/AndorsTrail/WorldSetup.java   |   9 +-
 .../AndorsTrail/activity/AboutActivity.java   |   5 +-
 .../activity/ActorConditionInfoActivity.java  |  13 +-
 .../activity/BulkSelectionInterface.java      |  47 ++-
 .../activity/ConversationActivity.java        |  42 +--
 .../AndorsTrail/activity/CustomDialog.java    | 111 +++++++
 .../AndorsTrail/activity/DebugInterface.java  |  13 +-
 .../activity/DisplayWorldMapActivity.java     |  19 +-
 .../activity/HeroinfoActivity.java            |  12 +-
 .../activity/ItemInfoActivity.java            |  15 +-
 .../AndorsTrail/activity/LevelUpActivity.java |  15 +-
 .../activity/LoadSaveActivity.java            |  59 ++--
 .../AndorsTrail/activity/LoadingActivity.java |  41 ++-
 .../AndorsTrail/activity/MainActivity.java    |  44 +--
 .../activity/MonsterEncounterActivity.java    |  13 +-
 .../activity/MonsterInfoActivity.java         |  17 +-
 .../rpg/AndorsTrail/activity/Preferences.java |   3 +-
 .../AndorsTrail/activity/ShopActivity.java    |   9 +-
 .../activity/SkillInfoActivity.java           |  17 +-
 .../activity/StartScreenActivity.java         |  18 +-
 .../fragment/HeroinfoActivity_Inventory.java  |  40 +--
 .../fragment/HeroinfoActivity_Quests.java     |  29 +-
 .../fragment/HeroinfoActivity_Skills.java     |  21 +-
 .../fragment/HeroinfoActivity_Stats.java      |  26 +-
 .../fragment/ShopActivityFragment.java        |  26 +-
 .../activity/fragment/ShopActivity_Buy.java   |   5 +-
 .../activity/fragment/ShopActivity_Sell.java  |   5 +-
 .../StartScreenActivity_MainMenu.java         |  78 +++--
 .../fragment/StartScreenActivity_NewGame.java |  15 +-
 .../context/ControllerContext.java            |  18 +-
 .../controller/CombatController.java          |   6 +-
 .../rpg/AndorsTrail/controller/Constants.java |   4 +-
 .../controller/ConversationController.java    |   4 +-
 .../controller/InputController.java           |   7 +-
 .../controller/ItemController.java            |  13 +-
 .../AndorsTrail/controller/MapController.java |   5 +-
 .../controller/MovementController.java        |  11 +-
 .../AndorsTrail/controller/PathFinder.java    |   4 +-
 .../controller/VisualEffectController.java    |  12 +-
 .../controller/WorldMapController.java        |  35 +--
 .../listeners/WorldEventListener.java         |   4 +-
 .../listeners/WorldEventListeners.java        |   4 +-
 .../rpg/AndorsTrail/model/GameStatistics.java |  18 +-
 .../rpg/AndorsTrail/model/InterfaceData.java  |   7 +-
 .../rpg/AndorsTrail/model/ModelContainer.java |   8 +-
 .../model/ability/ActorCondition.java         |   4 +-
 .../ability/ActorConditionTypeCollection.java |   4 +-
 .../model/ability/SkillCollection.java        |   7 +-
 .../rpg/AndorsTrail/model/actor/Monster.java  |   8 +-
 .../model/actor/MonsterTypeCollection.java    |   6 +-
 .../rpg/AndorsTrail/model/actor/Player.java   |   5 +-
 .../conversation/ConversationCollection.java  |   6 +-
 .../model/item/DropListCollection.java        |   4 +-
 .../rpg/AndorsTrail/model/item/Inventory.java |  13 +-
 .../model/item/ItemCategoryCollection.java    |   4 +-
 .../AndorsTrail/model/item/ItemContainer.java |   6 +-
 .../model/item/ItemTypeCollection.java        |   4 +-
 .../gpl/rpg/AndorsTrail/model/item/Loot.java  |   8 +-
 .../AndorsTrail/model/map/LayeredTileMap.java |   9 +-
 .../AndorsTrail/model/map/MapCollection.java  |  12 +-
 .../model/map/MonsterSpawnArea.java           |  10 +-
 .../AndorsTrail/model/map/PredefinedMap.java  |  14 +-
 .../model/map/TMXMapFileParser.java           |  18 +-
 .../model/map/TMXMapTranslator.java           |  29 +-
 .../model/map/WorldMapSegment.java            |   4 +-
 .../model/quest/QuestCollection.java          |   8 +-
 .../resource/ConversationLoader.java          |   7 +-
 .../resource/DynamicTileLoader.java           | 231 +++++++-------
 .../AndorsTrail/resource/ResourceLoader.java  |  30 +-
 .../resource/TranslationLoader.java           |  11 +-
 .../resource/VisualEffectCollection.java      |   3 +-
 .../parsers/ActorConditionsTypeParser.java    |   5 +-
 .../parsers/ConversationListParser.java       |   5 +-
 .../resource/parsers/DropListParser.java      |   5 +-
 .../resource/parsers/ItemCategoryParser.java  |   5 +-
 .../resource/parsers/ItemTraitsParser.java    |   6 +-
 .../resource/parsers/ItemTypeParser.java      |   6 +-
 .../resource/parsers/QuestParser.java         |  11 +-
 .../resource/parsers/ResourceParserUtils.java |   5 +-
 .../resource/parsers/WorldMapParser.java      |  12 +-
 .../parsers/json/JsonArrayParserFor.java      |   6 +-
 .../parsers/json/JsonCollectionParserFor.java |  13 +-
 .../resource/parsers/json/JsonParserFor.java  |   4 +-
 .../resource/tiles/ResourceFileTileset.java   |  95 +++---
 .../AndorsTrail/resource/tiles/TileCache.java |  13 +-
 .../resource/tiles/TileManager.java           |  26 +-
 .../LegacySavegameFormatReaderForMonster.java |   6 +-
 .../rpg/AndorsTrail/savegames/Savegames.java  |  29 +-
 .../src/com/gpl/rpg/AndorsTrail/util/L.java   |   3 +-
 .../rpg/AndorsTrail/util/ListOfListeners.java |   4 +-
 .../util/XmlResourceParserUtils.java          |   5 +-
 .../view/AbilityModifierInfoView.java         |   5 +-
 .../view/ActorConditionEffectList.java        |  15 +-
 .../AndorsTrail/view/ActorConditionList.java  |  17 +-
 .../gpl/rpg/AndorsTrail/view/CombatView.java  |  30 +-
 .../DisplayActiveActorConditionIcons.java     |  18 +-
 .../view/ItemContainerAdapter.java            |  11 +-
 .../rpg/AndorsTrail/view/ItemEffectsView.java |  14 +-
 .../view/ItemEffectsView_OnDeath.java         |  10 +-
 .../view/ItemEffectsView_OnHitReceived.java   |  18 +-
 .../view/ItemEffectsView_OnUse.java           |  17 +-
 .../gpl/rpg/AndorsTrail/view/MainView.java    |  26 +-
 .../gpl/rpg/AndorsTrail/view/QuickButton.java |  11 +-
 .../rpg/AndorsTrail/view/QuickitemView.java   |  21 +-
 .../gpl/rpg/AndorsTrail/view/RangeBar.java    |   5 +-
 .../view/ShopItemContainerAdapter.java        |  17 +-
 .../AndorsTrail/view/SkillListAdapter.java    |  21 +-
 .../gpl/rpg/AndorsTrail/view/StatusView.java  |  18 +-
 .../gpl/rpg/AndorsTrail/view/ToolboxView.java |  17 +-
 .../rpg/AndorsTrail/view/TraitsInfoView.java  |   7 +-
 .../rpg/AndorsTrail/view/VirtualDpadView.java |  13 +-
 140 files changed, 1591 insertions(+), 1170 deletions(-)
 create mode 100644 AndorsTrail/res/drawable/ui_blue_tabframe.9.png
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/CustomDialog.java

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 d97ce0bfba1b0c4a739b32fef419da0c99c4e001..dc1778b5cbfe6949ab873d932c0e9b1d719ab1ca 100644
GIT binary patch
literal 6696
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
Zmx{G4S7UcSdjRvLrKb0=_`dDm{{tRO9QptN

literal 5868
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
H^UnVP1r3(&

diff --git a/AndorsTrail/res/drawable/ui_blue_spinner_arrow.9.png b/AndorsTrail/res/drawable/ui_blue_spinner_arrow.9.png
index 67cbdac664fd8d4fce74a40b0899cef2293fb7f1..8f35afef1d4f6f0bd9f0e06aabf3581b21e53af2 100644
GIT binary patch
delta 427
zcmV;c0aX6=1JMH^iBL{Q4GJ0x0000DNk~Le0000X0000M2nGNE08X3rdXXVAe*_N@
zD+F9<?EnA(9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN0X0cP
zK~zY`&6Y84gD@0^e<OBo5UEIMhx7(4l_J5O*+r_<B}d2!dW4LXEI5Skk)^5RNV!2y
z;0%os5ECBZQRUwdHvZmk^FIsRf0Bp*d$P4>fqP|7cxYW!rnN>{mQYIJW4*bW@V)&)
zp65u@6jDme=C7oMj=#Icyt=|$00;9!S|E;}N#m4K0Dz(>8XzH;rBCro=ewR_Y&g~h
zs+?OsHv#~b`=Bk81=%GBG1NYG1-?JzzZGzN<nw(sXnQ7skWylqENlmWe{JUi3Bs8D
zAc(hY<pps7zR+WL!liE=q~?I=KNBKiA-Gg4E(=!xeJ*f2(FP#_{6R3cSO-D{m@F~d
z0Da+C^^PpdptWw~JGDDfWX!&^orheBIU?#sqm}#IpjJ8NQuCPCyY_`+;P|_A2EBHL
V$~;)QO8@`>07*qoM6N<$0fNG!uuA{{

delta 463
zcmV;=0Wkj21N8$TiBL{Q4GJ0x0000DNk~Le0000W0000M2nGNE0HIl)M3Esfe*zIF
zI?XsajQ{`u8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0bNN%K~zY`
z&6YiGgFq04zqNdV$Ve2Hk|L6u93Z7#?Hycj19#hV0Zu`YJ5Z(N04`lP5(N?wS0F_)
zWcd{+3(Avd*cI>F$7*I^nktr7f087ur633hf&hT6m}{+Th@vO}$nzXyOuaddW1=X+
z_kBFiLu<{$^Xs5dc}wg40G{UoptWuSh`DVHG|b1ee|i~QGsX}_Q73J!^)G;&+BTM`
zrfUB<4gqvP8UPaaT;n-VJs{Qg=Z34PasL&<29X4m%TtTar(N~-{;7r_f67}5z=jpo
z2eK+apEj;zpYz^1Kp2J{v-4?Jg<-f(0*B*8*$`rWI9}8$05*gqGG@NmB@~FZdG>Mb
z1*oLaxQ1w(XZP<%YJdPJDUWd+I|s4N%UfD^$WAZteZO9CS(a^c`M$L027vTxNn<WV
z-~R;~=IyxvP&I%(kj#b1CGOWrLy0|*{2Qqm!>C#U;0u{Wy4R#W20{P;002ovPDHLk
FV1n>9zySaN

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 6ab60afed0423f9378e36f7de263bfb8ac66d7c7..f667c736f7a4a8250e10d1c922b6542bc4a9f952 100644
GIT binary patch
delta 340
zcmV-a0jvJc1N#CYiBL{Q4GJ0x0000DNk~Le0000X0000M2nGNE08X3rdXXVAe*_N;
zE3ImycK`qY9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN0N+VO
zK~zY`?Uqdn!Y~kpUrNp)SWq{fqrF5Zxbz5~z$3U6LVJkZ!;KXp^djS`kXq9W^v6nl
zt3Wc$n~z~80%4JJ78pSykaR4$e|hQM1Q}yc6a}=_I2=!{=<DT-EX$B236xS;ZT76J
z)#KKPbBvJeGVru_R)RR*vfgQ}0RVZPLn%eI5jhm!b-eT5g^H1VDR5QO`alEG1WnjU
z$!lV03L!<9fuf1#!f%jh$=Y(6B*ecb7G;9FJ4BkMWQ=LdckXuN$lB7kD$YqxRV{~v
mmj<`W9-o?deeb@xKg0`IerU&;8yzD60000<MNUMnLSTa7=ZdTV

delta 424
zcmV;Z0ayO}0?z{>iBL{Q4GJ0x0000DNk~Le0000W0000M2nGNE0HIl)M3Esfe*zIG
zHQFCI(*OVf8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0XIoRK~zY`
z<(5Heg)k6?KZ{oovMN+)yXif0i<~0I$SHCQ@8PBjDYz0mgx$Oe<~_9vPhIqffMkOI
zmkF5+Y}3d=dXbN+s>En+ti^T@e`5^B7=SSsbFKAwgJ2j20Q$biS}Tk3-s7A@DMe8f
zXsvmD|61H#*Vb`8Kv5I`Xst(MOa_q4L{(LZF_4(AsVqMhW7b-nbIF`+I0DG7r^di0
zbJ1J*xe5V1fFuBt?!Cr)pyojGY4BObe`Q8M5`ZJj*C4vKPOsq^ngcl%eqgB(jaLI)
zo`LM&XW%sbgzsel@BQKCAvA>0#2SzQIOp)*9|9ugU0cT&@}UwcrDEWjWqE2Y|Ci@E
z0g$&^vauIp?tFp7{Jt-k0%X&MWG_Sr&8DVg(vWbw{$qAl?{_EhjR04b<LnoiH@sMs
S;j|0@0000<MNUMnLSTaYyR@MI

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 3f594b71a81218fb8213f52e3fbd9ebafa2c01e9..409a1c431e05aa6caa96270dd992bb4d715191ed 100644
GIT binary patch
delta 363
zcmV-x0hIpO1Cj$FiBL{Q4GJ0x0000DNk~Le0000X0000M2nGNE08X3rdXXVAe*_N<
z9W9ZdDF6Tf9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN0QN~l
zK~zY`?Uuo<!Y~j-pAmO@;P6XHny@0}m=aO}CFF>-a*A;3_!mG5((ix@mJ6T=VhDjx
zd|+;t#@^BF*lWW*m<8xTJ8Q#Of9N4xrjO45qgz+6MX2|lx~>rs@}j)iy{=YdSw@m1
zSZjMZeYoD&5u)>Z0`~1@P=O)5yeL^$D*&8xSZnnxWJUy-z3ReH?Ar}_Q6eHVO@njp
zlD|ltFpE(=9>aaqj)|S<K1LG<Gd>Y*yB&PMGu%*qqPZRBn~Bry_*k(}L4Kle;ygu7
znx^W#2S7vsST29w>cZddw{M(lR89olc-LDIa3Q|$-IVjg90B@&dQz6g5j+3@002ov
JPDHLkV1ii3myG}b

delta 434
zcmV;j0Zsmr1K0y0iBL{Q4GJ0x0000DNk~Le0000W0000M2nGNE0HIl)M3Esfe*zIH
z4ss9Rwg3PC8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0YFJaK~zY`
z<(4sO!!Q(vKZjgFpd0BHf{fX<<OE%`cP!`%odoSIveW?;G8u9RcgYh{;-qeCHz|D}
zFp{kQd%rCC!MNy|DHie&V-%sGe|Bx`%gtJgwHBaXinuYRKSFRg902IL4(FUqCWL_Z
z9<4P>DU30!)|-pjJv~0;`2b2O0E{ucwYC9RN=J;b5(X;qYw@1m2K!g*4bC~d_f@|n
zoB<^3QWzK|{u!7+0B0Z-fY?2S@DN0qSP7B=#@hW|2-%Vnq&fw2iJyX$e~wfDw~D&}
z=>N0>uP@I(dS?MN|Na}e4}cKD>|!akq|~zCZO;L`_k<8;0}<i<ZaaJxYpwIZ)Yr0z
z%lh(rt{hNGp|#E+Q#nzJ%lc9mlnyjyK_Xi+)`^tbi({pDQIK#v{(bXXwckmIZU(s3
cb=-UaV`jw6?3DlZ000002uVdwM6N<$g1vUONB{r;

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 999136796915dad99b524b02347e1e7b66686bbc..e5e716199ef2e3eff4612fe105ca103cef7c676e 100644
GIT binary patch
delta 360
zcmcb_+|R7o8Q|y6%O%Cdz`(%k>ERLtq!oc!jDrnG`py1YHBr&1o`s)>ZTXkXqd+0q
z%#er@=ltB<)VvZPmw~~#C^fMpHASI3vm`^o-P1Q9MK6^dDE`^g#WBR=cyh`Cc8Q;o
z694M|^dCu2Q4s(0zvH%4&MC<Z{t0jY_P^`+Z(aT_C1O{J=HW%I-4c5ysVBU+XSTgT
zQBSY$;MudiifU?Y^^P7#n>3>D-?eO9#D7xpf8+<t2PY3}yF@B1Uf?`smut6}p#c!+
zL~d#UDt~5wMp5SqSG;899X`b;l44%YjT!Dv&fMM^1_l=u1t0OMb|_2y^yIV4VpeN&
zWS9}awV1K^$N~<|oXA%PJA8zvgm@j+EjQ@tn4qxjT|!BD`G33p#n1hwe42aX)<lhV
zn;lK7t^S{P(!VbxEM(!_91$OMVTEMO+1-t6>?IiI#T1-e`{{EAC}ccc{an^LB{Ts5
DOyi3|

delta 428
zcmV;d0aN~u1JVN_iBL{Q4GJ0x0000DNk~Le0000W0000M2nGNE0HIl)M3Esfe*zIG
zCC8{Jw*UYD8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0Xj)UK~zY`
z<(5HegfJ99pT!dt0xkyHMVCE5Z;)H$6dog|$SraM4=_s?Q*a>&bA@!#`5~E6t1#-K
z9|DpD-^&+&J}isCM)4vK-g^O!e~r1d)x#KrF$N%%0@qrHn*_r!0MPe6bzRG5oO4)f
zsj3R46k2OuKfWeUcWs-vA3!MufYv$~V+w#$CcO6<7|7sraeDupT&wFEYi%|s2aW=A
z>J$ttf=7wBc?sY_BomNyuLZA>8WSng#b<&4%8ZC)0$af6B(80f|Au?Sf0)Rw0#k)3
z94&Bo28w^5f!(6}K2Hlc=Qf9Tm){{ZAQQ0G;+)$=MBvx9i8tg!C9J9{E<Cd=r*L_{
zT+f+++|`newGw0B7s%lEeL*Tvqz%bhiSBY<)RZI*3Af)r6npi4cOl#;a8x-iegJD{
WylDcinC}1p002ovPDHLk0$_sLcc^0k

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 a5663cef6df4996e2455db34d2bfcfde627155dc..313e48ff75a18b5cf7cb22bff4073d585532fec9 100644
GIT binary patch
delta 361
zcmV-v0ha#S1CRqDiBL{Q4GJ0x0000DNk~Le0000X0000M2nGNE08X3rdXXVAe*_N<
zGx0~Q<^TWy9cffpbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN0Q5;j
zK~zY`?Uu0(gD?<9zfpP?NRa_D2T06d(XarcumH`;tPsgekO3%DfJ7aM2`)uKWDy_)
zNN|zgSvu>!p1*w-7?W@TZrE50f6Ns(!)^M?@qL+nxod*8*2uC9M1&wpUUr|-7-1N~
z^E^l?du#gC-Deo#-I#&8Dke3UQWr!CD2)LCN-0Pwxi#Xz0y#@5OjTVKcN#><^BhX4
zXZ|c9A>3JKJg4^EacoS&e2g{@rhO*r@`Fs2%kyK+?GXP=JZ{I&nhoX0KME4<6cxVj
zv(_2_Ktuq5{o%MOh3n<qH_q8A5`#3>dMgGf*!R8La(;*#XQp~fE09i-00000NkvXX
Hu0mjfyM>JZ

delta 436
zcmV;l0Zaan1KI;2iBL{Q4GJ0x0000DNk~Le0000W0000M2nGNE0HIl)M3Esfe*zIG
z69^K$E&u=k8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0YXVcK~zY`
z<(4sO!!Q(vKZjgFpc@Ht2raol2OmR2F3?3&Pf*a<%?I$9!G#P4L$2Ts$rDoSq;6|B
zDSaR?db0lSJz38WrdiKIwvvYse}V{&ja$Ai4{I&fT7Z5n;>MW%3_;g*0JLpOS(dUG
z?>){rwALu4FvhUi?yg4n`ur5v11O~cFvj%O+5%uL6Cs357|6tL+2Oq&o!@MCl;sH`
zH3>KZNYtq?FiHF~Fo6IDAQ^z9dk*0-h*MxgkO(j}-QR_fBS}HBTd<V)e<etokqqEo
z_7DL5pUyz__VS~5RzUIZzk$a9@ZK+92b!8gQ*+!`LjdO--uuNsMEJO`#!Io*Iy&Yq
z%OWoO%kMeMfKm#rbp)9!6REiDFMUCpfg){4<VYs>15JI^mx?D13FqtI7r)i}U6|-b
efP0nW;seyQ#LW2?|4;w`3IG5}MNUMnLSTZu8@5dV

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 0000000000000000000000000000000000000000..9d2f8bae0df2fb34fc102f4d3f379fe1d0e3a5e3
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^VnEE#!3HEB<l1KdDYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>Fdh=kefx2Tj>zr)RjOX+02lL66gHf+|;}hAeVu`xhOTU
zBsE2$JhLQ2!QIn0AVn{g9VmX-)5S5w;`G%i8+n@z1YG4cv?G$3#OE<oGFr7c_9Pne
z$a1^*Oi&V5sN@K`d(v@&gMe#Y>dSZY_N{&2{C5`rmq{lBBF$~&%g>##I)9^_;YrMr
zKQBc48#b>#@JIiKRlSzr>Oy9X*KXX^i>EWGX65%ebM(|MKbrq;?dMy{#fmIz?>`9;
zX%)M*ZRr~6HJ?|X3tliosBKS6Q?KEYciSImmT>w=X0|;~lwjyEH1eH%Xu8k~p@`6_
nMw^YhpB;X8^H1sL^$r)guX(sX(=7V)8{|(<S3j3^P6<r_eDr||

literal 0
HcmV?d00001

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;