changes from H.G. Muller
authorH.G. Muller <h.g.muller@hccnet.nl>
Sun, 19 Apr 2009 17:26:24 +0000 (10:26 -0700)
committerArun Persaud <arun@nubati.net>
Sun, 19 Apr 2009 17:26:24 +0000 (10:26 -0700)
winboard/winboard.rc

index 250e604..07926b7 100644 (file)
@@ -30,26 +30,27 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog\r
 //\r
 \r
-ABOUTBOX DIALOG DISCARDABLE  22, 17, 180, 113
+ABOUTBOX DIALOG DISCARDABLE  22, 17, 167, 67\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "About WinBoard"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,126,94,50,14,WS_GROUP
-    ICON            "icon_white",IDC_STATIC,3,6,20,20
+    DEFPUSHBUTTON   "OK",IDOK,131,47,32,14,WS_GROUP\r
+#if __GNUC__\r
+    ICON            icon_white,-1,3,6,20,20,0\r
+#else\r
+    ICON            "icon_white",-1,3,6,20,20,0\r
+#endif\r
     LTEXT           "Chessboard for Windows",400,25,15,121,8\r
     LTEXT           "Copyright 1991 Digital Equipment Corporation",201,6,34,\r
                     149,8\r
     LTEXT           "Enhancements Copyright 1992-2003   Free Software Foundation",\r
-                    OPT_TCtext1,6,45,121,17
+                    OPT_TCtext1,6,44,121,17\r
     CONTROL         "",OPT_TCTime,"Static",SS_BLACKRECT,4,28,159,1\r
-    LTEXT           "WinBoard 0.0.0",ABOUTBOX_Version,25,5,61,8
-    LTEXT           "Enhancements Copyright 2005\r\nAlessandro Scotti",
-                    IDC_STATIC,6,65,170,24
-    LTEXT           "(unofficial version ""X"")",IDC_STATIC,88,4,71,8
+    LTEXT           "WinBoard 0.0.0",ABOUTBOX_Version,25,5,142,8\r
 END\r
 \r
-DLG_TimeControl DIALOG DISCARDABLE  6, 18, 174, 98
+DLG_TimeControl DIALOG DISCARDABLE  6, 18, 147, 113\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Time Control"\r
 FONT 8, "MS Sans Serif"\r
@@ -58,32 +59,33 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,6,6,113,10\r
     CONTROL         "Incremental clock",OPT_TCUseInc,"Button",\r
                     BS_AUTORADIOBUTTON | WS_TABSTOP,6,42,107,10\r
-    EDITTEXT        OPT_TCMoves,14,20,26,12,ES_AUTOHSCROLL | WS_GROUP
-    LTEXT           "moves in",OPT_TCtext1,44,22,30,8,NOT WS_GROUP
-    EDITTEXT        OPT_TCTime,78,20,26,12,ES_AUTOHSCROLL
-    LTEXT           "minutes",OPT_TCtext2,108,22,26,8,NOT WS_GROUP
-    EDITTEXT        OPT_TCTime2,14,56,26,12,ES_AUTOHSCROLL | WS_GROUP
-    LTEXT           "minutes +",405,44,58,34,8,NOT WS_GROUP
-    EDITTEXT        OPT_TCInc,78,56,26,12,ES_AUTOHSCROLL
-    LTEXT           "seconds per move",408,108,58,62,8,NOT WS_GROUP
-    PUSHBUTTON      "OK",IDOK,64,80,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,120,80,50,14
+    EDITTEXT        OPT_TCMoves,14,20,22,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "moves in",OPT_TCtext1,40,22,30,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCTime,74,20,32,12,ES_AUTOHSCROLL\r
+    LTEXT           "minutes",OPT_TCtext2,111,22,26,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCTime2,14,56,32,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "minutes initially,",405,51,57,73,8,NOT WS_GROUP\r
+    LTEXT           "plus",406,19,74,15,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCInc,37,72,32,12,ES_AUTOHSCROLL\r
+    LTEXT           "seconds per move",408,74,74,67,8,NOT WS_GROUP\r
+    PUSHBUTTON      "OK",IDOK,32,95,40,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,88,95,40,14\r
 END\r
 \r
-DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 136, 55
+DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 144, 55\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Load Game Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
     CONTROL         "Load games with automatic stepping",OPT_Autostep,"Button",\r
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,130,10
-    EDITTEXT        OPT_ASTimeDelay,16,16,28,14,ES_AUTOHSCROLL
-    LTEXT           "seconds per move",OPT_AStext1,46,20,60,8,NOT WS_GROUP
-    PUSHBUTTON      "OK",IDOK,26,36,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,82,36,50,14
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,136,10\r
+    EDITTEXT        OPT_ASTimeDelay,23,18,28,12,ES_AUTOHSCROLL\r
+    LTEXT           "seconds per move",OPT_AStext1,57,20,60,8,NOT WS_GROUP\r
+    PUSHBUTTON      "OK",IDOK,24,37,40,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,80,37,40,14\r
 END\r
 \r
-DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 178, 119
+DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 133, 119\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Save Game Options"\r
 FONT 8, "MS Sans Serif"\r
@@ -91,19 +93,17 @@ BEGIN
     CONTROL         "Save games automatically",OPT_Autosave,"Button",\r
                     BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,97,10\r
     CONTROL         "Prompt for filename",OPT_AVPrompt,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,18,75,10
-    CONTROL         "To file:",OPT_AVToFile,"Button",BS_AUTORADIOBUTTON,16,
-                    32,36,10
-    EDITTEXT        OPT_AVFilename,54,30,97,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",OPT_AVBrowse,156,30,18,14
-    GROUPBOX        "Save As: ",801,4,48,170,28,WS_GROUP
-    CONTROL         "PGN",OPT_PGN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,
-                    60,39,10
-    CONTROL         "Old",OPT_Old,"Button",BS_AUTORADIOBUTTON,54,60,114,10
-    CONTROL         "Save out of book info in PGN",OPT_OutOfBookInfo,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,82,109,10
-    PUSHBUTTON      "OK",IDOK,68,100,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,124,100,50,14
+                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,18,18,75,10\r
+    CONTROL         "To file:",OPT_AVToFile,"Button",BS_AUTORADIOBUTTON,18,\r
+                    31,36,10\r
+    EDITTEXT        OPT_AVFilename,18,44,97,12,ES_AUTOHSCROLL\r
+    GROUPBOX        "Save Style",801,4,63,125,28,WS_GROUP\r
+    CONTROL         "PGN",OPT_PGN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,\r
+                    18,75,39,10\r
+    CONTROL         "Old",OPT_Old,"Button",BS_AUTORADIOBUTTON,73,75,39,10\r
+    PUSHBUTTON      "OK",IDOK,18,98,40,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,74,98,40,14\r
+    PUSHBUTTON      "Browse...",OPT_AVBrowse,76,31,39,14\r
 END\r
 \r
 1536 DIALOG DISCARDABLE  36, 24, 264, 134\r
@@ -136,123 +136,123 @@ BEGIN
     PUSHBUTTON      "Net&work...",1037,208,113,50,14,WS_GROUP\r
 END\r
 \r
-DLG_CommPort DIALOG DISCARDABLE  25, 30, 220, 79
+DLG_CommPort DIALOG DISCARDABLE  25, 30, 159, 98\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Communication Port Settings"\r
 FONT 8, "Helv"\r
 BEGIN\r
-    PUSHBUTTON      "OK",IDOK,106,60,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,164,60,50,14
     RTEXT           "&Port:",-1,4,6,40,10\r
     COMBOBOX        OPT_Port,49,4,55,60,CBS_DROPDOWN | WS_VSCROLL | \r
                     WS_TABSTOP\r
-    RTEXT           "Data &Rate:",-1,114,6,40,10,NOT WS_GROUP
-    COMBOBOX        OPT_DataRate,159,4,55,100,CBS_DROPDOWN | WS_VSCROLL |
+    RTEXT           "Data &Rate:",-1,4,21,40,10,NOT WS_GROUP\r
+    COMBOBOX        OPT_DataRate,49,19,55,100,CBS_DROPDOWN | WS_VSCROLL | \r
                     WS_TABSTOP\r
-    RTEXT           "Data &Bits:",-1,4,25,40,10,NOT WS_GROUP
-    COMBOBOX        OPT_Bits,49,22,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
+    RTEXT           "Data &Bits:",-1,4,36,40,10,NOT WS_GROUP\r
+    COMBOBOX        OPT_Bits,49,34,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | \r
                     WS_VSCROLL | WS_TABSTOP\r
