diff --git a/.hgignore b/.hgignore
index e6d24d9dea..f2cb7dcf1e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -43,6 +43,7 @@ src/verstub.cpp
 nsis_strings_temp.inc
 Data/SpeedMods.txt
 Program/StepMania*.lib
+crashinfo.txt
 
 syntax: regexp
 .*\#.*\#$
diff --git a/Docs/SimfileFormats/new format draft.txt b/Docs/SimfileFormats/new format draft.txt
new file mode 100644
index 0000000000..b19f658190
--- /dev/null
+++ b/Docs/SimfileFormats/new format draft.txt	
@@ -0,0 +1,47 @@
+$INFORMATION:maintitle:subtitle:artist:genre:credit;
+$TRANSLITS:main:sub:artist;
+$GRAPHICS:banner:background:disc:cdtitle;
+$MUSIC:music-file:base-track:intro-file:lyrics;
+// should be used if a intro file is not defined
+$SAMPLEPREVIEW:start:length;
+$DISPLAYBPM:[from:to]|[one]|[show yes/no];
+$BGCHANGES:
+	beat=file:p,r,o,p,s
+;
+$FGCHANGES:;
+$KEYSOUNDS:;
+
+// cache tags here
+$CACHE:
+	firstbeat:
+	lastbeat:
+	songfilename:
+	hasmusic:
+	hasbanner
+;
+
+// note data
+#NOTEDATA#
+$META:
+	STEPSTYPE=stepstype:
+	DIFFICULTY=difficulty:
+	DESCRIPTION=description:
+	METER=meter:
+	RADARVALUES=r,a,d,a,r,v,a,l,u,e,s;
+$TIMINGDATA:
+	BPM=bpms:
+	SPEED=speed:
+	STOPS=stops:
+	DELAYS=delays:
+	TIMESIGNATURES=timesigs;
+$NOTES:
+00000
+00000
+00000
+00000
+,
+00000
+00000
+00000
+00000
+;
\ No newline at end of file
diff --git a/NoteSkins/pump/default/DownLeft Outline Receptor.redir b/NoteSkins/pump/default/DownLeft Outline Receptor.redir
new file mode 100644
index 0000000000..04b2ead777
--- /dev/null
+++ b/NoteSkins/pump/default/DownLeft Outline Receptor.redir	
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
diff --git a/NoteSkins/pump/default/UpLeft Receptor.lua b/NoteSkins/pump/default/UpLeft Receptor.lua
index a5d1e7e0f7..d6845a1d7d 100644
--- a/NoteSkins/pump/default/UpLeft Receptor.lua	
+++ b/NoteSkins/pump/default/UpLeft Receptor.lua	
@@ -19,20 +19,26 @@ return Def.ActorFrame {
 	
 	-- LAYERS --
 	NOTESKIN:LoadActor("Center", "Outline Receptor")..{
-		Name="Outline";
-		Condition=Var "Button" == "Center";
+		Name="Outline Full";
+		Condition=Var "Button" == "Center" and GAMESTATE:GetCurrentStyle():GetStepsType() ~= 'StepsType_Pump_Halfdouble';
 		--InitCommand=cmd(x,96);
 	};
+	NOTESKIN:LoadActor("DownLeft", "Outline Receptor")..{
+		Name="Outline Half";
+		Condition=Var "Button" == "DownLeft" and GAMESTATE:GetCurrentStyle():GetStepsType() == 'StepsType_Pump_Halfdouble';
+		--InitCommand=cmd(x,96);
+	};
+	
 	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{
 		Name="Base";
 		Frames = { { Frame = 0 } };
-		--PressCommand=cmd(finishtweening;glow,1,1,1,1;linear,0.1;glow,1,1,1,0);
+		PressCommand=cmd(finishtweening;linear,0.05;zoom,0.9;linear,0.1;zoom,1);
 	};
 	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{
 		Name="Glow";
 		Frames = { { Frame = 1 } };
 		InitCommand=cmd(blend,'BlendMode_Add');
-		--PressCommand=cmd(finishtweening;linear,0.05;zoom,0.9;linear,0.1;zoom,1);
+		PressCommand=cmd(finishtweening;linear,0.05;zoom,0.9;linear,0.1;zoom,1);
 	};
 	--[[
 	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{