78 files changed, 38 insertions, 16 deletions
diff --git a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
index 9c5cf7c..9c5cf7c 100644..100755
--- a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+++ b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar

Binary files differ
diff --git a/lib/junit/junit-3.8.2-api.zip b/lib/junit/junit-3.8.2-api.zip
index dc075ba..dc075ba 100644..100755
--- a/lib/junit/junit-3.8.2-api.zip
+++ b/lib/junit/junit-3.8.2-api.zip

Binary files differ
diff --git a/lib/junit/junit-3.8.2.jar b/lib/junit/junit-3.8.2.jar
index d835872..d835872 100644..100755
--- a/lib/junit/junit-3.8.2.jar
+++ b/lib/junit/junit-3.8.2.jar

Binary files differ
diff --git a/lib/junit_4/junit-4.1.jar b/lib/junit_4/junit-4.1.jar
index 30e5ec3..30e5ec3 100644..100755
--- a/lib/junit_4/junit-4.1.jar
+++ b/lib/junit_4/junit-4.1.jar

Binary files differ
diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index b39d1b6..b39d1b6 100644..100755
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties

diff --git a/lib/swing-app-framework/appframework-1.0.3-doc.zip b/lib/swing-app-framework/appframework-1.0.3-doc.zip
index f734f54..f734f54 100644..100755
--- a/lib/swing-app-framework/appframework-1.0.3-doc.zip
+++ b/lib/swing-app-framework/appframework-1.0.3-doc.zip

Binary files differ
diff --git a/lib/swing-app-framework/appframework-1.0.3.jar b/lib/swing-app-framework/appframework-1.0.3.jar
index 9f5cdbf..9f5cdbf 100644..100755
--- a/lib/swing-app-framework/appframework-1.0.3.jar
+++ b/lib/swing-app-framework/appframework-1.0.3.jar

Binary files differ
diff --git a/lib/swing-app-framework/swing-worker-1.1.jar b/lib/swing-app-framework/swing-worker-1.1.jar
index 02f23a3..02f23a3 100644..100755
--- a/lib/swing-app-framework/swing-worker-1.1.jar
+++ b/lib/swing-app-framework/swing-worker-1.1.jar

Binary files differ
diff --git a/src/com/fourisland/fourpuzzle/Audio.java b/src/com/fourisland/fourpuzzle/Audio.java
index b364342..b364342 100644..100755
--- a/src/com/fourisland/fourpuzzle/Audio.java
+++ b/src/com/fourisland/fourpuzzle/Audio.java

diff --git a/src/com/fourisland/fourpuzzle/Database.java b/src/com/fourisland/fourpuzzle/Database.java
index b6e97cf..b6e97cf 100644..100755
--- a/src/com/fourisland/fourpuzzle/Database.java
+++ b/src/com/fourisland/fourpuzzle/Database.java

diff --git a/src/com/fourisland/fourpuzzle/Direction.java b/src/com/fourisland/fourpuzzle/Direction.java
index 4fa0908..4fa0908 100644..100755
--- a/src/com/fourisland/fourpuzzle/Direction.java
+++ b/src/com/fourisland/fourpuzzle/Direction.java

diff --git a/src/com/fourisland/fourpuzzle/Display.java b/src/com/fourisland/fourpuzzle/Display.java
index 5f5a891..5f5a891 100644..100755
--- a/src/com/fourisland/fourpuzzle/Display.java
+++ b/src/com/fourisland/fourpuzzle/Display.java

diff --git a/src/com/fourisland/fourpuzzle/Game.java b/src/com/fourisland/fourpuzzle/Game.java
index d2e8943..d2e8943 100644..100755
--- a/src/com/fourisland/fourpuzzle/Game.java
+++ b/src/com/fourisland/fourpuzzle/Game.java

diff --git a/src/com/fourisland/fourpuzzle/GameCharacter.java b/src/com/fourisland/fourpuzzle/GameCharacter.java
index 8557fef..8557fef 100644..100755
--- a/src/com/fourisland/fourpuzzle/GameCharacter.java
+++ b/src/com/fourisland/fourpuzzle/GameCharacter.java

diff --git a/src/com/fourisland/fourpuzzle/GameCharacters.java b/src/com/fourisland/fourpuzzle/GameCharacters.java
index 211b66d..211b66d 100644..100755
--- a/src/com/fourisland/fourpuzzle/GameCharacters.java
+++ b/src/com/fourisland/fourpuzzle/GameCharacters.java