-    RTEXT           "P&arity:",-1,114,24,40,10,NOT WS_GROUP
-    COMBOBOX        OPT_Parity,159,22,55,60,CBS_DROPDOWNLIST |
-                    CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "&Stop Bits:",-1,4,42,40,10,NOT WS_GROUP
-    COMBOBOX        OPT_StopBits,49,40,55,60,CBS_DROPDOWNLIST |
+    RTEXT           "P&arity:",-1,4,51,40,10,NOT WS_GROUP\r
+    COMBOBOX        OPT_Parity,49,49,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | \r
+                    WS_VSCROLL | WS_TABSTOP\r
+    RTEXT           "&Stop Bits:",-1,4,66,40,10,NOT WS_GROUP\r
+    COMBOBOX        OPT_StopBits,49,64,55,60,CBS_DROPDOWNLIST | \r
                     CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
-    RTEXT           "F&low:",-1,114,42,40,10,NOT WS_GROUP
-    COMBOBOX        OPT_Flow,159,40,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
+    RTEXT           "F&low:",-1,4,81,40,10,NOT WS_GROUP\r
+    DEFPUSHBUTTON   "OK",IDOK,115,4,40,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,115,24,40,14\r
+    COMBOBOX        OPT_Flow,49,79,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | \r
                     WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "Help",OPT_SerialHelp,4,60,50,14,NOT WS_VISIBLE
+    PUSHBUTTON      "&Help",OPT_SerialHelp,115,80,40,14,NOT WS_VISIBLE\r
 END\r
 \r
-DLG_EditComment DIALOG DISCARDABLE  6, 18, 302, 102
+DLG_EditComment DIALOG DISCARDABLE  6, 18, 306, 104\r
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
 CAPTION "Edit Comment"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "OK",IDOK,194,84,50,14
-    PUSHBUTTON      "Cancel",OPT_CancelComment,250,84,50,14
+    PUSHBUTTON      "OK",IDOK,61,86,40,14\r
+    PUSHBUTTON      "Cancel",OPT_CancelComment,109,86,40,14\r
+    PUSHBUTTON      "&Clear",OPT_ClearComment,157,86,40,14\r
+    PUSHBUTTON      "&Edit",OPT_EditComment,205,86,40,14\r
     CONTROL         "",OPT_CommentText,"RICHEDIT",ES_MULTILINE | \r
                     ES_AUTOHSCROLL | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | \r
-                    WS_HSCROLL | WS_TABSTOP,2,2,298,78
-    PUSHBUTTON      "&Clear",OPT_ClearComment,2,84,50,14
-    PUSHBUTTON      "&Edit",OPT_EditComment,58,84,50,14
+                    WS_HSCROLL | WS_TABSTOP,4,4,298,78\r
 END\r
 \r
 DLG_PromotionKing DIALOG DISCARDABLE  98, 90, 183, 41\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Promotion"\r
+CAPTION "Promote to:"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
+    PUSHBUTTON      "Chance&llor",PB_Chancellor,49,4,40,14,NOT WS_TABSTOP\r
+    PUSHBUTTON      "&Archbishop",PB_Archbishop,94,4,40,14,NOT WS_TABSTOP\r
     PUSHBUTTON      "&Queen",PB_Queen,4,23,40,14,WS_GROUP\r
     PUSHBUTTON      "&Rook",PB_Rook,49,23,40,14,NOT WS_TABSTOP\r
     PUSHBUTTON      "&Bishop",PB_Bishop,94,23,40,14,NOT WS_TABSTOP\r
     PUSHBUTTON      "K&night",PB_Knight,139,23,40,14,NOT WS_TABSTOP\r
-    PUSHBUTTON      "&King",PB_King,94,4,40,14,NOT WS_TABSTOP\r
+    PUSHBUTTON      "&King",PB_King,4,4,40,14,NOT WS_TABSTOP\r
     PUSHBUTTON      "&Cancel",IDCANCEL,139,4,40,14,WS_GROUP\r
-    LTEXT           "Promote pawn to:",501,6,8,58,8\r
 END\r
 \r
-ABOUTBOX2 DIALOG DISCARDABLE  22, 17, 281, 223
+ABOUTBOX2 DIALOG DISCARDABLE  22, 17, 281, 198\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "About WinBoard"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
+    DEFPUSHBUTTON   "OK",IDOK,244,180,32,14,WS_GROUP\r
     RTEXT           "Chessboard for Windows",DLG_TimeControl,196,154,80,8\r
-    LTEXT           "Copyright 1991 Digital Equipment Corporation",201,4,168,
+    LTEXT           "Copyright 1991 Digital Equipment Corporation",201,4,167,\r
                     151,8\r
     LTEXT           "Enhancements Copyright 1992-2003   Free Software Foundation",\r
-                    OPT_TCtext1,4,179,126,17
+                    OPT_TCtext1,4,177,126,17\r
     CONTROL         "",OPT_TCTime,"Static",SS_BLACKRECT,4,164,272,1\r
     LTEXT           "WinBoard 0.0.0",ABOUTBOX_Version,4,154,64,8\r
     CONTROL         "galactic",IDC_STATIC,"Static",SS_BITMAP,4,4,15,13\r
-    DEFPUSHBUTTON   "OK",IDOK,226,204,50,14
-    LTEXT           "Enhancements Copyright 2005\r\nAlessandro Scotti",
-                    IDC_STATIC,4,199,183,20
-    LTEXT           "(unofficial version ""X"")",IDC_STATIC,68,154,71,8
 END\r
 \r
-DLG_GameList DIALOG DISCARDABLE  6, 18, 259, 153
+DLG_GameList DIALOG DISCARDABLE  6, 18, 307, 159\r
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
 CAPTION "Game List"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    LISTBOX         OPT_GameListText,2,2,254,130,LBS_NOINTEGRALHEIGHT |
+    LISTBOX         OPT_GameListText,4,4,299,130,LBS_NOINTEGRALHEIGHT | \r
                     WS_VSCROLL | WS_HSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "&Load",OPT_GameListLoad,2,135,32,15
-    PUSHBUTTON      "&<",OPT_GameListPrev,38,135,22,15
-    PUSHBUTTON      "&>",OPT_GameListNext,64,135,24,15
-    PUSHBUTTON      "&Close",OPT_GameListClose,92,135,32,15
-    PUSHBUTTON      "Filter",IDC_GameListDoFilter,144,136,30,14
-    EDITTEXT        IDC_GameListFilter,178,136,78,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Load",OPT_GameListLoad,61,138,40,15\r
+    PUSHBUTTON      "&Prev",OPT_GameListPrev,109,138,40,15\r
+    PUSHBUTTON      "&Next",OPT_GameListNext,157,138,40,15\r
+    PUSHBUTTON      "&Close",OPT_GameListClose,205,138,40,15\r
 END\r
 \r
-DLG_EditTags DIALOG DISCARDABLE  6, 18, 167, 140
+DLG_EditTags DIALOG DISCARDABLE  6, 18, 160, 141\r
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
 CAPTION "Edit Tags"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "OK",IDOK,58,122,50,14
-    PUSHBUTTON      "Cancel",OPT_TagsCancel,114,122,50,14
+    PUSHBUTTON      "OK",IDOK,12,123,40,14\r
+    PUSHBUTTON      "Cancel",OPT_TagsCancel,60,123,40,14\r
+    PUSHBUTTON      "&Edit",OPT_EditTags,108,123,40,14\r
     CONTROL         "",OPT_TagsText,"RICHEDIT",ES_MULTILINE | ES_AUTOVSCROLL | \r
                     ES_AUTOHSCROLL | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | \r
-                    WS_HSCROLL | WS_TABSTOP,2,2,162,115
-    PUSHBUTTON      "&Edit",OPT_EditTags,2,122,50,14
+                    WS_HSCROLL | WS_TABSTOP,4,4,152,115\r
 END\r
 \r
 WBCONSOLE DIALOG DISCARDABLE  0, 0, 335, 133\r
 STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CAPTION | WS_SYSMENU | \r
     WS_THICKFRAME\r
 CAPTION "ICS Interaction"\r
+#if __GNUC__\r
+CLASS WBConsole\r
+#else\r
 CLASS "WBConsole"\r
