diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 5ba0dc8b35..af31d4c0b3 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2118,8 +2118,8 @@ EditMode=Full
 ShowGroups=1
 Arrows1X=SCREEN_CENTER_X-130
 Arrows2X=SCREEN_CENTER_X+270
-ArrowsEnabledColor=1,1,1,1
-ArrowsDisabledColor=0.2,0.2,0.2,1
+ArrowsEnabledCommand=diffuse,1,1,1,1;glowshift
+ArrowsDisabledCommand=stopeffect;diffuse,0.2,0.2,0.2,1
 SongBannerX=SCREEN_CENTER_X+170
 SongBannerY=SCREEN_CENTER_Y-110
 SongBannerWidth=130
diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index a7fbfd84d9..a5fe42a82f 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -102,8 +102,8 @@ void EditMenu::Load( const RString &sType )
 
 	SHOW_GROUPS.Load(sType,"ShowGroups");
 	ARROWS_X.Load(sType,ARROWS_X_NAME,NUM_ARROWS);
-	ARROWS_ENABLED_COLOR.Load(sType,"ArrowsEnabledColor");
-	ARROWS_DISABLED_COLOR.Load(sType,"ArrowsDisabledColor");
+	ARROWS_ENABLED_COMMAND.Load(sType,"ArrowsEnabledCommand");
+	ARROWS_DISABLED_COMMAND.Load(sType,"ArrowsDisabledCommand");
 	SONG_BANNER_WIDTH.Load(sType,"SongBannerWidth");
 	SONG_BANNER_HEIGHT.Load(sType,"SongBannerHeight");
 	GROUP_BANNER_WIDTH.Load(sType,"GroupBannerWidth");
@@ -118,8 +118,8 @@ void EditMenu::Load( const RString &sType )
 	for( int i=0; i<2; i++ )
 	{
 		m_sprArrows[i].Load( THEME->GetPathG(sType,i==0?"left":"right") );
-		m_sprArrows[i].SetX( ARROWS_X.GetValue(i) );
-		this->AddChild( &m_sprArrows[i] );
+		m_sprArrows[i]->SetX( ARROWS_X.GetValue(i) );
+		this->AddChild( m_sprArrows[i] );
 	}
 
 	m_SelectedRow = GetFirstRow();
@@ -342,16 +342,16 @@ void EditMenu::ChangeToRow( EditMenuRow newRow )
 	m_SelectedRow = newRow;
 
 	for( int i=0; i<2; i++ )
-		m_sprArrows[i].SetY( ROW_Y.GetValue(newRow) );
+		m_sprArrows[i]->SetY( ROW_Y.GetValue(newRow) );
 	UpdateArrows();
 }
 
 void EditMenu::UpdateArrows()
 {
-	m_sprArrows[0].SetDiffuse( CanGoLeft() ? ARROWS_ENABLED_COLOR : ARROWS_DISABLED_COLOR );
-	m_sprArrows[1].SetDiffuse( CanGoRight()? ARROWS_ENABLED_COLOR : ARROWS_DISABLED_COLOR );
-	m_sprArrows[0].EnableAnimation( CanGoLeft() );
-	m_sprArrows[1].EnableAnimation( CanGoRight() );
+	m_sprArrows[0]->RunCommands( CanGoLeft() ? ARROWS_ENABLED_COMMAND : ARROWS_DISABLED_COMMAND );
+	m_sprArrows[1]->RunCommands( CanGoRight()? ARROWS_ENABLED_COMMAND : ARROWS_DISABLED_COMMAND );
+	m_sprArrows[0]->EnableAnimation( CanGoLeft() );
+	m_sprArrows[1]->EnableAnimation( CanGoRight() );
 }
 
 static LocalizedString BLANK ( "EditMenu", "Blank" );
diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h
index fc3d9c40e7..288304832e 100644
--- a/stepmania/src/EditMenu.h
+++ b/stepmania/src/EditMenu.h
@@ -80,7 +80,7 @@ private:
 	void GetGroupsToShow( vector<RString> &vsGroupsOut );
 
 	void UpdateArrows();
-	Sprite	m_sprArrows[NUM_ARROWS];
+	AutoActor	m_sprArrows[NUM_ARROWS];
 
 	EditMenuRow m_SelectedRow;
 	EditMenuRow GetFirstRow() const { return SHOW_GROUPS.GetValue()? ROW_GROUP:ROW_SONG; }
@@ -118,8 +118,8 @@ private:
 
 	ThemeMetric<bool> SHOW_GROUPS;
 	ThemeMetric1D<float> ARROWS_X;
-	ThemeMetric<RageColor> ARROWS_ENABLED_COLOR;
-	ThemeMetric<RageColor> ARROWS_DISABLED_COLOR;
+	ThemeMetric<apActorCommands> ARROWS_ENABLED_COMMAND;
+	ThemeMetric<apActorCommands> ARROWS_DISABLED_COMMAND;
 	ThemeMetric<float> SONG_BANNER_WIDTH;
 	ThemeMetric<float> SONG_BANNER_HEIGHT;
 	ThemeMetric<float> GROUP_BANNER_WIDTH;