diff --git a/src/RageDisplay_D3D.cpp b/src/RageDisplay_D3D.cpp
index e97865f5fd..cbfcf72e19 100644
--- a/src/RageDisplay_D3D.cpp
+++ b/src/RageDisplay_D3D.cpp
@@ -294,18 +294,19 @@ D3DFORMAT FindBackBufferType(bool bWindowed, int iBPP)
 	vector<D3DFORMAT> vBackBufferFormats; // throw all possibilities in here
 
 	// When windowed, add all formats; otherwise add only formats that match dwBPP.
-	if( iBPP == 16 || bWindowed )
-	{
-		vBackBufferFormats.push_back( D3DFMT_R5G6B5 );
-		vBackBufferFormats.push_back( D3DFMT_X1R5G5B5 );
-		vBackBufferFormats.push_back( D3DFMT_A1R5G5B5 );
-	}
 	if( iBPP == 32 || bWindowed )
 	{
 		vBackBufferFormats.push_back( D3DFMT_R8G8B8 );
 		vBackBufferFormats.push_back( D3DFMT_X8R8G8B8 );
 		vBackBufferFormats.push_back( D3DFMT_A8R8G8B8 );
 	}
+	if( iBPP == 16 || bWindowed )
+	{
+		vBackBufferFormats.push_back( D3DFMT_R5G6B5 );
+		vBackBufferFormats.push_back( D3DFMT_X1R5G5B5 );
+		vBackBufferFormats.push_back( D3DFMT_A1R5G5B5 );
+	}
+	
 
 	if( !bWindowed && iBPP != 16 && iBPP != 32 )
 	{
@@ -351,7 +352,7 @@ RString SetD3DParams( bool &bNewDeviceOut )
 			D3DADAPTER_DEFAULT, 
 			D3DDEVTYPE_HAL, 
 			GraphicsWindow::GetHwnd(),
-			D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED,
+			D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED,
 			&g_d3dpp, 
 			&g_pd3dDevice );
 		if( FAILED(hr) )