diff --git a/ChangeLog b/ChangeLog
index 68a2e8d3..48e64f13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ Changes since version 0.90.0:
 - new WPrefs icon (thanks to Largo)
 - replaced VirtualEdgeThickness option, with EnableVirtualDesktop (boolean)
 - enhanced alt-tab panel, added theming ability
+- fixed issues with broken crash dialog
+- removed obsoleted options from wconfig.h
+
 
 Changes since version 0.80.2:
 .............................
diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in
index 2a64a7bf..a11f8da3 100644
--- a/WindowMaker/Defaults/WindowMaker.in
+++ b/WindowMaker/Defaults/WindowMaker.in
@@ -105,12 +105,12 @@
   ConstrainWindowSize = NO;
   ClipRaiseLowerKey = None;
   TitleJustify = center;
-  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=11";
-  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=11";
-  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=11";
-  IconTitleFont = "Arial,Luxi Sans:pixelsize=8";
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
   ClipTitleFont = "Verdana:bold:pixelsize=10";
-  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=11";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
   LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   HighlightColor = white;
   HighlightTextColor = black;
diff --git a/WindowMaker/Pixmaps/swback-dark.png b/WindowMaker/Pixmaps/swback-dark.png
new file mode 100644
index 00000000..fab56ac3
Binary files /dev/null and b/WindowMaker/Pixmaps/swback-dark.png differ
diff --git a/WindowMaker/Pixmaps/swback.png b/WindowMaker/Pixmaps/swback.png
index fab56ac3..cd9633a2 100644
Binary files a/WindowMaker/Pixmaps/swback.png and b/WindowMaker/Pixmaps/swback.png differ
diff --git a/src/dialog.c b/src/dialog.c
index 8d63a6fc..f99269f5 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -561,7 +561,7 @@ keyPressHandler(XEvent *event, void *data)
     KeySym ksym;
     int iidx;
     int didx;
-    int item;
+    int item = 0;
     WMList *list = NULL;
 
     if (event->type == KeyRelease)
@@ -862,8 +862,8 @@ typedef struct {
 
 
 #define COPYRIGHT_TEXT  \
-    "Copyright \xc2\xa9 1997-2004 Alfredo K. Kojima <kojima@windowmaker.org>\n"\
-    "Copyright \xc2\xa9 1998-2004 Dan Pascu <dan@windowmaker.org>"
+    "Copyright \xc2\xa9 1997-2004 Alfredo K. Kojima\n"\
+    "Copyright \xc2\xa9 1998-2004 Dan Pascu"
 
 
 
@@ -1647,6 +1647,7 @@ setCrashAction(void *self, void *clientData)
 }
 
 
+/* Make this read the logo from a compiled in pixmap -Dan */
 static WMPixmap*
 getWindowMakerIconImage(WMScreen *scr)
 {
@@ -1654,6 +1655,9 @@ getWindowMakerIconImage(WMScreen *scr)
     WMPixmap *pix=NULL;
     char *path;
 
+    if (!WDWindowAttributes || !WDWindowAttributes->dictionary)
+        return NULL;
+
     WMPLSetCaseSensitive(True);
 
     key = WMCreatePLString("Logo.WMPanel");
@@ -1732,10 +1736,10 @@ wShowCrashingDialogPanel(int whatSig)
     }
 
     panel->nameL = WMCreateLabel(panel->win);
-    WMResizeWidget(panel->nameL, 190, 18);
-    WMMoveWidget(panel->nameL, 80, 35);
+    WMResizeWidget(panel->nameL, 200, 30);
+    WMMoveWidget(panel->nameL, 80, 25);
     WMSetLabelTextAlignment(panel->nameL, WALeft);
-    font = WMBoldSystemFontOfSize(scr, 18);
+    font = WMBoldSystemFontOfSize(scr, 24);
     WMSetLabelFont(panel->nameL, font);
     WMReleaseFont(font);
     WMSetLabelText(panel->nameL, _("Fatal error"));
diff --git a/src/main.c b/src/main.c
index 06f14bb7..de630907 100644
--- a/src/main.c
+++ b/src/main.c
@@ -582,13 +582,32 @@ getFullPath(char *path)
 #endif
 
 
-
 int
 main(int argc, char **argv)
 {
-    int i;
-    int i_am_the_monitor= 1;
-    
+    int i_am_the_monitor, i, len;
+    char *str, *alt;
+
+    /* setup common stuff for the monitor and wmaker itself */
+    WMInitializeApplication("WindowMaker", &argc, argv);
+
+    memset(&wPreferences, 0, sizeof(WPreferences));
+
+    wPreferences.fallbackWMs = WMCreateArray(8);
+    alt = getenv("WINDOWMAKER_ALT_WM");
+    if (alt != NULL)
+        WMAddToArray(wPreferences.fallbackWMs, wstrdup(alt));
+
+    WMAddToArray(wPreferences.fallbackWMs, wstrdup("blackbox"));
+    WMAddToArray(wPreferences.fallbackWMs, wstrdup("metacity"));
+    WMAddToArray(wPreferences.fallbackWMs, wstrdup("fvwm"));
+    WMAddToArray(wPreferences.fallbackWMs, wstrdup("twm"));
+    WMAddToArray(wPreferences.fallbackWMs, NULL);
+    WMAddToArray(wPreferences.fallbackWMs, wstrdup("rxvt"));
+    WMAddToArray(wPreferences.fallbackWMs, wstrdup("xterm"));
+
+    i_am_the_monitor= 1;
+
     for (i= 1; i < argc; i++)
     {
         if (strncmp(argv[i], "--for-real", strlen("--for-real"))==0)
@@ -596,8 +615,23 @@ main(int argc, char **argv)
             i_am_the_monitor= 0;
             break;
         }
+        else if (strcmp(argv[i], "-display")==0 || strcmp(argv[i], "--display")==0)
+        {
+            i++;
+            if (i>=argc) {
+                wwarning(_("too few arguments for %s"), argv[i-1]);
+                exit(0);
+            }
+            DisplayName = argv[i];
+        }
     }
-    
+
+    DisplayName = XDisplayName(DisplayName);
+    len = strlen(DisplayName)+64;
+    str = wmalloc(len);
+    snprintf(str, len, "DISPLAY=%s", DisplayName);
+    putenv(str);
+
     if (i_am_the_monitor)
       return MonitorLoop(argc, argv);
     else
@@ -605,11 +639,11 @@ main(int argc, char **argv)
 }
 
 
-static int 
+static int
 real_main(int argc, char **argv)
 {
     int i, restart=0;
-    char *str, *alt;
+    char *str;
     int d, s;
     int flag;
 #ifdef DEBUG
@@ -635,9 +669,6 @@ real_main(int argc, char **argv)
     Arguments[argc-1]= "--for-real=";
     Arguments[argc]= NULL;
 
-    WMInitializeApplication("WindowMaker", &argc, argv);
-
-
     ProgName = strrchr(argv[0],'/');
     if (!ProgName)
         ProgName = argv[0];
@@ -647,21 +678,6 @@ real_main(int argc, char **argv)
 
     restart = 0;
 
-    memset(&wPreferences, 0, sizeof(WPreferences));
-
-    wPreferences.fallbackWMs = WMCreateArray(8);
-    alt = getenv("WINDOWMAKER_ALT_WM");
-    if (alt != NULL)
-        WMAddToArray(wPreferences.fallbackWMs, wstrdup(alt));
-
-    WMAddToArray(wPreferences.fallbackWMs, wstrdup(FALLBACK_WINDOWMANAGER));
-    WMAddToArray(wPreferences.fallbackWMs, wstrdup("metacity"));
-    WMAddToArray(wPreferences.fallbackWMs, wstrdup("fvwm"));
-    WMAddToArray(wPreferences.fallbackWMs, wstrdup("twm"));
-    WMAddToArray(wPreferences.fallbackWMs, NULL);
-    WMAddToArray(wPreferences.fallbackWMs, wstrdup("rxvt"));
-    WMAddToArray(wPreferences.fallbackWMs, wstrdup("xterm"));
-
     if (argc>1) {
         for (i=1; i<argc; i++) {
 #ifdef USECPP
diff --git a/src/monitor.c b/src/monitor.c
index 79c9f7ab..61fea3a9 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -53,7 +53,7 @@ int showCrashDialog(int sig)
 {
     int crashAction;
     
-    dpy = XOpenDisplay("");
+    dpy = XOpenDisplay(NULL);
     if (dpy) {
 /* XXX TODO make sure that window states are saved and restored via netwm */
 
@@ -66,7 +66,7 @@ int showCrashDialog(int sig)
         crashAction = WMAbort;
     }
     
-    if (crashAction == WMRestart)
+    if (crashAction == WMStartAlternate)
     {
         int i;
 
@@ -145,8 +145,9 @@ int MonitorLoop(int argc, char **argv)
              * the crash panel and ask the user what to do */
             if (time(NULL) - last_start < 3)
             {
-                if (showCrashDialog(WTERMSIG(status)) == 0)
-                  return 1;
+                if (showCrashDialog(WTERMSIG(status)) == 0) {
+                    return 1;
+                }
             }
             wwarning(_("Window Maker exited due to a crash (signal %i) and will be restarted."),
                      WTERMSIG(status));
diff --git a/src/startup.c b/src/startup.c
index 117f8c47..452b91bb 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -58,6 +58,7 @@
 #include "defaults.h"
 #include "properties.h"
 #include "dialog.h"
+#include "wmspec.h"
 #ifdef XDND
 #include "xdnd.h"
 #endif
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 4d8e35ef..eef92f4d 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -90,18 +90,6 @@
 #define SHAPED_BALLOON
 
 
-/*
- * Define NO_EMERGENCY_AUTORESTART if you don't want another window manager
- * automatically started when WindowMaker crashes. The X session will die
- * in some cases if wmaker crashes and autorestart is disabled.
- */
-#undef NO_EMERGENCY_AUTORESTART
-
-/*
- * The window manager that is autorestarted
- */
-#define FALLBACK_WINDOWMANAGER "blackbox"
-
 /*
  * Turn on a hack to make mouse and keyboard actions work even if
  * the NumLock or ScrollLock modifiers are turned on. They might
@@ -269,12 +257,12 @@
 #define DEF_FRAME_COLOR   "white"
 
 
-#define DEF_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=11\""
-#define DEF_MENU_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=11\""
-#define DEF_MENU_ENTRY_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=11\""
-#define DEF_ICON_TITLE_FONT "\"Arial,Luxi Sans:pixelsize=8\""
+#define DEF_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
+#define DEF_MENU_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
+#define DEF_MENU_ENTRY_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
+#define DEF_ICON_TITLE_FONT "\"Arial,Luxi Sans:pixelsize=9\""
 #define DEF_CLIP_TITLE_FONT "\"Verdana:bold:pixelsize=10\""
-#define DEF_INFO_TEXT_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=11\""
+#define DEF_INFO_TEXT_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
 
 #define DEF_WORKSPACE_NAME_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=24\""