diff --git a/stepmania/NEWS b/stepmania/NEWS
index aa12cef684..e89ff11412 100644
--- a/stepmania/NEWS
+++ b/stepmania/NEWS
@@ -1,4 +1,5 @@
 ------------------------CVS after 3.00 beta 6rc2----------------
+BUG FIX:  Crash handler works better in full screen.
 BUG FIX:  Crash handler restarts correctly.
 BUG FIX:  Fixed choosing song filenames when saving.
 BUG FIX:  Fix Endless crash when a song folder has over 99 minutes of songs.
diff --git a/stepmania/src/StepMania.RC b/stepmania/src/StepMania.RC
index a3a16d3bce..0ca08d8f8d 100644
--- a/stepmania/src/StepMania.RC
+++ b/stepmania/src/StepMania.RC
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE MOVEABLE PURE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE MOVEABLE PURE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE MOVEABLE PURE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
@@ -52,7 +52,7 @@ END
 // Accelerator
 //
 
-IDR_MAIN_ACCEL ACCELERATORS MOVEABLE PURE 
+IDR_MAIN_ACCEL ACCELERATORS 
 BEGIN
     VK_F5,          IDM_CHANGEDETAIL,       VIRTKEY, NOINVERT
     "X",            IDM_EXIT,               VIRTKEY, ALT, NOINVERT
@@ -68,9 +68,8 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON                ICON    DISCARDABLE     "StepMania.ICO"
+IDI_ICON                ICON                    "StepMania.ICO"
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -93,14 +92,14 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "http://www.stepmania.com\0"
-            VALUE "FileDescription", "StepMania\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "StepMania\0"
-            VALUE "LegalCopyright", "Copyright © 2001-2002\0"
-            VALUE "OriginalFilename", "StepMania.exe\0"
-            VALUE "ProductName", "  StepMania\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "CompanyName", "http://www.stepmania.com"
+            VALUE "FileDescription", "StepMania"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "StepMania"
+            VALUE "LegalCopyright", "Copyright © 2001-2002"
+            VALUE "OriginalFilename", "StepMania.exe"
+            VALUE "ProductName", "  StepMania"
+            VALUE "ProductVersion", "1, 0, 0, 1"
         END
     END
     BLOCK "VarFileInfo"
@@ -109,25 +108,23 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
 //
 
-BITMAP_ERROR            BITMAP  MOVEABLE PURE   "error.bmp"
-BITMAP_LOADING          BITMAP  MOVEABLE PURE   "loading.bmp"
-BITMAP_CRASH            BITMAP  MOVEABLE PURE   "error2.bmp"
+BITMAP_ERROR            BITMAP                  "error.bmp"
+BITMAP_LOADING          BITMAP                  "loading.bmp"
+BITMAP_CRASH            BITMAP                  "error2.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
-IDD_ERROR_DIALOG DIALOG DISCARDABLE  0, 0, 332, 234
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+IDD_ERROR_DIALOG DIALOG  0, 0, 332, 234
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "StepMania Error"
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -142,8 +139,8 @@ BEGIN
     PUSHBUTTON      "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15
 END
 
-IDD_LOADING_DIALOG DIALOG DISCARDABLE  0, 0, 312, 78
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
+IDD_LOADING_DIALOG DIALOG  0, 0, 312, 78
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         117,IDC_STATIC,"Static",SS_BITMAP,0,0,312,38
@@ -153,9 +150,9 @@ BEGIN
 END
 
 IDD_DISASM_CRASH DIALOGEX 0, 0, 399, 286
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "StepMania Error"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,348,270,50,15
     LISTBOX         IDC_ASMBOX,7,58,279,100,LBS_OWNERDRAWVARIABLE | 
@@ -168,9 +165,9 @@ BEGIN
                     WS_HSCROLL | WS_TABSTOP
     LTEXT           "Program disassembly",IDC_STATIC,7,46,66,8
     LTEXT           "CPU registers",IDC_STATIC,292,46,44,8
-    LTEXT           "StepMania has crashed due to a program error.  Please hit Save to dump diagnostic information to a file called 'crashinfo.txt' in the StepMania program directory, and then OK to bring up the normal crash box.  Please include this file in all bug reports.",
+    LTEXT           "StepMania has crashed due to a program error.  Diagnostic information has been saved to a file called ""crashinfo.txt"" in the StepMania program directory.  Hit ""View crash dump"" to view it. Please include this file in all bug reports.",
                     IDC_STATIC,7,238,319,25
-    PUSHBUTTON      "Save",IDC_CRASH_SAVE,76,270,70,15
+    PUSHBUTTON      "View crash dump",IDC_CRASH_SAVE,76,270,70,15
     LISTBOX         IDC_CALL_STACK,7,178,279,38,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_TABSTOP
     LTEXT           "Estimated call stack",IDC_STATIC,7,167,64,8
@@ -188,7 +185,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO MOVEABLE PURE 
+GUIDELINES DESIGNINFO 
 BEGIN
     IDD_LOADING_DIALOG, DIALOG
     BEGIN