+#endif\r
 FONT 8, "Courier New"\r
 BEGIN\r
     CONTROL         "",OPT_ConsoleText,"RICHEDIT",ES_MULTILINE | \r
                     ES_AUTOVSCROLL | ES_NOHIDESEL | ES_READONLY | ES_NUMBER | \r
                     WS_BORDER | WS_VSCROLL | WS_TABSTOP,0,0,335,119\r
-    CONTROL         "",OPT_ConsoleInput,"RICHEDIT",ES_MULTILINE |
-                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL |
-                    ES_NUMBER | WS_BORDER | WS_TABSTOP,0,120,335,13,
-                    WS_EX_TRANSPARENT
+    CONTROL         "",OPT_ConsoleInput,"RICHEDIT",ES_AUTOHSCROLL | \r
+                    ES_AUTOVSCROLL | ES_MULTILINE | \r
+                    ES_NOHIDESEL | ES_NUMBER | WS_BORDER | \r
+                    WS_TABSTOP,0,120,335,13,WS_EX_TRANSPARENT\r
 END\r
 \r
 DLG_Analysis DIALOG DISCARDABLE  0, 0, 294, 62\r
@@ -266,47 +266,47 @@ BEGIN
                     WS_HSCROLL | WS_TABSTOP,4,4,286,54\r
 END\r
 \r
-DLG_Error DIALOG DISCARDABLE  0, 0, 220, 66
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION\r
+DLG_Error DIALOG DISCARDABLE 0, 0, 183, 33\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Error"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    ICON            32515,IDC_STATIC,4,4,21,20
-    LTEXT           "Sorry Charlie",OPT_ErrorText,28,4,188,36
-    DEFPUSHBUTTON   "OK",IDOK,84,48,50,14
+    DEFPUSHBUTTON   "OK",IDOK,163,9,16,14\r
+    ICON            32515,IDC_STATIC,4,6,20,20\r
+    LTEXT           "Sorry Charlie",OPT_ErrorText,27,4,130,25\r
 END\r
 \r
-DLG_Colorize DIALOGEX 0, 0, 174, 61
+DLG_Colorize DIALOGEX 0, 0, 183, 52\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "ICS Interaction Colors"\r
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,64,42,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,120,42,50,14
-    PUSHBUTTON      "&Color...",OPT_ChooseColor,119,4,51,14,WS_GROUP
+    PUSHBUTTON      "&Choose Color...",OPT_ChooseColor,15,29,51,14,WS_GROUP\r
     CONTROL         "&Bold",OPT_Bold,"Button",BS_AUTOCHECKBOX | WS_GROUP | \r
-                    WS_TABSTOP,4,24,30,10
-    CONTROL         "&Italic",OPT_Italic,"Button",BS_AUTOCHECKBOX,40,24,30,
+                    WS_TABSTOP,93,4,30,10\r
+    CONTROL         "&Italic",OPT_Italic,"Button",BS_AUTOCHECKBOX,93,14,30,\r
                     10\r
-    CONTROL         "&Underline",OPT_Underline,"Button",BS_AUTOCHECKBOX,76,
+    CONTROL         "&Underline",OPT_Underline,"Button",BS_AUTOCHECKBOX,93,\r
                     24,45,10\r
-    CONTROL         "&Strikeout",OPT_Strikeout,"Button",BS_AUTOCHECKBOX,128,
-                    24,42,10
+    CONTROL         "&Strikeout",OPT_Strikeout,"Button",BS_AUTOCHECKBOX,93,\r
+                    34,42,10\r
+    DEFPUSHBUTTON   "OK",IDOK,145,7,31,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,145,24,31,14\r
     CONTROL         "",OPT_Sample,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_GROUP,4,4,106,15,WS_EX_CLIENTEDGE
+                    ES_READONLY | WS_GROUP,4,9,75,15,WS_EX_CLIENTEDGE\r
 END\r
 \r
-DLG_Question DIALOG DISCARDABLE  0, 0, 187, 77
+DLG_Question DIALOG DISCARDABLE  0, 0, 187, 60\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Question"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    EDITTEXT        OPT_QuestionInput,4,36,179,14,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,78,58,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,134,58,50,14
+    EDITTEXT        OPT_QuestionInput,4,44,179,12,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "Enter",IDOK,133,4,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,133,24,50,14\r
     LTEXT           "Enter a chess engine command or just type something stupid that will completely screw things up.",\r
-                    OPT_QuestionText,30,2,153,28
-    ICON            32514,IDC_STATIC,4,4,20,20
+                    OPT_QuestionText,27,4,101,33\r
+    ICON            32514,IDC_STATIC,4,13,20,20\r
 END\r
 \r
 DLG_Startup DIALOG DISCARDABLE  0, 0, 276, 127\r
@@ -337,429 +337,294 @@ BEGIN
 END\r
 \r
 DLG_IndexNumber DIALOG DISCARDABLE  0, 0, 236, 18\r
+#if __GNUC__\r
+STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS |\r
+       NOT WS_POPUP | NOT WS_BORDER | NOT WS_SYSMENU\r
+#else\r
 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS\r
+#endif\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
     LTEXT           "Inde&x number:",IDC_STATIC,5,2,46,8\r
     EDITTEXT        OPT_IndexNumber,54,0,155,13,ES_AUTOHSCROLL\r
 END\r
 \r
-DLG_TypeInMove DIALOG DISCARDABLE  0, 0, 206, 23
+DLG_TypeInMove DIALOG DISCARDABLE  0, 0, 186, 46\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Type in a move"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,96,4,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,152,4,50,14
-    EDITTEXT        OPT_Move,4,4,86,13,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14\r
+    EDITTEXT        OPT_Move,7,16,109,13,ES_AUTOHSCROLL\r
 END\r
 \r
-DLG_Sound DIALOG DISCARDABLE  0, 0, 242, 105
+DLG_Sound DIALOG DISCARDABLE  0, 0, 257, 95\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Sounds"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,132,86,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,188,86,50,14
-    LTEXT           "Event:",IDC_STATIC,4,7,26,9
-    COMBOBOX        CBO_Sounds,30,4,208,110,CBS_DROPDOWNLIST | WS_VSCROLL |
+    DEFPUSHBUTTON   "OK",IDOK,199,6,47,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,199,23,47,14\r
+    PUSHBUTTON      "Defaults",OPT_DefaultSounds,199,40,47,14\r
+    COMBOBOX        CBO_Sounds,52,6,128,110,CBS_DROPDOWNLIST | WS_VSCROLL | \r
                     WS_TABSTOP\r
     CONTROL         "No sound",OPT_NoSound,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_GROUP | WS_TABSTOP,12,22,47,10
+                    WS_GROUP | WS_TABSTOP,11,25,47,10\r
     CONTROL         "Default beep",OPT_DefaultBeep,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,36,57,10
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,11,42,57,10\r
     CONTROL         "Built-in sound:",OPT_BuiltInSound,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,51,60,10
-    COMBOBOX        OPT_BuiltInSoundName,76,48,103,109,CBS_DROPDOWNLIST |
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,11,59,60,10\r
+    COMBOBOX        OPT_BuiltInSoundName,78,58,103,109,CBS_DROPDOWNLIST | \r
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "Play",OPT_PlaySound,188,47,50,14
+    PUSHBUTTON      "Play",OPT_PlaySound,200,57,47,14\r
     CONTROL         "WAV file:",OPT_WavFile,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,12,66,45,10
-    EDITTEXT        OPT_WavFileName,76,65,103,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",OPT_BrowseSound,188,64,50,14
-    PUSHBUTTON      "Defaults",OPT_DefaultSounds,6,86,50,14
+                    WS_TABSTOP,11,76,45,10\r
+    EDITTEXT        OPT_WavFileName,78,75,103,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "Browse...",OPT_BrowseSound,200,74,47,14\r
+    LTEXT           "Event:",IDC_STATIC,19,9,26,9\r
 END\r
 \r
-DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 220, 183
+DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 271, 135\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "General Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,110,164,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,166,164,50,14
+    DEFPUSHBUTTON   "OK",IDOK,207,7,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,208,25,50,14\r
     CONTROL         "Always on &Top",OPT_AlwaysOnTop,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,6,79,10
-    CONTROL         "Highlight Last &Move",OPT_HighlightLastMove,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,6,79,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,6,79,10\r
     CONTROL         "Always &Queen",OPT_AlwaysQueen,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,20,79,10
