diff --git a/src/OptionsList.cpp b/src/OptionsList.cpp
index 4b0468440a..1a09c1378e 100644
--- a/src/OptionsList.cpp
+++ b/src/OptionsList.cpp
@@ -254,9 +254,13 @@ void OptionsList::Reset()
 }
 
 void OptionsList::Open()
-{	
+{
 	this->PlayCommand( "Reset" );
 
+	Message msg("OptionsListOpened");
+	msg.SetParam( "Player", m_pn );
+	MESSAGEMAN->Broadcast( msg );
+
 	/* Push the initial menu. */
 	ASSERT( m_asMenuStack.size() == 0 );
 	Push( TOP_MENU );
@@ -268,6 +272,10 @@ void OptionsList::Open()
 
 void OptionsList::Close()
 {
+	Message msg("OptionsListClosed");
+	msg.SetParam( "Player", m_pn );
+	MESSAGEMAN->Broadcast( msg );
+
 	m_bStartIsDown = false;
 	m_asMenuStack.clear();
 	this->PlayCommand( "TweenOff" );
diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp
index ca0a4e4cb5..e283772b85 100644
--- a/src/ScreenSelectMusic.cpp
+++ b/src/ScreenSelectMusic.cpp
@@ -496,15 +496,12 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 			{
 				m_OptionsList[pn].Input( input );
 
-				if( !m_OptionsList[pn].IsOpened() )
-					CloseOptionsList( pn );
-
 				return;
 			}
 			else
 			{
 				if( input.type == IET_RELEASE  &&  input.MenuI == GAME_BUTTON_SELECT && m_bAcceptSelectRelease[pn] )
-					OpenOptionsList( pn );
+					m_OptionsList[pn].Open();
 			}
 		}
 	}
@@ -1036,7 +1033,7 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input )
 		if( !TWO_PART_SELECTION || m_SelectionState == SelectionState_SelectingSteps )
 		{
 			if( m_OptionsList[p].IsOpened() )
-				CloseOptionsList(p);
+				m_OptionsList[p].Close();
 		}
 		UpdateSelectButton( p, false );
 	}
@@ -1469,22 +1466,6 @@ void ScreenSelectMusic::AfterMusicChange()
 	AfterStepsOrTrailChange( vpns );
 }
 
-void ScreenSelectMusic::OpenOptionsList( PlayerNumber pn )
-{
-	m_OptionsList[pn].Open();
-	Message msg("OptionsListOpened");
-	msg.SetParam( "Player", pn );
-	MESSAGEMAN->Broadcast( msg );
-}
-
-void ScreenSelectMusic::CloseOptionsList( PlayerNumber pn )
-{
-	m_OptionsList[pn].Close();
-	Message msg("OptionsListClosed");
-	msg.SetParam( "Player", pn );
-	MESSAGEMAN->Broadcast( msg );
-}
-
 // lua start
 #include "LuaBinding.h"
 
diff --git a/src/ScreenSelectMusic.h b/src/ScreenSelectMusic.h
index dca3ece990..56dee1d380 100644
--- a/src/ScreenSelectMusic.h
+++ b/src/ScreenSelectMusic.h
@@ -47,9 +47,7 @@ public:
 	bool GetGoToOptions() const { return m_bGoToOptions; }
 	MusicWheel *GetMusicWheel() { return &m_MusicWheel; }
 
-	//
 	// Lua
-	//
 	virtual void PushSelf( lua_State *L );
 
 protected:
@@ -120,8 +118,6 @@ protected:
 	BitmapText		m_textHighScore[NUM_PLAYERS];
 	MusicWheel		m_MusicWheel;
 	OptionsList		m_OptionsList[NUM_PLAYERS];
-	void OpenOptionsList( PlayerNumber pn );
-	void CloseOptionsList( PlayerNumber pn );
 
 	SelectionState		m_SelectionState;
 	bool			m_bStepsChosen[NUM_PLAYERS];	// only used in SelectionState_SelectingSteps
diff --git a/src/StepMania-net2003.vcproj b/src/StepMania-net2003.vcproj
index 586cf87f9b..e9c9ad5e11 100644
--- a/src/StepMania-net2003.vcproj
+++ b/src/StepMania-net2003.vcproj
@@ -133,7 +133,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 &quot;$(intdir)\verstub.obj&quot;"
-				AdditionalDependencies="libjpeg/jpeg.lib libpng/lib/libpng.lib"
+				AdditionalDependencies="libjpeg/jpeg.lib libpng/lib/libpng.lib ffmpeg/modern_working/lib/avcodec.lib ffmpeg/modern_working/lib/avformat.lib ffmpeg/modern_working/lib/avutil.lib ffmpeg/modern_working/lib/swscale.lib"
 				ShowProgress="0"
 				OutputFile="../Program/StepMania.exe"
 				LinkIncremental="2"
@@ -1088,6 +1088,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="ScoreKeeperRave.h">
 			</File>
+			<File
+				RelativePath=".\ScoreKeeperShared.cpp">
+			</File>
+			<File
+				RelativePath=".\ScoreKeeperShared.h">
+			</File>
 			<File
 				RelativePath="ScreenDimensions.cpp">
 			</File>
diff --git a/src/archutils/Win32/StepMania.ico b/src/archutils/Win32/StepMania.ico
index 333eead80b..5a530ab403 100644
Binary files a/src/archutils/Win32/StepMania.ico and b/src/archutils/Win32/StepMania.ico differ
diff --git a/src/archutils/Win32/smzip.ico b/src/archutils/Win32/smzip.ico
index 1824207216..3bed904eff 100644
Binary files a/src/archutils/Win32/smzip.ico and b/src/archutils/Win32/smzip.ico differ