diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay toasty/toasty.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay toasty/toasty.png
index 8c664c0323..4e64371825 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 5817160271..fbf4a1e074 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua	
@@ -43,14 +43,8 @@ t[#t+1] = Def.ActorFrame {
        LoadActor( "stepmania logo" ) .. {
        };
        LoadFont( "common normal" ) .. {
-               InitCommand=cmd(y,-25;
-               --settext,ProductVersion();
-               settext,"NSFW edition";
-               diffuse,color("#000000");shadowlength,0;);
+               InitCommand=cmd(y,-25;settext,ProductVersion();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 3eb1aee8c4..8701fee0dd 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 2aa37367e4..5ea36e5acc 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 7090ee5f24..fb21ef5d55 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 11accac8fe..32d2deb745 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 3ce2946309..6b7b5cec03 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 2fb5d4bcc4..09f7f6a04a 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 393ab0f836..440ea21e0a 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 0f18b4b3e0..c6fe437b01 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=This game is for use by adults only.  If you are young or sensitive to adult situations, unplug your computer now!
+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.
 
 [ScreenDebugOverlay]
 %s in gameplay=%s in gameplay
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 99b474f117..30f8196917 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -90,7 +90,7 @@ SleepAfterTweenOffSeconds=0
 NumChoicesOnPage1=100
 WrapCursor=true
 AllowRepeatingInput=true
-ChoiceNames="1,3,4,5,6,7"
+ChoiceNames="1,2,3,4,5,6,7"
 DefaultChoice="1"
 Choice1="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start"
 Choice2="screen,ScreenNetworkOptions;text,Play Online"
diff --git a/stepmania/src/ProductInfo.h b/stepmania/src/ProductInfo.h
index e711902c43..90a77b58af 100644
--- a/stepmania/src/ProductInfo.h
+++ b/stepmania/src/ProductInfo.h
@@ -9,10 +9,10 @@
 #define PRODUCT_FAMILY_BARE StepMania
 
 // A unique name for each application that you might want installed side-by-side with other applications - i.e. "StepMania4" not "StepMania" (would conflict with StepMania 3.x)
-#define PRODUCT_ID_BARE StepMania4
+#define PRODUCT_ID_BARE StepMania 4
 
 // Version info displayed to the user
-#define PRODUCT_VER_BARE April 1st
+#define PRODUCT_VER_BARE alpha 1
 
 // 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 d6cd322b26..3906b0f648 100644
--- a/stepmania/src/ProductInfo.inc
+++ b/stepmania/src/ProductInfo.inc
@@ -4,8 +4,8 @@
 !define PRODUCT_FAMILY "StepMania"
 
 ; see ProductInfo.h for use descriptions
-!define PRODUCT_ID "StepMania4"
-!define PRODUCT_VER "April 1st"
+!define PRODUCT_ID "StepMania 4"
+!define PRODUCT_VER "alpha 1"
 !define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "sm4"