diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay toasty/toasty.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay toasty/toasty.png
index a64cb1f9a9..8c664c0323 100644
Binary files a/stepmania/Themes/default/BGAnimations/ScreenGameplay toasty/toasty.png and b/stepmania/Themes/default/BGAnimations/ScreenGameplay toasty/toasty.png differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua
index 74966ea4b1..5817160271 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua	
@@ -45,8 +45,12 @@ t[#t+1] = Def.ActorFrame {
        LoadFont( "common normal" ) .. {
                InitCommand=cmd(y,-25;
                --settext,ProductVersion();
-               settext,"April 1st edition";
+               settext,"NSFW edition";
                diffuse,color("#000000");shadowlength,0;);
        };
 };
+t[#t+1] = LoadActor( "../ScreenGameplay toasty/toasty.png" ) .. {
+	InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_BOTTOM;vertalign,bottom;horizalign,left;);
+};
+
 return t;
diff --git a/stepmania/Themes/default/BGAnimations/_moveon (doubleres).png b/stepmania/Themes/default/BGAnimations/_moveon (doubleres).png
index 8701fee0dd..3eb1aee8c4 100644
Binary files a/stepmania/Themes/default/BGAnimations/_moveon (doubleres).png and b/stepmania/Themes/default/BGAnimations/_moveon (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Challenge (doubleres).png b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Challenge (doubleres).png
index 3a8033aa0e..2aa37367e4 100755
Binary files a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Challenge (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Challenge (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Nonstop (doubleres).png b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Nonstop (doubleres).png
index 439c51e12b..7090ee5f24 100755
Binary files a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Nonstop (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Nonstop (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Normal (doubleres).png b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Normal (doubleres).png
index 32d2deb745..11accac8fe 100755
Binary files a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Normal (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/preview Normal (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_OnePlayerOneSide (doubleres).png b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_OnePlayerOneSide (doubleres).png
index feffb0a9b0..3ce2946309 100755
Binary files a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_OnePlayerOneSide (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_OnePlayerOneSide (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_OnePlayerTwoSides (doubleres).png b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_OnePlayerTwoSides (doubleres).png
index 09f7f6a04a..2fb5d4bcc4 100755
Binary files a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_OnePlayerTwoSides (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_OnePlayerTwoSides (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_TwoPlayersTwoSides (doubleres).png b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_TwoPlayersTwoSides (doubleres).png
index 440ea21e0a..393ab0f836 100755
Binary files a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_TwoPlayersTwoSides (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/preview StyleType_TwoPlayersTwoSides (doubleres).png differ
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index c6fe437b01..0f18b4b3e0 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -1019,7 +1019,7 @@ HeaderText=Bookkeeping
 
 [ScreenCaution]
 Caution=CAUTION!
-CautionText=For safety purposes, play with the lights on and keep the dance platform a safe distance from your TV or monitor as well as any other furniture at all times. Do not allow pets, children, or other spectators on the dance platform during gameplay. Be aware of the platform's position at all times.
+CautionText=This game is for use by adults only.  If you are young or sensitive to adult situations, unplug your computer now!
 
 [ScreenDebugOverlay]
 %s in gameplay=%s in gameplay
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 07b17a16c4..99b474f117 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -87,11 +87,11 @@ SharedSelection=true
 AllowDisabledPlayerInput=true
 OverrideSleepAfterTweenOffSeconds=true
 SleepAfterTweenOffSeconds=0
-ChoiceNames="1,2,3,4,5,6,7"
-DefaultChoice="1"
 NumChoicesOnPage1=100
 WrapCursor=true
 AllowRepeatingInput=true
+ChoiceNames="1,3,4,5,6,7"
+DefaultChoice="1"
 Choice1="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start"
 Choice2="screen,ScreenNetworkOptions;text,Play Online"
 Choice3="screen,ScreenSelectGame;text,Select Game"
diff --git a/stepmania/src/ProductInfo.h b/stepmania/src/ProductInfo.h
index 5b2e7cdc49..e711902c43 100644
--- a/stepmania/src/ProductInfo.h
+++ b/stepmania/src/ProductInfo.h
@@ -12,7 +12,7 @@
 #define PRODUCT_ID_BARE StepMania4
 
 // Version info displayed to the user
-#define PRODUCT_VER_BARE alpha1
+#define PRODUCT_VER_BARE April 1st
 
 // A unique ID for a build of an application.  This is used in crash reports and in the network code's version handling 
 #define PRODUCT_ID_VER_BARE PRODUCT_ID_BARE PRODUCT_VER_BARE
diff --git a/stepmania/src/ProductInfo.inc b/stepmania/src/ProductInfo.inc
index 57916d537f..d6cd322b26 100644
--- a/stepmania/src/ProductInfo.inc
+++ b/stepmania/src/ProductInfo.inc
@@ -5,7 +5,7 @@
 
 ; see ProductInfo.h for use descriptions
 !define PRODUCT_ID "StepMania4"
-!define PRODUCT_VER "alpha1"
+!define PRODUCT_VER "April 1st"
 !define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "sm4"