diff --git a/AndorsTrail/res/xml/home.tmx b/AndorsTrail/res/xml/home.tmx
index b7c92293c..b4df67f82 100644
--- a/AndorsTrail/res/xml/home.tmx
+++ b/AndorsTrail/res/xml/home.tmx
@@ -1,44 +1,4 @@
 <?xml version="1.0" ?><map height="10" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="10">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
   <image height="256" source="../drawable/map_bed_1.png" width="512"/>
  </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
@@ -185,8 +145,8 @@
   <object height="32" name="andor:1" type="key" width="320" x="0" y="288">
    <properties>
     <property name="phrase" value="keyarea_andor1"/>
-    <property name="requireType" value="questProgress"/>
     <property name="requireId" value="andor"/>
+    <property name="requireType" value="questProgress"/>
     <property name="requireValue" value="1"/>
    </properties>
   </object>
@@ -194,4 +154,4 @@
  <objectgroup name="spawn" visible="0">
   <object height="32" name="mikhail" type="spawn" width="32" x="224" y="128"/>
  </objectgroup>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
index 82c0bd7b5..e7e67dd2f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
@@ -29,7 +29,7 @@ public final class VisualEffectController {
 	private final VisualEffectCollection effectTypes;
 
 	public final VisualEffectFrameListeners visualEffectFrameListeners = new VisualEffectFrameListeners();
-
+	
 	public VisualEffectController(ControllerContext controllers, WorldContext world) {
 		this.controllers = controllers;
 		this.world = world;
@@ -119,6 +119,8 @@ public final class VisualEffectController {
 			else postDelayed(this, 0);
 		}
 		
+		
+		
 	}
 
 	public static final Paint textPaint = new Paint();
@@ -261,4 +263,6 @@ public final class VisualEffectController {
 			return -1;
 		}
 	}
+
+	
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
index cec0fcdba..48a756c0e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
@@ -21,7 +21,7 @@ public final class VisualEffectFrameListeners extends ListOfListeners<VisualEffe
 	private final Function1<VisualEffectFrameListener, SpriteMoveAnimation> onSpriteMoveCompleted = new Function1<VisualEffectFrameListener, SpriteMoveAnimation>() {
 		@Override public void call(VisualEffectFrameListener listener, SpriteMoveAnimation animation) { listener.onSpriteMoveCompleted(animation); }
 	};
-
+	
 	@Override
 	public void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset) {
 		callAllListeners(this.onNewAnimationFrame, animation, tileID, textYOffset);
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 595adb966..2eed42685 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
@@ -10,10 +10,11 @@ import com.gpl.rpg.AndorsTrail.util.Size;
 import java.util.Collection;
 
 public final class LayeredTileMap {
-	private static final ColorFilter colorFilterBlack20 = createGrayScaleColorFilter(0.2f);
-	private static final ColorFilter colorFilterBlack40 = createGrayScaleColorFilter(0.4f);
-	private static final ColorFilter colorFilterBlack60 = createGrayScaleColorFilter(0.6f);
-	private static final ColorFilter colorFilterBlack80 = createGrayScaleColorFilter(0.8f);
+	private static final ColorFilter colorFilterBlack20 = createGrayScaleColorFilter(0.8f);
+	private static final ColorFilter colorFilterBlack40 = createGrayScaleColorFilter(0.6f);
+	private static final ColorFilter colorFilterBlack60 = createGrayScaleColorFilter(0.4f);
+	private static final ColorFilter colorFilterBlack80 = createGrayScaleColorFilter(0.2f);
+	private static final ColorFilter colorFilterInvert = createInvertColorFilter();
 
 	private final Size size;
 	public final MapSection currentLayout;
@@ -78,6 +79,7 @@ public final class LayeredTileMap {
 		else if (colorFilter.equals("black40")) return colorFilterBlack40;
 		else if (colorFilter.equals("black60")) return colorFilterBlack60;
 		else if (colorFilter.equals("black80")) return colorFilterBlack80;
+		else if (colorFilter.equals("invert")) return colorFilterInvert;
 		return null;
 	}
 
@@ -90,6 +92,15 @@ public final class LayeredTileMap {
 			0.00f, 0.00f, 0.00f, 1.0f, 0.0f
 		});
 	}
+	
+	private static ColorMatrixColorFilter createInvertColorFilter() {
+		return new ColorMatrixColorFilter(new float[] {
+			-1.00f, 0.00f, 0.00f, 0.0f, 255.0f,
+			0.00f, -1.00f, 0.00f, 0.0f, 255.0f,
+			0.00f, 0.00f, -1.00f, 0.0f, 255.0f,
+			0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+		});
+	}
 
 	public String getCurrentLayoutHash() {
 		return currentLayoutHash;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
index 5c8a5ea2c..28b9a2a03 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
@@ -2,11 +2,9 @@ package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Paint.Style;
 import android.graphics.Rect;
 import android.os.Handler;
 import android.util.AttributeSet;
@@ -24,7 +22,13 @@ import com.gpl.rpg.AndorsTrail.controller.InputController;
 import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.BloodSplatter;
 import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnimation;
 import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
-import com.gpl.rpg.AndorsTrail.controller.listeners.*;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatSelectionListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.GameRoundListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MapLayoutListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterMovementListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterSpawnListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerMovementListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.VisualEffectFrameListener;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
@@ -118,6 +122,8 @@ public final class MainView extends SurfaceView
 		requestFocus();
 		setOnClickListener(this.inputController);
 		setOnLongClickListener(this.inputController);
+		
+		
 	}
 
 	@Override
@@ -201,7 +207,7 @@ public final class MainView extends SurfaceView
 	}
 
 	private static enum RedrawAllDebugReason {
-		SurfaceChanged, MapChanged, PlayerMoved, MapScrolling
+		SurfaceChanged, MapChanged, PlayerMoved, MapScrolling, FilterAnimation
 	}
 	private static enum RedrawAreaDebugReason {
 		MonsterMoved, MonsterKilled, EffectCompleted