-    CONTROL         "Periodic &Updates",OPT_PeriodicUpdates,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,20,79,10
+                    WS_TABSTOP,16,20,79,10\r
     CONTROL         "Animate &Dragging",OPT_AnimateDragging,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,34,79,10
-    CONTROL         "Ponder &Next Move",OPT_PonderNextMove,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,34,79,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,34,79,10\r
     CONTROL         "&Animate Moving",OPT_AnimateMoving,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,48,79,10
-    CONTROL         "&Popup Exit Message",OPT_PopupExitMessage,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,48,79,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,48,79,10\r
     CONTROL         "Auto &Flag",OPT_AutoFlag,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,62,79,10
-    CONTROL         "Popup Move &Errors",OPT_PopupMoveErrors,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,62,79,10
+                    WS_TABSTOP,16,62,79,10\r
     CONTROL         "Auto Flip &View",OPT_AutoFlipView,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,76,79,10
-    CONTROL         "Show Butt&on Bar",OPT_ShowButtonBar,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,76,79,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,76,79,10\r
     CONTROL         "Auto &Raise Board",OPT_AutoRaiseBoard,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,90,71,10
-    CONTROL         "Show &Coordinates",OPT_ShowCoordinates,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,90,79,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,90,71,10\r
     CONTROL         "&Blindfold",OPT_Blindfold,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,104,79,10
-    CONTROL         "&Show Thinking",OPT_ShowThinking,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,104,79,10
+                    WS_TABSTOP,16,104,79,10\r
     CONTROL         "&Highlight Dragging",OPT_HighlightDragging,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,118,79,10
-    CONTROL         "Test &Legality",OPT_TestLegality,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,118,79,10
-    CONTROL         "Extended PGN Info",OPT_SaveExtPGN,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,132,79,10
-    CONTROL         "Hide Thinking from Human",OPT_HideThinkFromHuman,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,116,132,100,10
-    CONTROL         "Extra Info in Move History",OPT_ExtraInfoInMoveHistory,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,146,97,10
-    CONTROL         "Highlight Move with Arrow",OPT_HighlightMoveArrow,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,145,100,9
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,118,79,10\r
+    CONTROL         "Highlight Last &Move",OPT_HighlightLastMove,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,109,6,79,10\r
+    CONTROL         "Periodic &Updates",OPT_PeriodicUpdates,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,109,20,79,10\r
+    CONTROL         "Ponder &Next Move",OPT_PonderNextMove,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,109,34,79,10\r
+    CONTROL         "&Popup Exit Message",OPT_PopupExitMessage,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,109,48,79,10\r
+    CONTROL         "Popup Move &Errors",OPT_PopupMoveErrors,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,109,62,79,10\r
+    CONTROL         "Show Butt&on Bar",OPT_ShowButtonBar,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,109,76,79,10\r
+    CONTROL         "Show &Coordinates",OPT_ShowCoordinates,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,109,90,79,10\r
+    CONTROL         "&Show Thinking",OPT_ShowThinking,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,109,104,79,10\r
+    CONTROL         "Test &Legality",OPT_TestLegality,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,109,118,79,10\r
 END\r
 \r
-DLG_IcsOptions DIALOGEX 0, 0, 302, 255
+DLG_IcsOptions DIALOGEX 0, 0, 318, 271\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "ICS Options"\r
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,194,237,50,15
-    PUSHBUTTON      "Cancel",IDCANCEL,248,237,50,15
+    DEFPUSHBUTTON   "OK",IDOK,88,250,60,15\r
+    PUSHBUTTON      "Cancel",IDCANCEL,168,250,60,15\r
     CONTROL         "&Auto Comment",OPT_AutoComment,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,12,63,8
+                    WS_TABSTOP,20,12,63,8\r
     CONTROL         "Auto &Observe",OPT_AutoObserve,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,25,63,8
+                    WS_TABSTOP,20,27,63,8\r
     CONTROL         "&Get Move List",OPT_GetMoveList,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,38,63,8
+                    BS_AUTOCHECKBOX | WS_TABSTOP,20,42,63,8\r
     CONTROL         "&Local Line Editing",OPT_LocalLineEditing,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,51,84,8
+                    BS_AUTOCHECKBOX | WS_TABSTOP,20,57,84,8\r
     CONTROL         "&Quiet Play",OPT_QuietPlay,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,64,63,8
+                    WS_TABSTOP,20,72,63,8\r
     CONTROL         "&Premove",OPT_Premove,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,160,12,46,10
+                    WS_TABSTOP,171,12,46,10\r
     CONTROL         "&White first move",OPT_PremoveWhite,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,160,26,67,10
-    EDITTEXT        OPT_PremoveWhiteText,236,22,25,14,ES_AUTOHSCROLL
+                    BS_AUTOCHECKBOX | WS_TABSTOP,171,27,67,10\r
+    EDITTEXT        OPT_PremoveWhiteText,252,23,25,14,ES_AUTOHSCROLL\r
     CONTROL         "&Black first move",OPT_PremoveBlack,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,160,40,66,10
-    EDITTEXT        OPT_PremoveBlackText,236,38,25,14,ES_AUTOHSCROLL
+                    BS_AUTOCHECKBOX | WS_TABSTOP,171,42,66,10\r
+    EDITTEXT        OPT_PremoveBlackText,252,39,25,14,ES_AUTOHSCROLL\r
     CONTROL         "&Sound alarm at",OPT_IcsAlarm,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,160,72,63,10
-    EDITTEXT        OPT_IcsAlarmTime,236,68,26,14,ES_AUTOHSCROLL
-    LTEXT           "seconds",IDC_STATIC,264,72,28,8
-    PUSHBUTTON      "Choose...",OPT_ChooseShoutColor,97,101,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseSShoutColor,97,121,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseChannel1Color,97,141,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseChannelColor,97,161,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseKibitzColor,97,181,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseTellColor,246,101,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseChallengeColor,246,121,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseRequestColor,246,141,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseSeekColor,246,161,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseNormalColor,246,181,45,15
-    PUSHBUTTON      "Background...",OPT_ChooseBackgroundColor,10,208,50,16
-    PUSHBUTTON      "&Defaults...",OPT_DefaultColors,68,208,50,16
+                    WS_TABSTOP,171,72,63,10\r
+    EDITTEXT        OPT_IcsAlarmTime,243,70,20,13,ES_AUTOHSCROLL\r
+    LTEXT           "seconds",IDC_STATIC,270,72,28,8\r
+    PUSHBUTTON      "Choose...",OPT_ChooseShoutColor,104,101,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseSShoutColor,104,121,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseChannel1Color,104,141,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseChannelColor,104,161,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseKibitzColor,104,181,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseTellColor,252,101,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseChallengeColor,252,121,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseRequestColor,252,141,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseSeekColor,252,161,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseNormalColor,252,181,45,15\r
+    PUSHBUTTON      "&Choose Background Color...",OPT_ChooseBackgroundColor,\r
+                    17,204,132,16\r
+    PUSHBUTTON      "&Default ICS Colors",OPT_DefaultColors,165,204,132,16\r
     CONTROL         "Do &not colorize messages",OPT_DontColorize,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,192,212,97,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,110,225,97,10\r
     CONTROL         "",OPT_SampleShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,10,101,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,17,101,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleSShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,10,121,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,17,121,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleChannel1,"RICHEDIT",ES_CENTER | \r
-                    ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,10,
+                    ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,17,\r
                     141,75,15,WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleChannel,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,10,161,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,17,161,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleKibitz,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_GROUP,10,181,75,15,WS_EX_CLIENTEDGE
+                    ES_READONLY | WS_GROUP,17,181,75,15,WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleTell,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,101,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,165,101,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleChallenge,"RICHEDIT",ES_CENTER | \r
-                    ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,159,
+                    ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,165,\r
                     121,75,15,WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleRequest,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,141,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,165,141,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleSeek,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,161,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,165,161,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleNormal,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,181,75,15,
+                    ES_READONLY | WS_DISABLED | WS_GROUP,165,181,75,15,\r
                     WS_EX_CLIENTEDGE\r