diff --git a/src/com/fourisland/fourpuzzle/Layer.java b/src/com/fourisland/fourpuzzle/Layer.java
index 88b53ed..88b53ed 100644..100755
--- a/src/com/fourisland/fourpuzzle/Layer.java
+++ b/src/com/fourisland/fourpuzzle/Layer.java

diff --git a/src/com/fourisland/fourpuzzle/PuzzleApplication.java b/src/com/fourisland/fourpuzzle/PuzzleApplication.java
index c8d4e5d..edf6ac8 100644..100755
--- a/src/com/fourisland/fourpuzzle/PuzzleApplication.java
+++ b/src/com/fourisland/fourpuzzle/PuzzleApplication.java

@@ -7,6 +7,7 @@ package com.fourisland.fourpuzzle;
 import com.fourisland.fourpuzzle.gamestate.TitleScreenGameState;
 import com.fourisland.fourpuzzle.gamestate.mapview.ChipSet;
 import com.fourisland.fourpuzzle.util.Interval;
+import com.fourisland.fourpuzzle.window.SystemGraphic;
 import java.awt.GraphicsEnvironment;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -107,6 +108,8 @@ public class PuzzleApplication extends Application {
                try {
                    Audio.init();
                    ChipSet.initalize();
+                    SystemGraphic.initalize();
+                    
                    Game.setGameState(new TitleScreenGameState());
                    
                    Interval in = Interval.createTickInterval(1);
diff --git a/src/com/fourisland/fourpuzzle/SaveFile.java b/src/com/fourisland/fourpuzzle/SaveFile.java
index d079f0f..d079f0f 100644..100755
--- a/src/com/fourisland/fourpuzzle/SaveFile.java
+++ b/src/com/fourisland/fourpuzzle/SaveFile.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/GameOverGameState.java b/src/com/fourisland/fourpuzzle/gamestate/GameOverGameState.java
index 53cae37..53cae37 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/GameOverGameState.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/GameOverGameState.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/GameState.java b/src/com/fourisland/fourpuzzle/gamestate/GameState.java
index de4d7de..de4d7de 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/GameState.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/GameState.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java b/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java
index 2f5dc97..2f5dc97 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/CharSet.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/CharSet.java
index 841eaa4..841eaa4 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/CharSet.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/CharSet.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/ChipSet.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/ChipSet.java
index 5ae3fbd..5ae3fbd 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/ChipSet.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/ChipSet.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/ChipSetData.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/ChipSetData.java
index 5379292..5379292 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/ChipSetData.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/ChipSetData.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/Map.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/Map.java
index d02c7ed..d02c7ed 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/Map.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/Map.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java
index 3acfff4..3acfff4 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AbstractEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AbstractEvent.java
index 2933fff..2933fff 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AbstractEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AbstractEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AnimationType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AnimationType.java
index 4c3aeb9..4c3aeb9 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AnimationType.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AnimationType.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/CommonEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/CommonEvent.java
index edfdb8f..edfdb8f 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/CommonEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/CommonEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/Event.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/Event.java
index 887e52b..887e52b 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/Event.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/Event.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventCall.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventCall.java
index f577cc2..f577cc2 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventCall.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventCall.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventCallTime.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventCallTime.java
index 821f891..821f891 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventCallTime.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventCallTime.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventHandler.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventHandler.java
index 05997e0..05997e0 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventHandler.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventHandler.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventList.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventList.java
index 8de4e3c..8de4e3c 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventList.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/EventList.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/HeroEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/HeroEvent.java
index f39c451..f39c451 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/HeroEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/HeroEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/LayerEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/LayerEvent.java
index 3c826cb..3c826cb 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/LayerEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/LayerEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/PossibleEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/PossibleEvent.java
index a8c3a51..a8c3a51 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/PossibleEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/PossibleEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java
index c48b312..c48b312 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/BlankEventGraphic.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/BlankEventGraphic.java
index 77d383f..77d383f 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/BlankEventGraphic.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/BlankEventGraphic.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/CharSetEventGraphic.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/CharSetEventGraphic.java
index 6064f24..6064f24 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/CharSetEventGraphic.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/CharSetEventGraphic.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/EventGraphic.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/EventGraphic.java
index 2cf9497..2cf9497 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/EventGraphic.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/graphic/EventGraphic.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/CustomMovementType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/CustomMovementType.java
index 0002c03..0002c03 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/CustomMovementType.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/CustomMovementType.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/MovementType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/MovementType.java
index f304ec0..f304ec0 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/MovementType.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/MovementType.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/RandomMovementType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/RandomMovementType.java
index fd65a41..fd65a41 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/RandomMovementType.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/RandomMovementType.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/StayStillMovementType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/StayStillMovementType.java
index e373de9..e373de9 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/StayStillMovementType.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/StayStillMovementType.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/HeroInPartyPrecondition.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/HeroInPartyPrecondition.java
index b25562b..b25562b 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/HeroInPartyPrecondition.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/HeroInPartyPrecondition.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/Precondition.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/Precondition.java
index 602bdf5..602bdf5 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/Precondition.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/Precondition.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/SwitchPrecondition.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/SwitchPrecondition.java
index 9ea6c16..9ea6c16 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/SwitchPrecondition.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/SwitchPrecondition.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/VariableNumberPrecondition.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/VariableNumberPrecondition.java
index ab8d977..ab8d977 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/VariableNumberPrecondition.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/VariableNumberPrecondition.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/VariableVariablePrecondition.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/VariableVariablePrecondition.java
index 91a31ba..91a31ba 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/VariableVariablePrecondition.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/precondition/VariableVariablePrecondition.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/FaceMoveEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/FaceMoveEvent.java
index 3ed545b..3ed545b 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/FaceMoveEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/FaceMoveEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/LoopUntilCollisionMoveEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/LoopUntilCollisionMoveEvent.java
index 02744d0..02744d0 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/LoopUntilCollisionMoveEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/LoopUntilCollisionMoveEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/MoveEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/MoveEvent.java
index b79c45a..b79c45a 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/MoveEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/MoveEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/MoveEventThread.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/MoveEventThread.java
index 488331a..488331a 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/MoveEventThread.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/MoveEventThread.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/StepMoveEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/StepMoveEvent.java
index af50087..af50087 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/StepMoveEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/StepMoveEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/WaitMoveEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/WaitMoveEvent.java
index 565365a..565365a 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/WaitMoveEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/specialmove/WaitMoveEvent.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/AutomaticViewpoint.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/AutomaticViewpoint.java
index 1f8a796..1f8a796 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/AutomaticViewpoint.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/AutomaticViewpoint.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/FixedViewpoint.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/FixedViewpoint.java
index 20a6dd0..20a6dd0 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/FixedViewpoint.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/FixedViewpoint.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/MovingViewpoint.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/MovingViewpoint.java
index e6db32b..e6db32b 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/MovingViewpoint.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/MovingViewpoint.java

diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/Viewpoint.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/Viewpoint.java
index c46b280..c46b280 100644..100755
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/Viewpoint.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/viewpoint/Viewpoint.java

diff --git a/src/com/fourisland/fourpuzzle/transition/DoNotEraseTransition.java b/src/com/fourisland/fourpuzzle/transition/DoNotEraseTransition.java
index 55fe614..55fe614 100644..100755
--- a/src/com/fourisland/fourpuzzle/transition/DoNotEraseTransition.java
+++ b/src/com/fourisland/fourpuzzle/transition/DoNotEraseTransition.java

diff --git a/src/com/fourisland/fourpuzzle/transition/InTransition.java b/src/com/fourisland/fourpuzzle/transition/InTransition.java
index 6c07aa5..6c07aa5 100644..100755
--- a/src/com/fourisland/fourpuzzle/transition/InTransition.java
+++ b/src/com/fourisland/fourpuzzle/transition/InTransition.java

diff --git a/src/com/fourisland/fourpuzzle/transition/MultidirectionalTransition.java b/src/com/fourisland/fourpuzzle/transition/MultidirectionalTransition.java
index 7177179..7177179 100644..100755
--- a/src/com/fourisland/fourpuzzle/transition/MultidirectionalTransition.java
+++ b/src/com/fourisland/fourpuzzle/transition/MultidirectionalTransition.java

diff --git a/src/com/fourisland/fourpuzzle/transition/OutTransition.java b/src/com/fourisland/fourpuzzle/transition/OutTransition.java
index 37bf5b4..37bf5b4 100644..100755
--- a/src/com/fourisland/fourpuzzle/transition/OutTransition.java
+++ b/src/com/fourisland/fourpuzzle/transition/OutTransition.java

diff --git a/src/com/fourisland/fourpuzzle/transition/SlideTransition.java b/src/com/fourisland/fourpuzzle/transition/SlideTransition.java
index aa91061..aa91061 100644..100755
--- a/src/com/fourisland/fourpuzzle/transition/SlideTransition.java
+++ b/src/com/fourisland/fourpuzzle/transition/SlideTransition.java

diff --git a/src/com/fourisland/fourpuzzle/transition/SquareTransition.java b/src/com/fourisland/fourpuzzle/transition/SquareTransition.java
index 6167fc3..6167fc3 100644..100755
--- a/src/com/fourisland/fourpuzzle/transition/SquareTransition.java
+++ b/src/com/fourisland/fourpuzzle/transition/SquareTransition.java

diff --git a/src/com/fourisland/fourpuzzle/transition/Transition.java b/src/com/fourisland/fourpuzzle/transition/Transition.java
index e9b6d9f..e9b6d9f 100644..100755
--- a/src/com/fourisland/fourpuzzle/transition/Transition.java
+++ b/src/com/fourisland/fourpuzzle/transition/Transition.java

diff --git a/src/com/fourisland/fourpuzzle/transition/TransitionDirection.java b/src/com/fourisland/fourpuzzle/transition/TransitionDirection.java
index 305bb5c..305bb5c 100644..100755
--- a/src/com/fourisland/fourpuzzle/transition/TransitionDirection.java
+++ b/src/com/fourisland/fourpuzzle/transition/TransitionDirection.java

diff --git a/src/com/fourisland/fourpuzzle/transition/TransitionUnsupportedException.java b/src/com/fourisland/fourpuzzle/transition/TransitionUnsupportedException.java
index dfea7aa..dfea7aa 100644..100755
--- a/src/com/fourisland/fourpuzzle/transition/TransitionUnsupportedException.java
+++ b/src/com/fourisland/fourpuzzle/transition/TransitionUnsupportedException.java

diff --git a/src/com/fourisland/fourpuzzle/util/Comparison.java b/src/com/fourisland/fourpuzzle/util/Comparison.java
index 9e5ef54..9e5ef54 100644..100755
--- a/src/com/fourisland/fourpuzzle/util/Comparison.java
+++ b/src/com/fourisland/fourpuzzle/util/Comparison.java

diff --git a/src/com/fourisland/fourpuzzle/util/Functions.java b/src/com/fourisland/fourpuzzle/util/Functions.java
index c7c1243..c7c1243 100644..100755
--- a/src/com/fourisland/fourpuzzle/util/Functions.java
+++ b/src/com/fourisland/fourpuzzle/util/Functions.java

diff --git a/src/com/fourisland/fourpuzzle/util/Interval.java b/src/com/fourisland/fourpuzzle/util/Interval.java
index 21a7a74..21a7a74 100644..100755
--- a/src/com/fourisland/fourpuzzle/util/Interval.java
+++ b/src/com/fourisland/fourpuzzle/util/Interval.java

diff --git a/src/com/fourisland/fourpuzzle/util/ObjectLoader.java b/src/com/fourisland/fourpuzzle/util/ObjectLoader.java
index 58cf5ee..58cf5ee 100644..100755
--- a/src/com/fourisland/fourpuzzle/util/ObjectLoader.java
+++ b/src/com/fourisland/fourpuzzle/util/ObjectLoader.java

diff --git a/src/com/fourisland/fourpuzzle/util/ResourceNotFoundException.java b/src/com/fourisland/fourpuzzle/util/ResourceNotFoundException.java
index 4db2f61..4db2f61 100644..100755
--- a/src/com/fourisland/fourpuzzle/util/ResourceNotFoundException.java
+++ b/src/com/fourisland/fourpuzzle/util/ResourceNotFoundException.java

diff --git a/src/com/fourisland/fourpuzzle/util/TransparentPixelFilter.java b/src/com/fourisland/fourpuzzle/util/TransparentPixelFilter.java
index ed1c49c..ed1c49c 100644..100755
--- a/src/com/fourisland/fourpuzzle/util/TransparentPixelFilter.java
+++ b/src/com/fourisland/fourpuzzle/util/TransparentPixelFilter.java

diff --git a/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java b/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java
index bf7391e..40fff30 100644..100755
--- a/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java
+++ b/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java

@@ -73,7 +73,7 @@ public class ChoiceWindow {
        Graphics2D g2 = cacheBase.createGraphics();
        
        g2.drawImage(SystemGraphic.getMessageBackground(), 1, 1, TopLeft.getWidth()+getWidth()+TopRight.getWidth()-2, TopLeft.getHeight()+getHeight()+BottomLeft.getHeight()-2, null);
-        g2.drawImage(Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(temp.getSource(), new TransparentPixelFilter(-25600))), 0, 0, null);
+        g2.drawImage(Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(temp.getSource(), new TransparentPixelFilter(SystemGraphic.getTransparentColor().getRGB()))), 0, 0, null);
        g2.setFont(g2.getFont().deriveFont(Font.BOLD));
        
        int ty = TopLeft.getHeight()+g2.getFontMetrics().getHeight()-SPACER;
@@ -86,10 +86,6 @@ public class ChoiceWindow {
                tx += ((width/2)-(g2.getFontMetrics().stringWidth(choice)/2));
            }
            
-            /* TODO The following code paints the text onto the window. However,
-             * when it paints the lowercase 'y', the tail is white, not the
-             * correct gradient. */
-            
            g2.setPaint(new TexturePaint(SystemGraphic.getTextColor(), new Rectangle(tx, ty, g2.getFontMetrics().stringWidth(choice),g2.getFontMetrics().getHeight())));
            g2.drawString(choice, tx, ty);
            
@@ -113,5 +109,21 @@ public class ChoiceWindow {
    {
        return height;
    }
+    
+    int selected = 0;
+    public void moveUp()
+    {
+        selected--;
+    }
+    
+    public void moveDown()
+    {
+        selected++;
+    }
+    
+    public String getSelected()
+    {
+        return choices.get(selected);
+    }
 }
diff --git a/src/com/fourisland/fourpuzzle/window/SystemChoiceArea.java b/src/com/fourisland/fourpuzzle/window/SystemChoiceArea.java
index 8908c10..5fc115f 100644..100755
--- a/src/com/fourisland/fourpuzzle/window/SystemChoiceArea.java
+++ b/src/com/fourisland/fourpuzzle/window/SystemChoiceArea.java

@@ -11,13 +11,13 @@ package com.fourisland.fourpuzzle.window;
 */
 public enum SystemChoiceArea
 {
-    Top(47, 0, 1, 4),
+    Top(47, 0, 1, 9),
-    TopRight(56, 0, 8, 8),
+    TopRight(56, 0, 8, 9),
-    Right(60, 15, 4, 1),
+    Right(56, 15, 8, 1),
-    BottomRight(56, 24, 8, 8),
+    BottomRight(56, 25, 8, 9),
-    Bottom(47, 28, 1, 4),
+    Bottom(47, 24, 1, 9),
-    BottomLeft(32, 24, 8, 8),
+    BottomLeft(32, 24, 11, 9),
-    Left(32, 15, 4, 1),
+    Left(32, 15, 11, 1),
    TopLeft(32, 0, 8, 8),
    UpArrow(43, 9, 10, 6),
    DownArrow(43, 17, 10, 6);
diff --git a/src/com/fourisland/fourpuzzle/window/SystemGraphic.java b/src/com/fourisland/fourpuzzle/window/SystemGraphic.java
index 70fc7fe..ea67f41 100644..100755
--- a/src/com/fourisland/fourpuzzle/window/SystemGraphic.java
+++ b/src/com/fourisland/fourpuzzle/window/SystemGraphic.java

@@ -6,6 +6,7 @@
 package com.fourisland.fourpuzzle.window;
 import com.fourisland.fourpuzzle.util.ObjectLoader;
+import java.awt.Color;
 import java.awt.image.BufferedImage;
 /**
@@ -15,14 +16,15 @@ import java.awt.image.BufferedImage;
 public class SystemGraphic {
    
    private static BufferedImage systemGraphic;
-    static
+    private static String filename = "System";
+    public static void setGraphic(String filename)
    {
-        initalize("System");
+        SystemGraphic.filename = filename;
    }
    
-    public static void initalize(String graphic)
+    public static void initalize()
    {
-        systemGraphic = ObjectLoader.getImage("Picture", graphic);
+        systemGraphic = ObjectLoader.getImage("Picture", filename);
    }
    
    public static BufferedImage getMessageBackground()
@@ -39,5 +41,10 @@ public class SystemGraphic {
    {
        return systemGraphic.getSubimage(0, 48, 16, 16);
    }
+    
+    public static Color getTransparentColor()
+    {
+        return new Color(systemGraphic.getRGB(159, 0));
+    }
 }