diff --git a/src/guiengine/my_button.hpp b/src/guiengine/my_button.hpp
index 2a072cc29..713b1d83f 100644
--- a/src/guiengine/my_button.hpp
+++ b/src/guiengine/my_button.hpp
@@ -92,7 +92,13 @@ class MyGUIButton : public IGUIButton
         
 		//! Reads attributes of the element
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
-        
+
+		//! Sets if the button should scale the button images to fit
+        virtual void setScaleImage(bool scaleImage=true) {};
+
+		//! Checks whether the button scales the used images
+        virtual bool isScalingImage() const { return true; }
+
 	private:
         
 		struct ButtonSprite
diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj
index 0fbf9b6a5..2babccaea 100644
--- a/src/ide/vc9/supertuxkart.vcproj
+++ b/src/ide/vc9/supertuxkart.vcproj
@@ -43,7 +43,7 @@
 				Optimization="0"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="../../../src;../../../src/bullet/src;"$(STK_INCLUDE)";../../../src/enet/include;"$(IRR_INCLUDE)""
-				PreprocessorDefinitions="BT_NO_PROFILE;HAVE_OPENAL;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"SVN\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT;HAVE_IRRLICHT;_CRTDBG_MAP_ALLOC"
+				PreprocessorDefinitions="BT_NO_PROFILE;HAVE_OPENAL;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"SVN\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT;HAVE_IRRLICHT;_CRTDBG_MAP_ALLOC;IRR_SVN"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -131,7 +131,7 @@
 				Name="VCCLCompilerTool"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../../src;../../../src/bullet/src;"$(STK_INCLUDE)";../../../src/enet/include;"$(IRR_INCLUDE)""
-				PreprocessorDefinitions="HAVE_OPENAL;HAVE_OGGVORBIS;NDEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"SVN\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;BT_NO_PROFILE;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT;HAVE_IRRLICHT"
+				PreprocessorDefinitions="HAVE_OPENAL;HAVE_OGGVORBIS;NDEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"SVN\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;BT_NO_PROFILE;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT;HAVE_IRRLICHT;IRR_SVN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -208,6 +208,10 @@
 					RelativePath="..\..\guiengine\abstract_state_manager.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\guiengine\cutscene.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\guiengine\engine.cpp"
 					>
@@ -792,22 +796,58 @@
 					RelativePath="..\..\states_screens\credits.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\states_screens\feature_unlocked.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\help_screen_1.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\help_screen_2.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\help_screen_3.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\states_screens\kart_selection.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\states_screens\options_screen.cpp"
+					RelativePath="..\..\states_screens\main_menu_screen.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\options_screen_av.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\options_screen_input.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\options_screen_players.cpp"
 					>
 				</File>
 				<File
 					RelativePath="..\..\states_screens\race_gui.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\states_screens\race_setup_screen.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\states_screens\state_manager.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\states_screens\tracks_screen.cpp"
+					>
+				</File>
 				<Filter
 					Name="dialogs"
 					>
@@ -854,6 +894,10 @@
 					RelativePath="..\..\guiengine\abstract_state_manager.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\guiengine\cutscene.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\guiengine\engine.hpp"
 					>
@@ -1522,22 +1566,58 @@
 					RelativePath="..\..\states_screens\credits.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\states_screens\feature_unlocked.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\help_screen_1.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\help_screen_2.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\help_screen_3.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\states_screens\kart_selection.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\states_screens\options_screen.hpp"
+					RelativePath="..\..\states_screens\main_menu_screen.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\options_screen_av.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\options_screen_input.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\states_screens\options_screen_players.hpp"
 					>
 				</File>
 				<File
 					RelativePath="..\..\states_screens\race_gui.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\states_screens\race_setup_screen.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\states_screens\state_manager.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\states_screens\tracks_screen.hpp"
+					>
+				</File>
 				<Filter
 					Name="dialogs"
 					>