-    GROUPBOX        "Interaction Colors",IDC_STATIC,4,90,294,140
-    GROUPBOX        "Premove",IDC_STATIC,154,0,144,56
-    GROUPBOX        "General",IDC_STATIC,4,0,146,88
-    GROUPBOX        "Alarm",IDC_STATIC,154,58,144,30
+    GROUPBOX        "Interaction Colors",IDC_STATIC,10,90,295,150\r
+    GROUPBOX        "Premove",IDC_STATIC,159,0,146,59\r
+    GROUPBOX        "",IDC_STATIC,10,0,146,89\r
+    GROUPBOX        "Alarm",IDC_STATIC,159,59,146,30\r
 END\r
 \r
-DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 194, 250
+DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 262, 250\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Board Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,84,232,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14
+    DEFPUSHBUTTON   "OK",IDOK,205,10,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,205,35,50,14\r
     CONTROL         "&Tiny",OPT_SizeTiny,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_GROUP | WS_TABSTOP,9,14,50,10
-    CONTROL         "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,9,24,
+                    WS_GROUP | WS_TABSTOP,15,15,50,10\r
+    CONTROL         "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,15,25,\r
                     50,10\r
-    CONTROL         "&Dinky",OPT_SizeDinky,"Button",BS_AUTORADIOBUTTON,9,34,
+    CONTROL         "&Dinky",OPT_SizeDinky,"Button",BS_AUTORADIOBUTTON,15,35,\r
                     50,10\r
-    CONTROL         "&Petite",OPT_SizePetite,"Button",BS_AUTORADIOBUTTON,9,
-                    44,50,10
-    CONTROL         "Sl&im",OPT_SizeSlim,"Button",BS_AUTORADIOBUTTON,9,54,50,
-                    10
-    CONTROL         "&Small",OPT_SizeSmall,"Button",BS_AUTORADIOBUTTON,9,64,
+    CONTROL         "&Petite",OPT_SizePetite,"Button",BS_AUTORADIOBUTTON,15,\r
+                    45,50,10\r
+    CONTROL         "Sl&im",OPT_SizeSlim,"Button",BS_AUTORADIOBUTTON,15,55,\r
+                    50,10\r
+    CONTROL         "&Small",OPT_SizeSmall,"Button",BS_AUTORADIOBUTTON,15,65,\r
                     50,10\r
     CONTROL         "Medi&ocre",OPT_SizeMediocre,"Button",BS_AUTORADIOBUTTON,\r
-                    70,14,50,10
+                    76,15,50,10\r
     CONTROL         "&Middling",OPT_SizeMiddling,"Button",BS_AUTORADIOBUTTON,\r
-                    70,24,50,10
+                    76,25,50,10\r
     CONTROL         "&Average",OPT_SizeAverage,"Button",BS_AUTORADIOBUTTON,\r
-                    70,34,50,10
+                    76,35,50,10\r
     CONTROL         "Mode&rate",OPT_SizeModerate,"Button",BS_AUTORADIOBUTTON,\r
-                    70,44,50,10
-    CONTROL         "Medi&um",OPT_SizeMedium,"Button",BS_AUTORADIOBUTTON,70,
-                    54,50,10
-    CONTROL         "Bul&ky",OPT_SizeBulky,"Button",BS_AUTORADIOBUTTON,70,64,
+                    76,45,50,10\r
+    CONTROL         "Medi&um",OPT_SizeMedium,"Button",BS_AUTORADIOBUTTON,76,\r
+                    55,50,10\r
+    CONTROL         "Bul&ky",OPT_SizeBulky,"Button",BS_AUTORADIOBUTTON,76,65,\r
                     50,10\r
-    CONTROL         "&Large",OPT_SizeLarge,"Button",BS_AUTORADIOBUTTON,134,
-                    14,50,10
-    CONTROL         "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,134,24,50,
+    CONTROL         "&Large",OPT_SizeLarge,"Button",BS_AUTORADIOBUTTON,140,\r
+                    15,50,10\r
+    CONTROL         "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,140,25,50,\r
                     10\r
-    CONTROL         "&Huge",OPT_SizeHuge,"Button",BS_AUTORADIOBUTTON,134,34,
+    CONTROL         "&Huge",OPT_SizeHuge,"Button",BS_AUTORADIOBUTTON,140,35,\r
                     50,10\r
-    CONTROL         "&Giant",OPT_SizeGiant,"Button",BS_AUTORADIOBUTTON,134,
-                    44,50,10
+    CONTROL         "&Giant",OPT_SizeGiant,"Button",BS_AUTORADIOBUTTON,140,\r
+                    45,50,10\r
     CONTROL         "&Colossal",OPT_SizeColossal,"Button",BS_AUTORADIOBUTTON,\r
-                    134,54,50,10
+                    140,55,50,10\r
     CONTROL         "Tita&nic",OPT_SizeTitanic,"Button",BS_AUTORADIOBUTTON,\r
-                    134,64,50,10
-    PUSHBUTTON      "...",OPT_ChooseLightSquareColor,110,94,20,15
-    PUSHBUTTON      "...",OPT_ChooseDarkSquareColor,110,112,20,15
-    PUSHBUTTON      "...",OPT_ChooseWhitePieceColor,110,130,20,15
-    PUSHBUTTON      "...",OPT_ChooseBlackPieceColor,110,148,20,15
-    PUSHBUTTON      "...",OPT_ChooseHighlightSquareColor,110,166,20,15
-    PUSHBUTTON      "...",OPT_ChoosePremoveHighlightColor,110,184,20,15
-    CONTROL         "Monochrome",OPT_Monochrome,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,10,210,64,10
-    PUSHBUTTON      "Defaults",OPT_DefaultBoardColors,80,206,50,15
-    EDITTEXT        OPT_DarkSquareColor,80,112,25,15,ES_READONLY |
+                    140,65,50,10\r
+    PUSHBUTTON      "Choose...",OPT_ChooseLightSquareColor,144,100,40,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseDarkSquareColor,144,120,40,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseWhitePieceColor,144,140,40,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseBlackPieceColor,144,160,40,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseHighlightSquareColor,144,180,40,15\r
+    PUSHBUTTON      "Choose...",OPT_ChoosePremoveHighlightColor,144,200,40,\r
+                    15\r
+    PUSHBUTTON      "Defaults",OPT_DefaultBoardColors,118,225,65,15\r
+    EDITTEXT        OPT_DarkSquareColor,104,120,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_LightSquareColor,80,94,25,15,ES_READONLY |
+    EDITTEXT        OPT_LightSquareColor,104,100,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_WhitePieceColor,80,130,25,15,ES_READONLY |
+    EDITTEXT        OPT_WhitePieceColor,104,140,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_BlackPieceColor,80,148,25,15,ES_READONLY |
+    EDITTEXT        OPT_BlackPieceColor,104,160,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_HighlightSquareColor,80,166,25,15,ES_READONLY |
+    EDITTEXT        OPT_HighlightSquareColor,104,180,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    GROUPBOX        "Colors",IDC_STATIC,4,84,185,142
-    EDITTEXT        OPT_PremoveHighlightColor,80,184,25,15,ES_READONLY |
+    GROUPBOX        "Colors",IDC_STATIC,10,90,185,155\r
+    EDITTEXT        OPT_PremoveHighlightColor,104,200,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    LTEXT           "Light Squares",IDC_STATIC,10,98,60,10
-    LTEXT           "Dark Squares",IDC_STATIC,10,116,60,10
-    LTEXT           "White Pieces",IDC_STATIC,10,134,60,10
-    LTEXT           "Black Pieces",IDC_STATIC,10,152,60,10
-    LTEXT           "Square Highlights",IDC_STATIC,10,170,60,10
-    LTEXT           "Premove Highlights",IDC_STATIC,10,188,70,10
-    GROUPBOX        "Size",IDC_STATIC,4,4,185,75
-    EDITTEXT        OPT_SampleLightSquare,144,96,39,36,ES_READONLY |
+    LTEXT           "Light Squares",IDC_STATIC,25,105,60,10\r
+    LTEXT           "Dark Squares",IDC_STATIC,25,124,60,10\r
+    LTEXT           "White Pieces",IDC_STATIC,25,145,60,10\r
+    LTEXT           "Black Pieces",IDC_STATIC,25,165,60,10\r
+    LTEXT           "Square Highlights",IDC_STATIC,25,185,60,10\r
+    LTEXT           "Premove Highlights",IDC_STATIC,25,205,70,10\r
+    GROUPBOX        "Size",IDC_STATIC,10,5,185,75\r
+    CONTROL         "Monochrome",OPT_Monochrome,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,25,225,75,10\r
+    EDITTEXT        OPT_SampleLightSquare,205,110,39,36,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_SampleDarkSquare,144,138,39,36,ES_READONLY |
+    EDITTEXT        OPT_SampleDarkSquare,205,165,39,36,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
 END\r
 \r
-DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 226
+DLG_Fonts DIALOG DISCARDABLE  0, 0, 280, 231\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Fonts"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,156,208,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,212,208,50,14
-    PUSHBUTTON      "Choose...",OPT_ChooseClockFont,212,15,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseMessageFont,212,39,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseCoordFont,212,63,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseTagFont,212,101,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseCommentsFont,212,125,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseConsoleFont,212,149,45,15
-    PUSHBUTTON      "Choose...",OPT_ChooseMoveHistoryFont,212,174,45,15
-    PUSHBUTTON      "&Defaults",OPT_DefaultFonts,3,208,50,15
+    DEFPUSHBUTTON   "OK",IDOK,155,210,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,215,210,50,14\r
+    PUSHBUTTON      "Choose...",OPT_ChooseClockFont,221,17,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseMessageFont,221,47,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseCoordFont,221,77,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseTagFont,221,120,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseCommentsFont,221,150,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseConsoleFont,221,180,45,15\r
+    PUSHBUTTON      "&Revert to Defaults",OPT_DefaultFonts,15,210,80,15\r
     CONTROL         "",OPT_SampleCoordFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,59,140,20
+                    WS_DISABLED | WS_BORDER,70,72,140,20\r
     CONTROL         "",OPT_SampleTagFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,97,140,20
+                    WS_DISABLED | WS_BORDER,70,115,140,20\r
     CONTROL         "",OPT_SampleCommentsFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,121,140,20
+                    WS_DISABLED | WS_BORDER,70,145,140,20\r
     CONTROL         "",OPT_SampleConsoleFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,145,140,20
-    LTEXT           "Clocks",OPT_ClockFont,13,16,45,10,NOT WS_GROUP
-    LTEXT           "Messages",OPT_MessageFont,13,40,45,10,NOT WS_GROUP
-    LTEXT           "Coordinates",OPT_CoordFont,13,64,45,10,NOT WS_GROUP
-    LTEXT           "Tags",OPT_EditTagsFont,13,102,45,10,NOT WS_GROUP
-    LTEXT           "Comments",OPT_CommentsFont,13,126,45,10,NOT WS_GROUP
-    LTEXT           "ICS Interaction",OPT_MessageFont5,13,150,50,10,NOT
+                    WS_DISABLED | WS_BORDER,70,175,140,20\r
+    LTEXT           "Clocks",OPT_ClockFont,16,17,45,10,NOT WS_GROUP\r
+    LTEXT           "Messages",OPT_MessageFont,16,47,45,10,NOT WS_GROUP\r
+    LTEXT           "Coordinates",OPT_CoordFont,16,77,45,10,NOT WS_GROUP\r
+    LTEXT           "Tags",OPT_EditTagsFont,16,120,45,10,NOT WS_GROUP\r
+    LTEXT           "Comments",OPT_CommentsFont,16,150,45,10,NOT WS_GROUP\r
+    LTEXT           "ICS Interaction",OPT_MessageFont5,16,180,50,10,NOT \r
                     WS_GROUP\r
     CONTROL         "",OPT_SampleClockFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,11,140,20
+                    WS_DISABLED | WS_BORDER,70,12,140,20\r
     CONTROL         "",OPT_SampleMessageFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,35,140,20
-    GROUPBOX        "Current Board Size",IDC_STATIC,3,1,259,83
-    GROUPBOX        "All Board Sizes",IDC_STATIC,3,87,259,109
-    CONTROL         "",OPT_SampleMoveHistoryFont,"RICHEDIT",ES_READONLY |
-                    WS_DISABLED | WS_BORDER,67,170,140,20
-    LTEXT           "Move History",OPT_MessageFont6,13,175,50,10,NOT
-                    WS_GROUP
+                    WS_DISABLED | WS_BORDER,70,42,140,20\r
+    GROUPBOX        "Current Board Size",IDC_STATIC,5,2,270,100\r
+    GROUPBOX        "All Board Sizes",IDC_STATIC,5,105,270,100\r
 END\r
 \r
-DLG_NewGameFRC DIALOG DISCARDABLE  0, 0, 176, 47
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "New FRC (Chess960) Game"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "&Start Position Number:",IDC_NFG_Label,4,7,71,8
-    EDITTEXT        IDC_NFG_Edit,76,4,42,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Random",IDC_NFG_Random,122,4,50,14
-    DEFPUSHBUTTON   "OK",IDOK,64,28,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,122,28,50,14
-END
-
-DLG_GameListOptions DIALOG DISCARDABLE  0, 0, 206, 140
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Game List Options"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "PGN &Tags:",IDC_GLT,2,2,36,8
-    LISTBOX         IDC_GameListTags,2,12,158,102,LBS_USETABSTOPS |
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&Up",IDC_GLT_Up,164,12,38,14
-    PUSHBUTTON      "&Down",IDC_GLT_Down,164,30,38,14
-    PUSHBUTTON      "Default",IDC_GLT_Restore,164,82,38,14
-    PUSHBUTTON      "Factory",IDC_GLT_Default,164,100,38,14
-    DEFPUSHBUTTON   "OK",IDOK,96,122,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,152,122,50,14
-    LTEXT           "Restore to:",IDC_GLT_RestoreTo,164,70,36,8
-END
-
-DLG_MoveHistory DIALOGEX 0, 0, 225, 130
-STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "Move History"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "",IDC_MoveHistory,"RICHEDIT",ES_MULTILINE | ES_READONLY |
-                    WS_BORDER | WS_VSCROLL | WS_TABSTOP,2,2,222,128
-END
-
-DLG_EvalGraph DIALOGEX 0, 0, 216, 75
-STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "Evaluation Diagram"
-FONT 8, "MS Sans Serif"
-BEGIN
-END
-
-DLG_EngineOutput DIALOGEX 0, 0, 266, 167
-STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "Engine output"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Engine #1",IDC_EngineLabel1,14,2,84,8
-    RTEXT           "NPS",IDC_Engine1_NPS,206,2,57,8
-    CONTROL         "",IDC_EngineMemo1,"RICHEDIT",ES_MULTILINE |
-                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL |
-                    WS_HSCROLL | WS_TABSTOP,0,10,262,72
-    LTEXT           "Engine #2",IDC_EngineLabel2,15,84,103,8
-    RTEXT           "NPS",IDC_Engine2_NPS,210,84,55,8
-    CONTROL         "",IDC_EngineMemo2,"RICHEDIT",ES_MULTILINE |
-                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL |
-                    WS_HSCROLL | WS_TABSTOP,2,92,262,74
-    ICON            IDI_UNKNOWN_14,IDC_Color1,2,4,20,20,SS_REALSIZEIMAGE
-    ICON            IDI_UNKNOWN_14,IDC_Color2,4,84,20,20
-    LTEXT           "Static",IDC_StateData1,120,2,83,8
-    ICON            IDI_TRANS_14,IDC_StateIcon1,98,0,21,20
-    LTEXT           "Static",IDC_StateData2,186,84,19,8
-    ICON            IDI_TRANS_14,IDC_StateIcon2,164,84,20,20
-END
-
-DLG_EnginePlayOptions DIALOG DISCARDABLE  0, 0, 208, 129
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Engine Options"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Ponder Next Move",IDC_EpPonder,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,4,4,75,10
-    CONTROL         "Enable and Show Thinking (recommended)",
-                    IDC_EpShowThinking,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    4,16,152,10
-    CONTROL         "Hide Thinking when Playing against Human",
-                    IDC_EpHideThinkingHuman,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,4,28,153,10
-    CONTROL         "Periodic Updates (for Analysis Mode)",
-                    IDC_EpPeriodicUpdates,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,4,40,131,10
-    GROUPBOX        "Engine-engine matches",IDC_STATIC,4,56,200,50
-    LTEXT           "Adjudicate draw after:",IDC_STATIC,10,72,70,8
-    EDITTEXT        IDC_EpDrawMoveCount,116,68,40,14,ES_AUTOHSCROLL
-    LTEXT           "moves",IDC_STATIC,158,72,22,8
-    LTEXT           "Win/loss adjudication threshold:",IDC_STATIC,10,90,102,
-                    8
-    EDITTEXT        IDC_EpAdjudicationThreshold,116,86,40,14,ES_AUTOHSCROLL
-    LTEXT           "centipawns",IDC_STATIC,158,90,37,8
-    DEFPUSHBUTTON   "OK",IDOK,98,112,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,154,112,50,14
-END
-
-DLG_OptionsUCI DIALOG DISCARDABLE  0, 0, 228, 124
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "UCI Options"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Polyglot Directory:",IDC_STATIC,2,8,58,8
-    EDITTEXT        IDC_PolyglotDir,62,4,140,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_BrowseForPolyglotDir,206,4,17,14
-    LTEXT           "Hash Size (MB):",IDC_STATIC,2,26,52,8
-    EDITTEXT        IDC_HashSize,62,22,40,14,ES_AUTOHSCROLL
-    LTEXT           "EGTB Path:",IDC_STATIC,2,44,39,8
-    EDITTEXT        IDC_PathToEGTB,62,40,140,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_BrowseForEGTB,206,40,17,14
-    LTEXT           "EGTB Size (MB):",IDC_STATIC,2,62,54,8
-    EDITTEXT        IDC_SizeOfEGTB,62,58,40,14,ES_AUTOHSCROLL
-    CONTROL         "Use Book:",IDC_UseBook,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,2,80,49,10
-    EDITTEXT        IDC_BookFile,62,76,140,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_BrowseForBook,206,76,17,14
-    DEFPUSHBUTTON   "OK",IDOK,118,106,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,174,106,50,14
-END
-
-DLG_Null DIALOG DISCARDABLE  0, 0, 186, 50
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Null"
-FONT 8, "MS Sans Serif"
-BEGIN
-END
-
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
@@ -769,36 +634,26 @@ END
 #ifdef APSTUDIO_INVOKED\r
 GUIDELINES DESIGNINFO DISCARDABLE \r
 BEGIN\r
