diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 403fe424f4..2f6edccb0c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -600,6 +600,8 @@ SectionColor5=0.0, 0.6, 0.6, 1
 SectionColor6=0.0, 0.6, 0.2, 1
 SectionColor7=0.8, 0.6, 0.0, 1
 SongRealExtraColor=0.9,0.9,0,1		// yellow
+ShowRoulette=1
+ShowRandom=1
 
 [LifeMeterBar]
 MeterWidth=260
diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp
index 0979e021c4..8c6b582f31 100644
--- a/stepmania/src/MusicBannerWheel.cpp
+++ b/stepmania/src/MusicBannerWheel.cpp
@@ -29,8 +29,8 @@ enum
 	GOINGRIGHT
 };
 
-#define DEFAULT_SCROLL_DIRECTION		THEME->GetMetricI("Notes","DefaultScrollDirection")
-#define PREVIEWMUSICMODE		THEME->GetMetricI("ScreenEz2SelectMusic","PreviewMusicMode")
+#define DEFAULT_SCROLL_DIRECTION	THEME->GetMetricI("Notes","DefaultScrollDirection")
+#define PREVIEWMUSICMODE			THEME->GetMetricI("ScreenEz2SelectMusic","PreviewMusicMode")
 
 MusicBannerWheel::MusicBannerWheel() 
 { 
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index e008cccee5..e36da649e8 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -40,6 +40,8 @@
 #define SECTION_COLORS( i )			THEME->GetMetricC("MusicWheel",ssprintf("SectionColor%d",i+1))
 #define DEFAULT_SCROLL_DIRECTION	THEME->GetMetricI("Notes","DefaultScrollDirection")
 #define SONG_REAL_EXTRA_COLOR		THEME->GetMetricC("MusicWheel","SongRealExtraColor")
+#define SHOW_ROULETTE				THEME->GetMetricB("MusicWheel","ShowRoulette")
+#define SHOW_RANDOM					THEME->GetMetricB("MusicWheel","ShowRandom")
 
 
 const int MAX_WHEEL_SOUND_SPEED = 15;
@@ -295,13 +297,14 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 {
 	unsigned i;
 
-	// Roulette is used only in arcade and battle
+	// Roulette isn't a choice when selecting a course
 	if( so == SongSortOrder(SORT_ROULETTE) )
 	{
 		switch( GAMESTATE->m_PlayMode )
 		{
-		case PLAY_MODE_ARCADE:
-		case PLAY_MODE_BATTLE:
+		case PLAY_MODE_NONSTOP:
+		case PLAY_MODE_ONI:
+		case PLAY_MODE_ENDLESS:
 			break;
 		default:
             return;
@@ -360,7 +363,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 			case SORT_GROUP:		bUseSections = GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC;	break;
 			case SORT_TITLE:		bUseSections = true;	break;
 			case SORT_ROULETTE:		bUseSections = false;	break;
-			default:		ASSERT( false );
+			default:		ASSERT( 0 );
 			}
 
 			if( PREFSMAN->m_MusicWheelUsesSections == PrefsManager::NEVER || (so != SORT_TITLE && PREFSMAN->m_MusicWheelUsesSections == PrefsManager::ABC_ONLY ))
@@ -409,8 +412,10 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 
 			if( so != SORT_ROULETTE )
 			{
-				arrayWheelItemDatas.push_back( WheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1)) );
-				arrayWheelItemDatas.push_back( WheelItemData(TYPE_RANDOM, NULL, "", NULL, RageColor(1,0,0,1)) );
+				if( SHOW_ROULETTE )
+					arrayWheelItemDatas.push_back( WheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1)) );
+				if( SHOW_RANDOM )
+					arrayWheelItemDatas.push_back( WheelItemData(TYPE_RANDOM, NULL, "", NULL, RageColor(1,0,0,1)) );
 			}
 
 			// HACK:  Add extra stage item if it isn't already present on the music wheel
diff --git a/stepmania/src/MusicWheelItem.h b/stepmania/src/MusicWheelItem.h
index 32d8761a63..13fe52c730 100644
--- a/stepmania/src/MusicWheelItem.h
+++ b/stepmania/src/MusicWheelItem.h
@@ -11,23 +11,6 @@
 -----------------------------------------------------------------------------
 */
 
-//#include "Sprite.h"
-//#include "song.h"
-//#include "ActorFrame.h"
-//#include "BitmapText.h"
-//#include "Quad.h"
-//#include "TextBanner.h"
-//#include "RandomSample.h"
-//#include "SmallGradeDisplay.h"
-//#include "GameConstantsAndTypes.h"
-//#include "MusicSortDisplay.h"
-//#include "WheelNotifyIcon.h"
-//#include "Screen.h"		// for ScreenMessage
-//#include "ScoreDisplayNormal.h"
-//#include "ScrollBar.h"
-//#include "Course.h"
-//#include "RageTimer.h"
-
 
 enum WheelItemType { TYPE_SECTION, TYPE_SONG, TYPE_ROULETTE, TYPE_RANDOM, TYPE_COURSE };