--- a/ooDialog/trunk/ooDialog/ooDialogWinMain.rc
+++ b/ooDialog/trunk/ooDialog/ooDialogWinMain.rc
@@ -69,35 +69,42 @@
 
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-IDD_FILEASSOC DIALOGEX 0, 0, 318, 216
+IDD_FILEASSOC DIALOGEX 0, 0, 362, 278
 STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU
 CAPTION "Configure ooDialog.exe File Associations"
 FONT 8, "Ms Shell Dlg", 400, 0, 1
 {
-    CONTROL         "Associating File Extensions with ooDialog.exe for All Users", IDC_GB_ASSOCIATE, WC_BUTTON, BS_GROUPBOX, 11, 10, 296, 56
+    CONTROL         "Associating File Extensions with ooDialog.exe for All Users", IDC_GB_ASSOCIATE, WC_BUTTON, BS_GROUPBOX, 11, 10, 341, 90
     CONTROL         "File Type:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 25, 26, 31, 8
-    CONTROL         "ooDialog.RexxScript", IDC_ST_FTYPE, WC_STATIC, NOT WS_GROUP | SS_LEFT, 60, 26, 67, 8
-    CONTROL         "Running As Administrator:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 149, 26, 83, 8
-    CONTROL         "False", IDC_ST_RUNAS, WC_STATIC, NOT WS_GROUP | SS_LEFT, 245, 26, 25, 8
+    CONTROL         "ooDialog.RexxScript", IDC_ST_FTYPE, WC_STATIC, NOT WS_GROUP | SS_LEFT, 110, 26, 67, 8
+    CONTROL         "Running As Administrator:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 192, 26, 83, 8
+    CONTROL         "False", IDC_ST_RUNAS, WC_STATIC, NOT WS_GROUP | SS_LEFT, 292, 26, 25, 8
     CONTROL         "Scope:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 25, 43, 35, 8
-    CONTROL         "All Users", IDC_ST_SCOPE, WC_STATIC, NOT WS_GROUP | SS_LEFT, 60, 43, 50, 8
-    CONTROL         "Process is Elevated:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 149, 43, 83, 8
-    CONTROL         "False", IDC_ST_ELEVATED, WC_STATIC, NOT WS_GROUP | SS_LEFT, 245, 43, 25, 8
-    CONTROL         "Extension:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 19, 78, 35, 8
-    CONTROL         "", IDC_EDIT_EXTENSION, WC_EDIT, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL, 55, 77, 33, 12
-    CONTROL         "Add", IDC_PB_ADD_EXTENSION, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 92, 76, 43, 14
-    CONTROL         "Suggested\nExtensions", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_CENTER, 14, 100, 55, 19
-    CONTROL         "", IDC_LB_SUGGESTED, WC_LISTBOX, WS_TABSTOP | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT | LBS_SORT | LBS_NOTIFY, 14, 118, 55, 59
-    CONTROL         "Add -->", IDC_PB_ADD_CURRENT, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 76, 124, 50, 14
-    CONTROL         "<-- Remove", IDC_PB_REMOVE_CURRENT, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 76, 143, 50, 14
-    CONTROL         "Currently\nAssociated", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_CENTER, 132, 100, 55, 19
-    CONTROL         "", IDC_LB_CURRENT, WC_LISTBOX, WS_TABSTOP | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT | LBS_SORT | LBS_NOTIFY, 132, 118, 55, 59
-    CONTROL         "Add -->", IDC_PB_ADD_PATHEXT, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 194, 124, 50, 14
-    CONTROL         "Remove", IDC_PB_REMOVE_PATHEXT, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 194, 143, 50, 14
-    CONTROL         "Currently\nin PATHEXT", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_CENTER, 250, 100, 55, 19
-    CONTROL         "", IDC_LB_PATHEXT, WC_LISTBOX, WS_TABSTOP | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT | LBS_SORT | LBS_NOTIFY, 250, 118, 55, 59
-    CONTROL         "OK", IDOK, WC_BUTTON, WS_TABSTOP | BS_DEFPUSHBUTTON, 203, 192, 50, 14
-    CONTROL         "Cancel", IDCANCEL, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 258, 192, 50, 14
+    CONTROL         "All Users", IDC_ST_SCOPE, WC_STATIC, NOT WS_GROUP | SS_LEFT, 110, 43, 67, 8
+    CONTROL         "Process is Elevated:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 192, 43, 83, 8
+    CONTROL         "False", IDC_ST_ELEVATED, WC_STATIC, NOT WS_GROUP | SS_LEFT, 292, 43, 25, 8
+    CONTROL         "File Type is Registered:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 25, 61, 78, 8
+    CONTROL         "True", IDC_ST_REGISTERED, WC_STATIC, NOT WS_GROUP | SS_LEFT, 110, 61, 18, 8
+    CONTROL         "Registered For All Users?", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 25, 79, 80, 8
+    CONTROL         "Yes", IDC_ST_REGALL, WC_STATIC, NOT WS_GROUP | SS_LEFT, 110, 79, 12, 8
+    CONTROL         "Registered For Current User?", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 192, 79, 95, 8
+    CONTROL         "Yes", IDC_ST_REGCURRENT, WC_STATIC, NOT WS_GROUP | SS_LEFT, 292, 79, 25, 8
+    CONTROL         "Un-register ooDialog File Type", IDC_PB_REGISTER, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 19, 109, 176, 14
+    CONTROL         "Extension:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFT, 19, 137, 35, 8
+    CONTROL         "", IDC_EDIT_EXTENSION, WC_EDIT, NOT WS_BORDER | ES_AUTOHSCROLL, 55, 136, 33, 12
+    CONTROL         "Add", IDC_PB_ADD_EXTENSION, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 92, 135, 43, 14
+    CONTROL         "Suggested\nExtensions", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_CENTER, 10, 155, 70, 19
+    CONTROL         "", IDC_LB_SUGGESTED, WC_LISTBOX, WS_TABSTOP | WS_VSCROLL | NOT WS_BORDER | LBS_NOINTEGRALHEIGHT | LBS_SORT | LBS_USETABSTOPS | LBS_NOTIFY, 10, 173, 70, 75
+    CONTROL         "Add -->", IDC_PB_ADD_CURRENT, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 89, 179, 50, 14
+    CONTROL         "<-- Remove", IDC_PB_REMOVE_CURRENT, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 89, 198, 50, 14
+    CONTROL         "Currently\nAssociated", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_CENTER, 146, 155, 70, 19
+    CONTROL         "", IDC_LB_CURRENT, WC_LISTBOX, WS_TABSTOP | WS_VSCROLL | NOT WS_BORDER | LBS_NOINTEGRALHEIGHT | LBS_SORT | LBS_USETABSTOPS | LBS_NOTIFY, 146, 173, 70, 75
+    CONTROL         "Add -->", IDC_PB_ADD_PATHEXT, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 223, 179, 50, 14
+    CONTROL         "Remove", IDC_PB_REMOVE_PATHEXT, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 223, 198, 50, 14
+    CONTROL         "Currently\nin PATHEXT", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_CENTER, 282, 155, 70, 19
+    CONTROL         "", IDC_LB_PATHEXT, WC_LISTBOX, WS_TABSTOP | WS_VSCROLL | NOT WS_BORDER | LBS_NOINTEGRALHEIGHT | LBS_SORT | LBS_USETABSTOPS | LBS_NOTIFY, 282, 173, 70, 75
+    CONTROL         "Done", IDOK, WC_BUTTON, WS_TABSTOP | BS_DEFPUSHBUTTON, 247, 254, 50, 14
+    CONTROL         "Help", IDHELP, WC_BUTTON, WS_TABSTOP | BS_PUSHBUTTON, 302, 254, 50, 14
 }