-    DLG_GameList, DIALOG
-    BEGIN
-        RIGHTMARGIN, 258
-    END
-
-    DLG_Colorize, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 32
-    END
-
     DLG_GeneralOptions, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 213
+        RIGHTMARGIN, 264\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 176
+        BOTTOMMARGIN, 128\r
     END\r
 \r
     DLG_IcsOptions, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 295
+        RIGHTMARGIN, 311\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 248
+        BOTTOMMARGIN, 264\r
     END\r
 \r
     DLG_BoardOptions, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 187
+        RIGHTMARGIN, 255\r
         TOPMARGIN, 7\r
         BOTTOMMARGIN, 243\r
     END\r
@@ -806,74 +661,10 @@ BEGIN
     DLG_Fonts, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 259
+        RIGHTMARGIN, 273\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 219
+        BOTTOMMARGIN, 224\r
     END\r
-
-    DLG_NewGameFRC, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 169
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 40
-    END
-
-    DLG_GameListOptions, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 199
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 133
-    END
-
-    DLG_MoveHistory, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 218
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 123
-    END
-
-    DLG_EvalGraph, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 209
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 68
-    END
-
-    DLG_EngineOutput, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 259
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 160
-    END
-
-    DLG_EnginePlayOptions, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 201
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 122
-    END
-
-    DLG_OptionsUCI, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 221
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 117
-    END
-
-    DLG_Null, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 43
-    END
 END\r
 #endif    // APSTUDIO_INVOKED\r
 \r
@@ -885,18 +676,9 @@ END
 \r
 // Icon with lowest ID value placed first to ensure application icon\r
 // remains consistent on all systems.\r
-IDI_WHITE_14            ICON    DISCARDABLE     "bitmaps\\white_14.ico"
 ICON_BLACK              ICON    DISCARDABLE     "bitmaps\\icon_ob.ico"\r
 ICON_BOARD              ICON    DISCARDABLE     "bitmaps\\board.ico"\r
 ICON_WHITE              ICON    DISCARDABLE     "bitmaps\\icon_whi.ico"\r
-IDI_BLACK_14            ICON    DISCARDABLE     "bitmaps\\black_14.ico"
-IDI_PONDER_14           ICON    DISCARDABLE     "bitmaps\\ponder_14.ico"
-IDI_TRANS_14            ICON    DISCARDABLE     "bitmaps\\trans_14.ico"
-IDI_CLOCK_14            ICON    DISCARDABLE     "bitmaps\\clock_14.ico"
-IDI_UNKNOWN_14          ICON    DISCARDABLE     "bitmaps\\unknown_14.ico"
-IDI_BALOON_14           ICON    DISCARDABLE     "bitmaps\\baloon_14.ico"
-IDI_ANALYZE_14          ICON    DISCARDABLE     "bitmaps\\analyze_14.ico"
-IDI_ANALYZE2_14         ICON    DISCARDABLE     "bitmaps\\analyze2_14.ico"
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
@@ -907,20 +689,17 @@ WINBOARD MENU DISCARDABLE
 BEGIN\r
     POPUP "&File"\r
     BEGIN\r
-        MENUITEM "New &Game\tCtrl-N",           IDM_NewGame
-        MENUITEM "New FRC Game...",             IDM_NewGameFRC
+        MENUITEM "Reset &Game",                 IDM_NewGame\r
         MENUITEM SEPARATOR\r
-        MENUITEM "&Load Game...\tCtrl-O",       IDM_LoadGame
+        MENUITEM "&Load Game...",               IDM_LoadGame\r
         MENUITEM "Load &Next Game\tAlt+PgDn",   IDM_LoadNextGame\r
         MENUITEM "Load &Previous Game\tAlt+PgUp", IDM_LoadPrevGame\r
         MENUITEM "&Reload Same Game",           IDM_ReloadGame\r
-        MENUITEM "&Save Game...\tCtrl-S",       IDM_SaveGame
+        MENUITEM "&Save Game...",               IDM_SaveGame\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Copy Game To Clipboard\tAlt+C", IDM_CopyGame\r
         MENUITEM "Paste Game &From Clipboard\tAlt+V", IDM_PasteGame\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Copy Game List to Clipboard", IDM_CopyGameListToClipboard
-        MENUITEM SEPARATOR
         MENUITEM "L&oad Position...",           IDM_LoadPosition\r
         MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition\r
         MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", \r
@@ -947,11 +726,7 @@ BEGIN
         MENUITEM "&Edit Position",              IDM_EditPosition\r
         MENUITEM "Trai&ning",                   IDM_Training, GRAYED\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Show Engine Output",          IDM_ShowEngineOutput
-        MENUITEM "Show Evaluation Graph",       IDM_ShowEvalGraph
-        MENUITEM "Show Game &List",             IDM_ShowGameList
-        MENUITEM "Show Move History",           IDM_ShowMoveHistory
-        MENUITEM SEPARATOR
+        MENUITEM "Show Game &List...",          IDM_ShowGameList\r
         MENUITEM "Edit &Tags...",               IDM_EditTags\r
         MENUITEM "Edit &Comment...",            IDM_EditComment\r
         MENUITEM "&Pause\tPause",               IDM_Pause\r
@@ -970,10 +745,6 @@ BEGIN
         MENUITEM SEPARATOR\r
         MENUITEM "Stop &Observing\tF10",        IDM_StopObserving\r
         MENUITEM "Stop E&xamining\tF11",        IDM_StopExamining\r
-        MENUITEM SEPARATOR
-        MENUITEM "Adjudicate to White",         IDM_UserAdjudication_White
-        MENUITEM "Adjudicate to Black",         IDM_UserAdjudication_Black
-        MENUITEM "Adjudicate Draw",             IDM_UserAdjudication_Draw
     END\r
     POPUP "&Step"\r
     BEGIN\r
@@ -995,12 +766,9 @@ BEGIN
         MENUITEM SEPARATOR\r
         MENUITEM "&General...",                 IDM_GeneralOptions\r
         MENUITEM "&Board...",                   IDM_BoardOptions\r
-        MENUITEM "Engines...",                  IDM_EnginePlayOptions
-        MENUITEM "UCI...",                      IDM_OptionsUCI
         MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED\r
         MENUITEM "&Fonts...",                   IDM_Fonts\r
         MENUITEM "Soun&ds...",                  IDM_Sounds\r
-        MENUITEM "Game List...",                IDM_GameListOptions
         MENUITEM SEPARATOR\r
         MENUITEM "Comm&unications...",          IDM_CommPort\r
         MENUITEM "&Load Game...",               IDM_LoadOptions\r
