diff --git a/src/win32/Direct3D.cpp b/src/win32/Direct3D.cpp
index ea055f78..928c3ad4 100644
--- a/src/win32/Direct3D.cpp
+++ b/src/win32/Direct3D.cpp
@@ -248,13 +248,6 @@ bool Direct3DDisplay::initialize()
 	screenFormat = mode.Format;
 
 	switch(mode.Format) {
-  case D3DFMT_A2R10G10B10:
-	  systemColorDepth = 32;
-	  systemRedShift = 25;
-	  systemGreenShift = 15;
-	  systemBlueShift = 5;
-	  Init_2xSaI(32); // TODO: verify
-	  break;
   case D3DFMT_X8R8G8B8:
 	  systemColorDepth = 32;
 	  systemRedShift = 19;
diff --git a/src/win32/FullscreenSettings.cpp b/src/win32/FullscreenSettings.cpp
index 1bd7b1d6..8f70c091 100644
--- a/src/win32/FullscreenSettings.cpp
+++ b/src/win32/FullscreenSettings.cpp
@@ -131,27 +131,21 @@ void FullscreenSettings::OnCbnSelchangeComboDevice()
 		D3DDISPLAYMODE mode;
 		combo_color_depth.ResetContent();
 
-		res = pD3D->EnumAdapterModes( adapter, D3DFMT_A2R10G10B10, 0, &mode );
-		if( res == D3D_OK ) {
-			int index = combo_color_depth.AddString( _T("32bit+ (A2R10G10B10)") );
-			combo_color_depth.SetItemData( index, (DWORD_PTR)D3DFMT_A2R10G10B10 );
-		}
-
 		res = pD3D->EnumAdapterModes( adapter, D3DFMT_X8R8G8B8, 0, &mode );
 		if( res == D3D_OK ) {
-			int index = combo_color_depth.AddString( _T("32bit (X8R8G8B8)") );
+			int index = combo_color_depth.AddString( _T("24bit (X8R8G8B8)") );
 			combo_color_depth.SetItemData( index, (DWORD_PTR)D3DFMT_X8R8G8B8 );
 		}
 
 		res = pD3D->EnumAdapterModes( adapter, D3DFMT_R5G6B5, 0, &mode );
 		if( res == D3D_OK ) {
-			int index = combo_color_depth.AddString( _T("16bit+ (R5G6B5)") );
+			int index = combo_color_depth.AddString( _T("16bit (R5G6B5)") );
 			combo_color_depth.SetItemData( index, (DWORD_PTR)D3DFMT_R5G6B5 );
 		}
 
 		res = pD3D->EnumAdapterModes( adapter, D3DFMT_X1R5G5B5, 0, &mode );
 		if( res == D3D_OK ) {
-			int index = combo_color_depth.AddString( _T("16bit (X1R5G5B5)") );
+			int index = combo_color_depth.AddString( _T("15bit (X1R5G5B5)") );
 			combo_color_depth.SetItemData( index, (DWORD_PTR)D3DFMT_X1R5G5B5 );
 		}
 
@@ -470,11 +464,8 @@ void FullscreenSettings::OnOK()
 
 		m_device = (unsigned int)adapter;
 		switch( mode.Format )
-		{ // TODO: use these assignments for VBA as well
-		case D3DFMT_A2R10G10B10:
-			m_colorDepth = 30;
-			break;
-		case D3DFMT_X8R8G8B8:
+		{
+        case D3DFMT_X8R8G8B8:
 			m_colorDepth = 24;
 			break;
 		case D3DFMT_R5G6B5: