diff --git a/src/apps/bin/shutdown.cpp b/src/apps/bin/shutdown.cpp
index 0846ffc264..4d7fd1568d 100644
--- a/src/apps/bin/shutdown.cpp
+++ b/src/apps/bin/shutdown.cpp
@@ -1,10 +1,9 @@
 // ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 //
-//  Copyright (c) 2002, OpenBeOS
-//
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
+//  Copyright (c) 2002, Haiku
 //
+//  This software is part of the Haiku distribution and is covered 
+//  by the MIT license.
 //
 //  File:        shutdown.cpp
 //  Author:      Francois Revol (mmu_man@users.sf.net)
@@ -22,25 +21,31 @@
 //  tried 3 hours to find it.
 //  Some code from Shard's Archiver from BeBits (was BSD/MIT too :).
 //
-//  Compile with: LDFLAGS="-lbe" make
-//
 // ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
+// ToDo: I think we should remove the shutdown alert again - we already have one
+//		in the roster, and that should really be enough.
+//		Also, I don't quite see a lot of sense in the delayed shutdown, either -- axeld.
+
+#include <syscalls.h>
+
+#include <OS.h>
 #include <Application.h>
 #include <Bitmap.h>
 #include <Button.h>
 #include <Messenger.h>
 #include <Mime.h>
-#include <OS.h>
+#include <String.h>
+#include <StringView.h>
+#include <View.h>
+#include <Window.h>
+
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <String.h>
-#include <StringView.h>
 #include <unistd.h>
-#include <View.h>
-#include <Window.h>
+#include <ctype.h>
 
 // timer should be handled better (with system_time())
 #define PULSE_RATE 100000
@@ -50,118 +55,117 @@
 #define B_SYSTEM_SHUTDOWN 0x12d
 #define B_SYSTEM_REBOOT 0x12e
 
-const char *roster_sig = "application/x-vnd.Be-ROST";
-
-extern "C" void _kshutdown_(long arg);
-#define SHUTDOWN_HALT 0
-#define SHUTDOWN_REBOOT 1
+static const char *kRosterSignature = "application/x-vnd.Be-ROST";
 
 // globals
 const char kIconBits[] = {
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00,
-0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00,
-0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f,
-0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff,
-0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x2f,
-0xeb, 0x2f, 0x30, 0x2f, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff,
-0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0xeb, 0x2c,
-0x2b, 0x2c, 0x2d, 0x30, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff,
-0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2b, 0x2a,
-0x2b, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x00, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0x00, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2b, 0x2b, 0x2a,
-0x2b, 0x2b, 0x2b, 0x2d, 0x2d, 0x2f, 0x30, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x00, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2b, 0x2b, 0x3f,
-0x2b, 0x2a, 0x2c, 0x2d, 0x2d, 0xeb, 0x30, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2c, 0x2b, 0x2b,
-0x2a, 0x2b, 0x2c, 0x2c, 0x2e, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0xff, 0xff,
-0xff, 0xff, 0xff, 0x00, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2d, 0x2b, 0x2c,
-0x2c, 0x2b, 0x2c, 0x2d, 0x2d, 0x2f, 0x30, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x00, 0xff, 0xff,
-0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0xeb, 0x2d, 0x2d,
-0x2c, 0x2c, 0x2d, 0x2d, 0xeb, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x00, 0xff,
-0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x30, 0x2e, 0x2c,
-0x2d, 0x2d, 0x2d, 0x2f, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
-0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2f, 0xeb,
-0xeb, 0xeb, 0xeb, 0xeb, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
-0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x00, 0x2f,
-0x2f, 0x30, 0x2f, 0x2f, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
-0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
-0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f,
-0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
-0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00,
-0x00, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff,
-0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00,
-0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+	0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00,
+	0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f,
+	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x2f,
+	0xeb, 0x2f, 0x30, 0x2f, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0xeb, 0x2c,
+	0x2b, 0x2c, 0x2d, 0x30, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2b, 0x2a,
+	0x2b, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2b, 0x2b, 0x2a,
+	0x2b, 0x2b, 0x2b, 0x2d, 0x2d, 0x2f, 0x30, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2b, 0x2b, 0x3f,
+	0x2b, 0x2a, 0x2c, 0x2d, 0x2d, 0xeb, 0x30, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2c, 0x2b, 0x2b,
+	0x2a, 0x2b, 0x2c, 0x2c, 0x2e, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2d, 0x2b, 0x2c,
+	0x2c, 0x2b, 0x2c, 0x2d, 0x2d, 0x2f, 0x30, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0xeb, 0x2d, 0x2d,
+	0x2c, 0x2c, 0x2d, 0x2d, 0xeb, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x00, 0xff,
+	0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x30, 0x2e, 0x2c,
+	0x2d, 0x2d, 0x2d, 0x2f, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
+	0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x2f, 0x2f, 0xeb,
+	0xeb, 0xeb, 0xeb, 0xeb, 0x2f, 0x2f, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
+	0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x00, 0x2f,
+	0x2f, 0x30, 0x2f, 0x2f, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
+	0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
+	0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f,
+	0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff,
+	0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00,
+	0x00, 0x3f, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+	0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };
 
 const char kElectronBits[] = {
-0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
-0xff, 0x00, 0x25, 0x24, 0x26, 0x00, 0xff, 0xff,
-0x00, 0x25, 0x21, 0x21, 0x22, 0x26, 0x00, 0xff,
-0x00, 0x21, 0x3f, 0x22, 0x22, 0x25, 0x00, 0xff,
-0x00, 0x25, 0x22, 0x22, 0x24, 0x24, 0x00, 0xff,
-0xff, 0x00, 0x23, 0x23, 0x25, 0x00, 0xff, 0xff,
-0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x25, 0x24, 0x26, 0x00, 0xff, 0xff,
+	0x00, 0x25, 0x21, 0x21, 0x22, 0x26, 0x00, 0xff,
+	0x00, 0x21, 0x3f, 0x22, 0x22, 0x25, 0x00, 0xff,
+	0x00, 0x25, 0x22, 0x22, 0x24, 0x24, 0x00, 0xff,
+	0xff, 0x00, 0x23, 0x23, 0x25, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };
 
 #define EL_POS_COUNT 17
+
 static const int electron1_table[][2] = { 
-{3, 8}, {7, 8}, {12, 8}, {17, 10}, 
-{22, 12}, {26, 16}, {28, 20}, {28, 24}, 
-{26, 26}, {22, 27}, {18, 26}, {14, 25}, 
-{10, 24}, {5, 22}, {3, 18}, {1, 14}, 
-{1, 10}, {-1, -1} };
+	{3, 8}, {7, 8}, {12, 8}, {17, 10}, 
+	{22, 12}, {26, 16}, {28, 20}, {28, 24}, 
+	{26, 26}, {22, 27}, {18, 26}, {14, 25}, 
+	{10, 24}, {5, 22}, {3, 18}, {1, 14}, 
+	{1, 10}, {-1, -1}
+};
 
 static const int electron2_table[][2] = { 
-{23, 18}, {21, 22}, {18, 25}, {14, 27},
-{10, 27}, {5, 26}, {0, 25}, {1, 18}, 
-{4, 15}, {8, 12}, {12, 10}, {16, 8},
-{20, 8}, {24, 9}, {28, 11}, {27, 13},
-{25, 15}, {-1, -1} };
-
-unsigned long time_to_sleep = 0; // -d
-int reboot = 0; // -r
+	{23, 18}, {21, 22}, {18, 25}, {14, 27},
+	{10, 27}, {5, 26}, {0, 25}, {1, 18}, 
+	{4, 15}, {8, 12}, {12, 10}, {16, 8},
+	{20, 8}, {24, 9}, {28, 11}, {27, 13},
+	{25, 15}, {-1, -1}
+};
 
 
-class SView : public BView
-{
+uint32 gTimeToSleep = 0;
+bool gReboot = false;
+
+
+class SView : public BView {
 	public:
-							SView(BRect frame);
-							~SView();
+		SView(BRect frame);
+		~SView();
 
-		void				Draw(BRect updateRect);
-		void				Pulse();
+		void Draw(BRect updateRect);
+		void Pulse();
 
 		BButton				*fButton;
 		BString				*fTitleStr;
@@ -169,39 +173,42 @@ class SView : public BView
 
 		BBitmap				*fIcon;
 		BBitmap				*fElectron;
-		int				fElectronPos;
+		int					fElectronPos;
 
-		int				fPulseDivider;
+		int					fPulseDivider;
 
 		int32				fWidth;
 		int32				fHeight;
 
 		int32				fLeftMargin;
-		static const int32	fTopMargin = 8;
 		unsigned long		fTimeLeft;
+
+		static const int32	fTopMargin = 8;
 };
 
-class ShutdownWindow : public BWindow
-{
+class ShutdownWindow : public BWindow {
 	public:
-						ShutdownWindow(thread_id id);
-						~ShutdownWindow();
-		void			MessageReceived(BMessage *msg);
-		bool			QuitRequested();
+		ShutdownWindow(thread_id id);
+		~ShutdownWindow();
+
+		void MessageReceived(BMessage *msg);
+		bool QuitRequested();
+
 	private:
-		SView *fView;
-		thread_id fShutdownThread;
+		SView		*fView;
+		thread_id	fShutdownThread;
 };
 
-class ShutdownApp : public BApplication
-{
+class ShutdownApp : public BApplication {
 	public:
-						ShutdownApp(thread_id id);
-						~ShutdownApp();
+		ShutdownApp(thread_id id);
+		~ShutdownApp();
+
 	private:
 		ShutdownWindow *fWindow;
 };
 
+
 SView::SView(BRect frame)
 	:BView(frame, "SView", B_FOLLOW_LEFT_RIGHT, B_PULSE_NEEDED | B_WILL_DRAW),
 	fButton(NULL),
@@ -214,7 +221,7 @@ SView::SView(BRect frame)
 	fWidth(0),
 	fHeight(0),
 	fLeftMargin(B_LARGE_ICON + 8),
-	fTimeLeft(time_to_sleep)
+	fTimeLeft(gTimeToSleep)
 {
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	SetLowColor(ViewColor());
@@ -224,10 +231,11 @@ SView::SView(BRect frame)
 	fElectron = new BBitmap(BRect(0, 0, 7, 7), B_CMAP8);
 	fElectron->SetBits(kElectronBits, 8*8, 0, B_CMAP8);
 	fTitleStr = new BString;
-	if (reboot)
+	if (gReboot)
 		*fTitleStr << "Rebooting in " << (int32)fTimeLeft << " seconds !";
 	else
 		*fTitleStr << "Shutting down in " << (int32)fTimeLeft << " seconds !";
+
 	fTitle = new BStringView(BRect(55, 10, 260, 35), "", fTitleStr->String());
 	fButton = new BButton(BRect(159, 42, 259, 66), "quit", "Cancel", new BMessage('_QRQ'));
 	fButton->MakeDefault(true);
@@ -235,18 +243,15 @@ SView::SView(BRect frame)
 	AddChild(fButton);
 }
 
+
 SView::~SView()
 {
-	if (fButton != NULL)
-		delete fButton;
-
-	if (fTitle != NULL)
-		delete fTitle;
-
-	if (fIcon != NULL)
-		delete fIcon;
+	delete fButton;
+	delete fTitle;
+	delete fIcon;
 }
 
+
 void
 SView::Pulse()
 {
@@ -255,7 +260,7 @@ SView::Pulse()
 		fPulseDivider = PULSE_MODULO;
 		fTimeLeft--;
 		fTitleStr->SetTo("");
-		if (reboot)
+		if (gReboot)
 			*fTitleStr << "Rebooting in " << (int32)fTimeLeft << " seconds !";
 		else
 			*fTitleStr << "Shutting down in " << (int32)fTimeLeft << " seconds !";
@@ -266,6 +271,7 @@ SView::Pulse()
 	Invalidate();
 }
 
+
 void
 SView::Draw(BRect updateRect)
 {
@@ -275,23 +281,24 @@ SView::Draw(BRect updateRect)
 //	SetHighColor(tint_color(ViewColor(), B_HIGHLIGHT_BACKGROUND_TINT));
 	SetHighColor(0xB8, 0xB8, 0xB8); // same color as the registrar shutdown dialog
 	FillRect(BRect(0, 0, B_LARGE_ICON, bounds.bottom));
-	
-	if(fIcon != NULL)
-	{
+
+	if (fIcon != NULL)
 		DrawBitmap(fIcon, BPoint((B_LARGE_ICON / 2), fTopMargin));
-	}
-	if(fIcon != NULL)
-	{
+
+	if (fIcon != NULL) {
 		DrawBitmap(fElectron, BPoint((B_LARGE_ICON / 2) + electron1_table[fElectronPos][0], fTopMargin + electron1_table[fElectronPos][1]));
 		DrawBitmap(fElectron, BPoint((B_LARGE_ICON / 2) + electron2_table[fElectronPos][0], fTopMargin + electron2_table[fElectronPos][1]));
 	}
+
 	if (Window())
 		Window()->Flush();
 }
 
+
 ShutdownWindow::ShutdownWindow(thread_id id)
-	:BWindow(BRect( 139, 81, 407, 156), "Shutdown Status", B_TITLED_WINDOW_LOOK, 
-				B_NORMAL_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_ASYNCHRONOUS_CONTROLS),
+	: BWindow(BRect( 139, 81, 407, 156), "Shutdown Status", B_TITLED_WINDOW_LOOK, 
+		B_NORMAL_WINDOW_FEEL,
+		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_ASYNCHRONOUS_CONTROLS),
 	fView(NULL)
 {
 	fShutdownThread = id;
@@ -300,6 +307,7 @@ ShutdownWindow::ShutdownWindow(thread_id id)
 	AddChild(fView);
 }
 
+
 ShutdownWindow::~ShutdownWindow()
 {
 	fView->LockLooper();
@@ -307,17 +315,18 @@ ShutdownWindow::~ShutdownWindow()
 	delete fView;
 }
 
+
 void
 ShutdownWindow::MessageReceived(BMessage *msg)
 {
-	switch(msg->what)
-	{
+	switch (msg->what) {
 		default:
 			BWindow::MessageReceived(msg);
 			break;
 	}
 }
 
+
 bool
 ShutdownWindow::QuitRequested()
 {
@@ -326,19 +335,23 @@ ShutdownWindow::QuitRequested()
 	return true;
 }
 
+
 ShutdownApp::ShutdownApp(thread_id id)
-	:BApplication("application/x-vnd.ShutDown-app")
+	: BApplication("application/x-vnd.ShutDown-app")
 {
 	fWindow = new ShutdownWindow(id);
 	fWindow->SetWorkspaces(0xFFFFFFFF);
 	fWindow->Show();
 }
 
+
 ShutdownApp::~ShutdownApp()
 {
 }
 
-int32 app_thread(void *arg)
+
+int32
+app_thread(void *arg)
 {
 	thread_id tid = (thread_id) arg;
 	(new ShutdownApp(tid))->Run();
@@ -346,116 +359,167 @@ int32 app_thread(void *arg)
 	return B_OK;
 }
 
-/***************************/
+
+//	#pragma mark -
+
 
 // we get here when shutdown is cancelled.
 // then sleep() returns
-void handle_usr1(int sig)
+
+void
+handle_usr1(int sig)
 {
 	while (0);
 }
 
-int main(int argc, char **argv)
+
+bool
+parseTime(char *arg, char *argv, int32 *_i)
 {
-	int i;
-	int quick = 0; // -q
-	int alert = 0; // -a
-	BMessenger msgr(roster_sig);
+	char *unit;
 
-	for (i = 1; i < argc; i++) {
-		if (!strcmp(argv[i], "-q"))
-			quick = 1;
-		else if (!strcmp(argv[i], "-r"))
-			reboot = 1;
-		else if (!strcmp(argv[i], "-c")) {
-			team_info ti;
-			thread_info thi;
-			int32 team_cookie = 0;
-			int32 thread_cookie = 0;
-			team_id myteam;
+	if (isdigit(arg[0])) {
+		gTimeToSleep = strtoul(arg, &unit, 10);
+	} else if (argv && isdigit(argv[0])) {
+		(*_i)++;
+		gTimeToSleep = strtoul(argv, &unit, 10);
+	} else
+		return false;
 
-			get_thread_info(find_thread(NULL), &thi);
-			myteam = thi.team;
-			while (get_next_team_info(&team_cookie, &ti) == B_OK) {
-				if (strstr(ti.args, "shutdown") != NULL && (ti.team != myteam)) {
-					thread_cookie = 0;
-					while (get_next_thread_info(ti.team, &thread_cookie, &thi) == B_OK) {
-						if (!strcmp(thi.name, "shutdown")) {
-							kill(thi.thread, SIGUSR1);
-						}
-					}
-				}
-			}
-			exit (0);
-		} else if (!strcmp(argv[i], "-a")) {
-			alert = 1;
-		} else if (!strcmp(argv[i], "-d") && (i+1 < argc)) {
-			i++;
-			time_to_sleep = strtol(argv[i], &argv[i], 10);
-		} else {
-			fprintf(stderr, 
-"usage: %s [-r] [-q] [-c] [-a] [-d time]
-
-	-r reboot,
-	-q quick shutdown (don't broadcast apps),
-	-c cancel a running shutdown,
-	-a alerts user while waiting,
-	-d delay shutdown by <time> seconds.
-
-", argv[0]);
-			exit (1);
-		}
+	if (unit[0] == '\0' || !strcmp(unit, "s"))
+		return true;
+	if (!strcmp(unit, "m")) {
+		gTimeToSleep *= 60;
+		return true;
 	}
 
-	if (time_to_sleep > 0) {
-		unsigned int left;
-		thread_id BApp_thread = -1;
+	return false;
+}
+
+
+void
+usage(const char *arg0)
+{
+	const char *program = strrchr(arg0, '/');
+	if (program == NULL)
+		program = arg0;
+	else
+		program++;
+
+	fprintf(stderr, "usage: %s [-rqca] [-d time]\n"
+		"\t-r reboot,\n"
+		"\t-q quick shutdown (don't broadcast apps),\n"
+		"\t-c cancel a running shutdown,\n"
+		"\t-a alerts user while waiting,\n"
+		"\t-d delay shutdown by <time> seconds.\n", program);
+	exit(1);
+}
+
+
+int
+main(int argc, char **argv)
+{
+	bool quick = false;
+	bool alert = false;
+
+	for (int32 i = 1; i < argc; i++) {
+		char *arg = argv[i];
+		if (arg[0] == '-') {
+			if (!isalpha(arg[1]))
+				usage(argv[0]);
+
+			while (arg && isalpha((++arg)[0])) {
+				switch (arg[0]) {
+					case 'q':
+						quick = true;
+						break;
+					case 'r':
+						gReboot = true;
+						break;
+					case 'c':
+					{
+						// find all running shutdown command and signal its shutdown thread
+	
+						thread_info threadInfo;
+						get_thread_info(find_thread(NULL), &threadInfo);
+			
+						team_id thisTeam = threadInfo.team;
+			
+						int32 team_cookie = 0;
+						team_info teamInfo;
+						while (get_next_team_info(&team_cookie, &teamInfo) == B_OK) {
+							if (strstr(teamInfo.args, "shutdown") != NULL && teamInfo.team != thisTeam) {
+								int32 thread_cookie = 0;
+								while (get_next_thread_info(teamInfo.team, &thread_cookie, &threadInfo) == B_OK) {
+									if (!strcmp(threadInfo.name, "shutdown"))
+										kill(threadInfo.thread, SIGUSR1);
+								}
+							}
+						}
+						exit(0);
+						break;
+					}
+					case 'a':
+						alert = true;
+						break;
+					case 'd':
+						if (parseTime(arg + 1, argv[i + 1], &i)) {
+							arg = NULL;
+							break;
+						}
+						// supposed to fall through
+
+					default:
+						usage(argv[0]);
+				}
+			}
+		} else
+			usage(argv[0]);
+	}
+
+	if (gTimeToSleep > 0) {
+		thread_id appThread = -1;
+		int32 left;
 
 		signal(SIGUSR1, handle_usr1);
 
 		if (alert) {
 			// BApplication::Run() blocks
-			BApp_thread = spawn_thread(app_thread, "BApplication", B_NORMAL_PRIORITY, (void *)find_thread(NULL));
-			resume_thread(BApp_thread);
-		}
+			appThread = spawn_thread(app_thread, "ShutdownApp", B_NORMAL_PRIORITY, (void *)find_thread(NULL));
+			resume_thread(appThread);
+		} else
+			printf("Delaying %s by %lu seconds...\n", gReboot ? "reboot" : "shutdown", gTimeToSleep);
+
+		left = sleep(gTimeToSleep);
 
-		left = sleep((unsigned int)time_to_sleep);
-		
 		if (alert) {
-			status_t err;
-//			be_app->LockLooper();
 			be_app->PostMessage(B_QUIT_REQUESTED);
-//			be_app->UnlockLooper();
-			
-			wait_for_thread(BApp_thread, &err);
+
+			status_t err;
+			wait_for_thread(appThread, &err);
 			snooze(100000);
 		}
-		
+
 		if (left > 0) {
 			fprintf(stderr, "Shutdown cancelled.\n");
-			exit (0);
+			exit(0);
 		}
 	}
 
 	if (quick) {
-		if (reboot)
-			_kshutdown_(SHUTDOWN_REBOOT);
-		else
-			_kshutdown_(SHUTDOWN_HALT);
+		_kern_shutdown(gReboot);
 		fprintf(stderr, "Shutdown failed!\n");
 		return 2;
 	} else {
-		status_t err = 1;
+		BMessenger messenger(kRosterSignature);
 
-		if (reboot)
-			err = msgr.SendMessage(B_SYSTEM_REBOOT);
-		else
-			err = msgr.SendMessage(B_SYSTEM_SHUTDOWN);
+		status_t err = messenger.SendMessage(gReboot ? B_SYSTEM_REBOOT : B_SYSTEM_SHUTDOWN);
 		if (err != B_OK) {
 			fprintf(stderr, "Failed to send message to roster server: %s\n", strerror(err));
-			exit (2);
+			exit(2);
 		}
 	}
+
 	return 0;
 }