@@ -1134,17 +902,12 @@ WINBOARD ACCELERATORS MOVEABLE PURE
 BEGIN\r
     "1",            IDM_DirectCommand1,     VIRTKEY, ALT, NOINVERT\r
     "2",            IDM_DirectCommand2,     VIRTKEY, ALT, NOINVERT\r
-    "B",            IDM_Book,               VIRTKEY, ALT, NOINVERT
     "C",            IDM_CopyGame,           VIRTKEY, ALT, NOINVERT\r
-    "C",            IDM_CopyPosition,       VIRTKEY, SHIFT, ALT, NOINVERT
-    "I",            IDM_TypeInMove,         VIRTKEY, ALT, NOINVERT
-    "N",            IDM_NewGame,            VIRTKEY, CONTROL, NOINVERT
-    "O",            IDM_LoadGame,           VIRTKEY, CONTROL, NOINVERT
-    "S",            IDM_SaveGame,           VIRTKEY, CONTROL, NOINVERT
+    "C",            IDM_CopyPosition,       VIRTKEY, SHIFT, ALT, \r
+                                                    NOINVERT\r
     "V",            IDM_PasteGame,          VIRTKEY, ALT, NOINVERT\r
-    "V",            IDM_PasteAny,           VIRTKEY, SHIFT, CONTROL,
-                                                    NOINVERT
-    "V",            IDM_PastePosition,      VIRTKEY, SHIFT, ALT, NOINVERT
+    "V",            IDM_PastePosition,      VIRTKEY, SHIFT, ALT, \r
+                                                    NOINVERT\r
     VK_DELETE,      IDM_RetractMove,        VIRTKEY, ALT, NOINVERT\r
     VK_DOWN,        IDM_ToEnd,              VIRTKEY, ALT, NOINVERT\r
     VK_END,         IDM_TruncateGame,       VIRTKEY, ALT, NOINVERT\r
@@ -1191,13 +954,6 @@ BEGIN
     VK_UP,          IDM_ToStart,            VIRTKEY, NOINVERT\r
 END\r
 \r
-NO_ICS ACCELERATORS DISCARDABLE
-BEGIN
-    "A",            IDM_AnalysisMode,       VIRTKEY, CONTROL, NOINVERT
-    "V",            IDM_PasteAny,           VIRTKEY, CONTROL, NOINVERT
-END
-
-\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Bitmap\r
@@ -1565,38 +1321,39 @@ END
 // WAVE\r
 //\r
 \r
-DING                    WAVE    DISCARDABLE     "sounds\\ding1.wav"
-CHING                   WAVE    DISCARDABLE     "sounds\\ching.wav"
-CLICK                   WAVE    DISCARDABLE     "sounds\\click.wav"
-CYMBAL                  WAVE    DISCARDABLE     "sounds\\cymbal.wav"
-DRIP                    WAVE    DISCARDABLE     "sounds\\drip.wav"
-GONG                    WAVE    DISCARDABLE     "sounds\\gong.wav"
-BEEPBEEP                WAVE    DISCARDABLE     "sounds\\honkhonk.wav"
-LASER                   WAVE    DISCARDABLE     "sounds\\laser.wav"
-PENALTY                 WAVE    DISCARDABLE     "sounds\\penalty.wav"
-PHONE                   WAVE    DISCARDABLE     "sounds\\phone.wav"
-POP                     WAVE    DISCARDABLE     "sounds\\pop.wav"
-POP2                    WAVE    DISCARDABLE     "sounds\\pop2.wav"
-SLAP                    WAVE    DISCARDABLE     "sounds\\slap.wav"
-SQUEAK                  WAVE    DISCARDABLE     "sounds\\squeak.wav"
-SWISH                   WAVE    DISCARDABLE     "sounds\\swish.wav"
-THUD                    WAVE    DISCARDABLE     "sounds\\thud.wav"
-WHIPCRACK               WAVE    DISCARDABLE     "sounds\\whipcrak.wav"
-MOVE                    WAVE    DISCARDABLE     "sounds\\move.wav"
-ALARM                   WAVE    DISCARDABLE     "sounds\\alarm.wav"
-CHALLENGE               WAVE    DISCARDABLE     "sounds\\challenge.wav"
-CHANNEL                 WAVE    DISCARDABLE     "sounds\\channel.wav"
-CHANNEL1                WAVE    DISCARDABLE     "sounds\\channel1.wav"
-DRAW                    WAVE    DISCARDABLE     "sounds\\draw.wav"
-KIBITZ                  WAVE    DISCARDABLE     "sounds\\kibitz.wav"
-LOSE                    WAVE    DISCARDABLE     "sounds\\lose.wav"
-REQUEST                 WAVE    DISCARDABLE     "sounds\\request.wav"
-SEEK                    WAVE    DISCARDABLE     "sounds\\seek.wav"
-SHOUT                   WAVE    DISCARDABLE     "sounds\\shout.wav"
-SSHOUT                  WAVE    DISCARDABLE     "sounds\\sshout.wav"
-TELL                    WAVE    DISCARDABLE     "sounds\\tell.wav"
-UNFINISHED              WAVE    DISCARDABLE     "sounds\\unfinished.wav"
-WIN                     WAVE    DISCARDABLE     "sounds\\win.wav"
+DING                    WAVE    DISCARDABLE     "..\\sounds\\ding1.wav"\r
+CHING                   WAVE    DISCARDABLE     "..\\sounds\\ching.wav"\r
+CLICK                   WAVE    DISCARDABLE     "..\\sounds\\click.wav"\r
+CYMBAL                  WAVE    DISCARDABLE     "..\\sounds\\cymbal.wav"\r
+DRIP                    WAVE    DISCARDABLE     "..\\sounds\\drip.wav"\r
+GONG                    WAVE    DISCARDABLE     "..\\sounds\\gong.wav"\r
+BEEPBEEP                WAVE    DISCARDABLE     "..\\sounds\\honkhonk.wav"\r
+LASER                   WAVE    DISCARDABLE     "..\\sounds\\laser.wav"\r
+PENALTY                 WAVE    DISCARDABLE     "..\\sounds\\penalty.wav"\r
+PHONE                   WAVE    DISCARDABLE     "..\\sounds\\phone.wav"\r
+POP                     WAVE    DISCARDABLE     "..\\sounds\\pop.wav"\r
+POP2                    WAVE    DISCARDABLE     "..\\sounds\\pop2.wav"\r
+SLAP                    WAVE    DISCARDABLE     "..\\sounds\\slap.wav"\r
+SQUEAK                  WAVE    DISCARDABLE     "..\\sounds\\squeak.wav"\r
+SWISH                   WAVE    DISCARDABLE     "..\\sounds\\swish.wav"\r
+THUD                    WAVE    DISCARDABLE     "..\\sounds\\thud.wav"\r
+WHIPCRACK               WAVE    DISCARDABLE     "..\\sounds\\whipcrak.wav"\r
+MOVE                    WAVE    DISCARDABLE     "..\\sounds\\move.wav"\r
+ALARM                  WAVE    DISCARDABLE     "..\\sounds\\alarm.wav"\r
+CHALLENGE              WAVE    DISCARDABLE     "..\\sounds\\challenge.wav"\r
+CHANNEL                        WAVE    DISCARDABLE     "..\\sounds\\channel.wav"\r
+CHANNEL1               WAVE    DISCARDABLE     "..\\sounds\\channel1.wav"\r
+DRAW                   WAVE    DISCARDABLE     "..\\sounds\\draw.wav"\r
+KIBITZ                 WAVE    DISCARDABLE     "..\\sounds\\kibitz.wav"\r
+LOSE                   WAVE    DISCARDABLE     "..\\sounds\\lose.wav"\r
+REQUEST                        WAVE    DISCARDABLE     "..\\sounds\\request.wav"\r
+SEEK                   WAVE    DISCARDABLE     "..\\sounds\\seek.wav"\r
+SHOUT                  WAVE    DISCARDABLE     "..\\sounds\\shout.wav"\r
+SSHOUT                 WAVE    DISCARDABLE     "..\\sounds\\sshout.wav"\r
+TELL                   WAVE    DISCARDABLE     "..\\sounds\\tell.wav"\r
+UNFINISHED             WAVE    DISCARDABLE     "..\\sounds\\unfinished.wav"\r
+WIN                    WAVE    DISCARDABLE     "..\\sounds\\win.wav"\r
+\r
 #endif    // English (U.S.) resources\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r