Merge commit 'v4.3.16'
[xboard.git] / winboard / winboard.rc
index 3b54cf7..0759e9f 100644 (file)
@@ -30,27 +30,28 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog\r
 //\r
 \r
-ABOUTBOX DIALOG DISCARDABLE  22, 17, 167, 67\r
+ABOUTBOX DIALOG DISCARDABLE  22, 17, 180, 108\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,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
+    DEFPUSHBUTTON   "OK",IDOK,126,89,50,14,WS_GROUP\r
+    ICON            "icon_white",IDC_STATIC,3,6,20,20\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,44,121,17\r
+                    OPT_TCtext1,6,45,121,17\r
     CONTROL         "",OPT_TCTime,"Static",SS_BLACKRECT,4,28,159,1\r
-    LTEXT           "WinBoard 0.0.0",ABOUTBOX_Version,25,5,142,8\r
+    LTEXT           "WinBoard 0.0.0",ABOUTBOX_Version,25,5,61,8\r
+    LTEXT           "Enhancements Copyright 2005\r\nAlessandro Scotti",\r
+                    IDC_STATIC,6,65,120,24\r
+    LTEXT           "Enhancements Copyright 2007\r\nH.G. Muller",\r
+                    IDC_STATIC,6,85,120,24\r
+    LTEXT           "(""WinBoard_F"")",IDC_STATIC,88,4,71,8\r
 END\r
 \r
-DLG_TimeControl DIALOG DISCARDABLE  6, 18, 147, 113\r
+DLG_TimeControl DIALOG DISCARDABLE  6, 18, 174, 134\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Time Control"\r
 FONT 8, "MS Sans Serif"\r
@@ -59,33 +60,37 @@ 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,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
+    EDITTEXT        OPT_TCMoves,14,20,26,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "moves in",OPT_TCtext1,44,22,30,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCTime,78,20,26,12,ES_AUTOHSCROLL\r
+    LTEXT           "minutes",OPT_TCtext2,108,22,26,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCTime2,14,56,26,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "minutes +",405,44,58,34,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCInc,78,56,26,12,ES_AUTOHSCROLL\r
+    LTEXT           "seconds per move",408,108,58,62,8,NOT WS_GROUP\r
+    LTEXT           "Time-Odds Factors:",IDC_STATIC,6,78,150,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCOdds1,47,92,26,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "Engine #1:",IDC_STATIC,6,94,41,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCOdds2,124,92,26,12,ES_AUTOHSCROLL\r
+    LTEXT           "Engine #2:",IDC_STATIC,83,94,41,8,NOT WS_GROUP\r
+    PUSHBUTTON      "OK",IDOK,64,116,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,120,116,50,14\r
 END\r
 \r
-DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 144, 55\r
+DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 136, 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,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
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,130,10\r
+    EDITTEXT        OPT_ASTimeDelay,16,16,28,14,ES_AUTOHSCROLL\r
+    LTEXT           "seconds per move",OPT_AStext1,46,20,60,8,NOT WS_GROUP\r
+    PUSHBUTTON      "OK",IDOK,26,36,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,82,36,50,14\r
 END\r
 \r
-DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 133, 119\r
+DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 178, 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
@@ -93,17 +98,19 @@ 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,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
+                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,18,75,10\r
+    CONTROL         "To file:",OPT_AVToFile,"Button",BS_AUTORADIOBUTTON,16,\r
+                    32,36,10\r
+    EDITTEXT        OPT_AVFilename,54,30,97,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",OPT_AVBrowse,156,30,18,14\r
+    GROUPBOX        "Save As: ",801,4,48,170,28,WS_GROUP\r
+    CONTROL         "PGN",OPT_PGN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,\r
+                    60,39,10\r
+    CONTROL         "Old",OPT_Old,"Button",BS_AUTORADIOBUTTON,54,60,114,10\r
+    CONTROL         "Save out of book info in PGN",OPT_OutOfBookInfo,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,82,109,10\r
+    PUSHBUTTON      "OK",IDOK,68,100,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,124,100,50,14\r
 END\r
 \r
 1536 DIALOG DISCARDABLE  36, 24, 264, 134\r
@@ -136,122 +143,127 @@ BEGIN
     PUSHBUTTON      "Net&work...",1037,208,113,50,14,WS_GROUP\r
 END\r
 \r
-DLG_CommPort DIALOG DISCARDABLE  25, 30, 159, 98\r
+DLG_CommPort DIALOG DISCARDABLE  25, 30, 220, 79\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\r
+    PUSHBUTTON      "Cancel",IDCANCEL,164,60,50,14\r
     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,4,21,40,10,NOT WS_GROUP\r
-    COMBOBOX        OPT_DataRate,49,19,55,100,CBS_DROPDOWN | WS_VSCROLL | \r
+    RTEXT           "Data &Rate:",-1,114,6,40,10,NOT WS_GROUP\r
+    COMBOBOX        OPT_DataRate,159,4,55,100,CBS_DROPDOWN | WS_VSCROLL | \r
                     WS_TABSTOP\r
-    RTEXT           "Data &Bits:",-1,4,36,40,10,NOT WS_GROUP\r
-    COMBOBOX        OPT_Bits,49,34,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | \r
+    RTEXT           "Data &Bits:",-1,4,25,40,10,NOT WS_GROUP\r
+    COMBOBOX        OPT_Bits,49,22,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | \r
                     WS_VSCROLL | WS_TABSTOP\r
-    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
+    RTEXT           "P&arity:",-1,114,24,40,10,NOT WS_GROUP\r
+    COMBOBOX        OPT_Parity,159,22,55,60,CBS_DROPDOWNLIST | \r
+                    CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+    RTEXT           "&Stop Bits:",-1,4,42,40,10,NOT WS_GROUP\r
+    COMBOBOX        OPT_StopBits,49,40,55,60,CBS_DROPDOWNLIST | \r
                     CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
-    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
+    RTEXT           "F&low:",-1,114,42,40,10,NOT WS_GROUP\r
+    COMBOBOX        OPT_Flow,159,40,55,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | \r
                     WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "&Help",OPT_SerialHelp,115,80,40,14,NOT WS_VISIBLE\r
+    PUSHBUTTON      "Help",OPT_SerialHelp,4,60,50,14,NOT WS_VISIBLE\r
 END\r
 \r
-DLG_EditComment DIALOG DISCARDABLE  6, 18, 306, 104\r
+DLG_EditComment DIALOG DISCARDABLE  6, 18, 302, 102\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,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
+    PUSHBUTTON      "OK",IDOK,194,84,50,14\r
+    PUSHBUTTON      "Cancel",OPT_CancelComment,250,84,50,14\r
     CONTROL         "",OPT_CommentText,"RICHEDIT",ES_MULTILINE | \r
                     ES_AUTOHSCROLL | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | \r
-                    WS_HSCROLL | WS_TABSTOP,4,4,298,78\r
+                    WS_HSCROLL | WS_TABSTOP,2,2,298,78\r
+    PUSHBUTTON      "&Clear",OPT_ClearComment,2,84,50,14\r
+    PUSHBUTTON      "&Edit",OPT_EditComment,58,84,50,14\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
+    LTEXT           "      YES",IDC_Yes,6,25,36,10\r
+    LTEXT           "       NO",IDC_No,141,25,36,10\r
+    LTEXT           "C&entaur",IDC_Centaur,12,6,25,10\r
 END\r
 \r
-ABOUTBOX2 DIALOG DISCARDABLE  22, 17, 281, 198\r
+ABOUTBOX2 DIALOG DISCARDABLE  22, 17, 281, 223\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,167,\r
+    LTEXT           "Copyright 1991 Digital Equipment Corporation",201,4,168,\r
                     151,8\r
     LTEXT           "Enhancements Copyright 1992-2003   Free Software Foundation",\r
-                    OPT_TCtext1,4,177,126,17\r
+                    OPT_TCtext1,4,179,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\r
+    LTEXT           "Enhancements Copyright 2005\r\nAlessandro Scotti",\r
+                    IDC_STATIC,4,199,183,20\r
+    LTEXT           "(unofficial version ""X"")",IDC_STATIC,68,154,71,8\r
 END\r
 \r
-DLG_GameList DIALOG DISCARDABLE  6, 18, 307, 159\r
+DLG_GameList DIALOG DISCARDABLE  6, 18, 259, 153\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,4,4,299,130,LBS_NOINTEGRALHEIGHT | \r
+    LISTBOX         OPT_GameListText,2,2,254,130,LBS_NOINTEGRALHEIGHT | \r
                     WS_VSCROLL | WS_HSCROLL | WS_TABSTOP\r
-    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
+    PUSHBUTTON      "&Load",OPT_GameListLoad,2,135,32,15\r
+    PUSHBUTTON      "&<",OPT_GameListPrev,38,135,22,15\r
+    PUSHBUTTON      "&>",OPT_GameListNext,64,135,24,15\r
+    PUSHBUTTON      "&Close",OPT_GameListClose,92,135,32,15\r
+    PUSHBUTTON      "Filter",IDC_GameListDoFilter,144,136,30,14\r
+    EDITTEXT        IDC_GameListFilter,178,136,78,14,ES_AUTOHSCROLL\r
 END\r
 \r
-DLG_EditTags DIALOG DISCARDABLE  6, 18, 160, 141\r
+DLG_EditTags DIALOG DISCARDABLE  6, 18, 167, 140\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,12,123,40,14\r
-    PUSHBUTTON      "Cancel",OPT_TagsCancel,60,123,40,14\r
-    PUSHBUTTON      "&Edit",OPT_EditTags,108,123,40,14\r
+    PUSHBUTTON      "OK",IDOK,58,122,50,14\r
+    PUSHBUTTON      "Cancel",OPT_TagsCancel,114,122,50,14\r
     CONTROL         "",OPT_TagsText,"RICHEDIT",ES_MULTILINE | ES_AUTOVSCROLL | \r
                     ES_AUTOHSCROLL | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | \r
-                    WS_HSCROLL | WS_TABSTOP,4,4,152,115\r
+                    WS_HSCROLL | WS_TABSTOP,2,2,162,115\r
+    PUSHBUTTON      "&Edit",OPT_EditTags,2,122,50,14\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_AUTOHSCROLL | \r
-                    ES_AUTOVSCROLL | ES_MULTILINE | \r
-                    ES_NOHIDESEL | ES_NUMBER | WS_BORDER | \r
-                    WS_TABSTOP,0,120,335,13,WS_EX_TRANSPARENT\r
+    CONTROL         "",OPT_ConsoleInput,"RICHEDIT",ES_MULTILINE | \r
+                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | \r
+                    ES_NUMBER | WS_BORDER | WS_TABSTOP,0,120,335,13,\r
+                    WS_EX_TRANSPARENT\r
 END\r
 \r
 DLG_Analysis DIALOG DISCARDABLE  0, 0, 294, 62\r
@@ -265,47 +277,47 @@ BEGIN
                     WS_HSCROLL | WS_TABSTOP,4,4,286,54\r
 END\r
 \r
-DLG_Error DIALOG DISCARDABLE  0, 0, 183, 33\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION\r
+DLG_Error DIALOG DISCARDABLE  0, 0, 220, 66\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Error"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    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
+    ICON            32515,IDC_STATIC,4,4,21,20\r
+    LTEXT           "Sorry Charlie",OPT_ErrorText,28,4,188,36\r
+    DEFPUSHBUTTON   "OK",IDOK,84,48,50,14\r
 END\r
 \r
-DLG_Colorize DIALOGEX 0, 0, 183, 52\r
+DLG_Colorize DIALOGEX 0, 0, 174, 61\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "ICS Interaction Colors"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "&Choose Color...",OPT_ChooseColor,15,29,51,14,WS_GROUP\r
+    DEFPUSHBUTTON   "OK",IDOK,64,42,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,120,42,50,14\r
+    PUSHBUTTON      "&Color...",OPT_ChooseColor,119,4,51,14,WS_GROUP\r
     CONTROL         "&Bold",OPT_Bold,"Button",BS_AUTOCHECKBOX | WS_GROUP | \r
-                    WS_TABSTOP,93,4,30,10\r
-    CONTROL         "&Italic",OPT_Italic,"Button",BS_AUTOCHECKBOX,93,14,30,\r
+                    WS_TABSTOP,4,24,30,10\r
+    CONTROL         "&Italic",OPT_Italic,"Button",BS_AUTOCHECKBOX,40,24,30,\r
                     10\r
-    CONTROL         "&Underline",OPT_Underline,"Button",BS_AUTOCHECKBOX,93,\r
+    CONTROL         "&Underline",OPT_Underline,"Button",BS_AUTOCHECKBOX,76,\r
                     24,45,10\r
-    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         "&Strikeout",OPT_Strikeout,"Button",BS_AUTOCHECKBOX,128,\r
+                    24,42,10\r
     CONTROL         "",OPT_Sample,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_GROUP,4,9,75,15,WS_EX_CLIENTEDGE\r
+                    ES_READONLY | WS_GROUP,4,4,106,15,WS_EX_CLIENTEDGE\r
 END\r
 \r
-DLG_Question DIALOG DISCARDABLE  0, 0, 187, 60\r
+DLG_Question DIALOG DISCARDABLE  0, 0, 187, 77\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,44,179,12,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "Enter",IDOK,133,4,50,14,WS_GROUP\r
-    PUSHBUTTON      "Cancel",IDCANCEL,133,24,50,14\r
+    EDITTEXT        OPT_QuestionInput,4,36,179,14,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,78,58,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,134,58,50,14\r
     LTEXT           "Enter a chess engine command or just type something stupid that will completely screw things up.",\r
-                    OPT_QuestionText,27,4,101,33\r
-    ICON            32514,IDC_STATIC,4,13,20,20\r
+                    OPT_QuestionText,30,2,153,28\r
+    ICON            32514,IDC_STATIC,4,4,20,20\r
 END\r
 \r
 DLG_Startup DIALOG DISCARDABLE  0, 0, 276, 127\r
@@ -336,292 +348,536 @@ 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, 186, 46\r
+DLG_TypeInMove DIALOG DISCARDABLE  0, 0, 206, 23\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,129,7,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14\r
-    EDITTEXT        OPT_Move,7,16,109,13,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,96,4,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,152,4,50,14\r
+    EDITTEXT        OPT_Move,4,4,86,13,ES_AUTOHSCROLL\r
 END\r
 \r
-DLG_Sound DIALOG DISCARDABLE  0, 0, 257, 95\r
+DLG_TypeInName DIALOG DISCARDABLE  0, 0, 206, 23\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Type in your name"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    DEFPUSHBUTTON   "OK",IDOK,96,4,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,152,4,50,14\r
+    EDITTEXT        OPT_Name,4,4,86,13,ES_AUTOHSCROLL\r
+END\r
+\r
+DLG_Sound DIALOG DISCARDABLE  0, 0, 242, 105\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,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
+    DEFPUSHBUTTON   "OK",IDOK,132,86,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,188,86,50,14\r
+    LTEXT           "Event:",IDC_STATIC,4,7,26,9\r
+    COMBOBOX        CBO_Sounds,30,4,208,110,CBS_DROPDOWNLIST | WS_VSCROLL | \r
                     WS_TABSTOP\r
     CONTROL         "No sound",OPT_NoSound,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_GROUP | WS_TABSTOP,11,25,47,10\r
+                    WS_GROUP | WS_TABSTOP,12,22,47,10\r
     CONTROL         "Default beep",OPT_DefaultBeep,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,11,42,57,10\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,36,57,10\r
     CONTROL         "Built-in sound:",OPT_BuiltInSound,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,11,59,60,10\r
-    COMBOBOX        OPT_BuiltInSoundName,78,58,103,109,CBS_DROPDOWNLIST | \r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,51,60,10\r
+    COMBOBOX        OPT_BuiltInSoundName,76,48,103,109,CBS_DROPDOWNLIST | \r
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "Play",OPT_PlaySound,200,57,47,14\r
+    PUSHBUTTON      "Play",OPT_PlaySound,188,47,50,14\r
     CONTROL         "WAV file:",OPT_WavFile,"Button",BS_AUTORADIOBUTTON | \r
-                    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
+                    WS_TABSTOP,12,66,45,10\r
+    EDITTEXT        OPT_WavFileName,76,65,103,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "Browse...",OPT_BrowseSound,188,64,50,14\r
+    PUSHBUTTON      "Defaults",OPT_DefaultSounds,6,86,50,14\r
 END\r
 \r
-DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 271, 135\r
+DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 220, 183\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,207,7,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,208,25,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,110,164,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,166,164,50,14\r
     CONTROL         "Always on &Top",OPT_AlwaysOnTop,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,6,79,10\r
-    CONTROL         "Always &Queen",OPT_AlwaysQueen,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,16,20,79,10\r
-    CONTROL         "Animate &Dragging",OPT_AnimateDragging,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,34,79,10\r
-    CONTROL         "&Animate Moving",OPT_AnimateMoving,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,48,79,10\r
-    CONTROL         "Auto &Flag",OPT_AutoFlag,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,16,62,79,10\r
-    CONTROL         "Auto Flip &View",OPT_AutoFlipView,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,76,79,10\r
-    CONTROL         "Auto &Raise Board",OPT_AutoRaiseBoard,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,90,71,10\r
-    CONTROL         "&Blindfold",OPT_Blindfold,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,16,104,79,10\r
-    CONTROL         "&Highlight Dragging",OPT_HighlightDragging,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,118,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,6,79,10\r
     CONTROL         "Highlight Last &Move",OPT_HighlightLastMove,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,109,6,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,6,79,10\r
+    CONTROL         "Always &Queen",OPT_AlwaysQueen,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,4,20,79,10\r
     CONTROL         "Periodic &Updates",OPT_PeriodicUpdates,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,109,20,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,20,79,10\r
+    CONTROL         "Animate &Dragging",OPT_AnimateDragging,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,34,79,10\r
     CONTROL         "Ponder &Next Move",OPT_PonderNextMove,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,109,34,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,34,79,10\r
+    CONTROL         "&Animate Moving",OPT_AnimateMoving,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,48,79,10\r
     CONTROL         "&Popup Exit Message",OPT_PopupExitMessage,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,109,48,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,48,79,10\r
+    CONTROL         "Auto &Flag",OPT_AutoFlag,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,4,62,79,10\r
     CONTROL         "Popup Move &Errors",OPT_PopupMoveErrors,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,109,62,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,62,79,10\r
+    CONTROL         "Auto Flip &View",OPT_AutoFlipView,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,76,79,10\r
     CONTROL         "Show Butt&on Bar",OPT_ShowButtonBar,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,109,76,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,76,79,10\r
+    CONTROL         "Auto &Raise Board",OPT_AutoRaiseBoard,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,90,71,10\r
     CONTROL         "Show &Coordinates",OPT_ShowCoordinates,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,109,90,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,90,79,10\r
+    CONTROL         "&Blindfold",OPT_Blindfold,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,4,104,79,10\r
     CONTROL         "&Show Thinking",OPT_ShowThinking,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,109,104,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,104,79,10\r
+    CONTROL         "&Highlight Dragging",OPT_HighlightDragging,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,118,79,10\r
     CONTROL         "Test &Legality",OPT_TestLegality,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,109,118,79,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,118,79,10\r
+    CONTROL         "Extended PGN Info",OPT_SaveExtPGN,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,132,79,10\r
+    CONTROL         "Hide Thinking from Human",OPT_HideThinkFromHuman,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,116,132,100,10\r
+    CONTROL         "Extra Info in Move History",OPT_ExtraInfoInMoveHistory,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,146,97,10\r
+    CONTROL         "Highlight Move with Arrow",OPT_HighlightMoveArrow,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,145,100,9\r
 END\r
 \r
-DLG_IcsOptions DIALOGEX 0, 0, 318, 271\r
+DLG_IcsOptions DIALOGEX 0, 0, 302, 255\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "ICS Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,88,250,60,15\r
-    PUSHBUTTON      "Cancel",IDCANCEL,168,250,60,15\r
+    DEFPUSHBUTTON   "OK",IDOK,194,237,50,15\r
+    PUSHBUTTON      "Cancel",IDCANCEL,248,237,50,15\r
     CONTROL         "&Auto Comment",OPT_AutoComment,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,20,12,63,8\r
+                    WS_TABSTOP,10,12,63,8\r
     CONTROL         "Auto &Observe",OPT_AutoObserve,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,20,27,63,8\r
+                    WS_TABSTOP,10,25,63,8\r
     CONTROL         "&Get Move List",OPT_GetMoveList,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,20,42,63,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,38,63,8\r
     CONTROL         "&Local Line Editing",OPT_LocalLineEditing,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,20,57,84,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,51,84,8\r
     CONTROL         "&Quiet Play",OPT_QuietPlay,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,20,72,63,8\r
+                    WS_TABSTOP,10,64,63,8\r
     CONTROL         "&Premove",OPT_Premove,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,171,12,46,10\r
+                    WS_TABSTOP,160,12,46,10\r
     CONTROL         "&White first move",OPT_PremoveWhite,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,171,27,67,10\r
-    EDITTEXT        OPT_PremoveWhiteText,252,23,25,14,ES_AUTOHSCROLL\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,160,26,67,10\r
+    EDITTEXT        OPT_PremoveWhiteText,236,22,25,14,ES_AUTOHSCROLL\r
     CONTROL         "&Black first move",OPT_PremoveBlack,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,171,42,66,10\r
-    EDITTEXT        OPT_PremoveBlackText,252,39,25,14,ES_AUTOHSCROLL\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,160,40,66,10\r
+    EDITTEXT        OPT_PremoveBlackText,236,38,25,14,ES_AUTOHSCROLL\r
     CONTROL         "&Sound alarm at",OPT_IcsAlarm,"Button",BS_AUTOCHECKBOX | \r
-                    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
+                    WS_TABSTOP,160,72,63,10\r
+    EDITTEXT        OPT_IcsAlarmTime,236,68,26,14,ES_AUTOHSCROLL\r
+    LTEXT           "seconds",IDC_STATIC,264,72,28,8\r
+    PUSHBUTTON      "Choose...",OPT_ChooseShoutColor,97,101,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseSShoutColor,97,121,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseChannel1Color,97,141,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseChannelColor,97,161,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseKibitzColor,97,181,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseTellColor,246,101,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseChallengeColor,246,121,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseRequestColor,246,141,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseSeekColor,246,161,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseNormalColor,246,181,45,15\r
+    PUSHBUTTON      "Background...",OPT_ChooseBackgroundColor,10,208,50,16\r
+    PUSHBUTTON      "&Defaults...",OPT_DefaultColors,68,208,50,16\r
     CONTROL         "Do &not colorize messages",OPT_DontColorize,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,110,225,97,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,192,212,97,10\r
     CONTROL         "",OPT_SampleShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,17,101,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,10,101,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleSShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,17,121,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,10,121,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleChannel1,"RICHEDIT",ES_CENTER | \r
-                    ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,17,\r
+                    ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,10,\r
                     141,75,15,WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleChannel,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,17,161,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,10,161,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleKibitz,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_GROUP,17,181,75,15,WS_EX_CLIENTEDGE\r
+                    ES_READONLY | WS_GROUP,10,181,75,15,WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleTell,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,165,101,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,101,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleChallenge,"RICHEDIT",ES_CENTER | \r
-                    ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,165,\r
+                    ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,159,\r
                     121,75,15,WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleRequest,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,165,141,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,141,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleSeek,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,165,161,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,161,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleNormal,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,165,181,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,181,75,15,\r
                     WS_EX_CLIENTEDGE\r
-    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
+    GROUPBOX        "Interaction Colors",IDC_STATIC,4,90,294,140\r
+    GROUPBOX        "Premove",IDC_STATIC,154,0,144,56\r
+    GROUPBOX        "General",IDC_STATIC,4,0,146,88\r
+    GROUPBOX        "Alarm",IDC_STATIC,154,58,144,30\r
 END\r
 \r
-DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 262, 250\r
+DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 194, 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,205,10,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,205,35,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,84,232,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14\r
     CONTROL         "&Tiny",OPT_SizeTiny,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_GROUP | WS_TABSTOP,15,15,50,10\r
-    CONTROL         "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,15,25,\r
+                    WS_GROUP | WS_TABSTOP,9,14,50,10\r
+    CONTROL         "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,9,24,\r
                     50,10\r
-    CONTROL         "&Dinky",OPT_SizeDinky,"Button",BS_AUTORADIOBUTTON,15,35,\r
+    CONTROL         "&Dinky",OPT_SizeDinky,"Button",BS_AUTORADIOBUTTON,9,34,\r
                     50,10\r
-    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
+    CONTROL         "&Petite",OPT_SizePetite,"Button",BS_AUTORADIOBUTTON,9,\r
+                    44,50,10\r
+    CONTROL         "Sl&im",OPT_SizeSlim,"Button",BS_AUTORADIOBUTTON,9,54,50,\r
+                    10\r
+    CONTROL         "&Small",OPT_SizeSmall,"Button",BS_AUTORADIOBUTTON,9,64,\r
                     50,10\r
     CONTROL         "Medi&ocre",OPT_SizeMediocre,"Button",BS_AUTORADIOBUTTON,\r
-                    76,15,50,10\r
+                    70,14,50,10\r
     CONTROL         "&Middling",OPT_SizeMiddling,"Button",BS_AUTORADIOBUTTON,\r
-                    76,25,50,10\r
+                    70,24,50,10\r
     CONTROL         "&Average",OPT_SizeAverage,"Button",BS_AUTORADIOBUTTON,\r
-                    76,35,50,10\r
+                    70,34,50,10\r
     CONTROL         "Mode&rate",OPT_SizeModerate,"Button",BS_AUTORADIOBUTTON,\r
-                    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
+                    70,44,50,10\r
+    CONTROL         "Medi&um",OPT_SizeMedium,"Button",BS_AUTORADIOBUTTON,70,\r
+                    54,50,10\r
+    CONTROL         "Bul&ky",OPT_SizeBulky,"Button",BS_AUTORADIOBUTTON,70,64,\r
                     50,10\r
-    CONTROL         "&Large",OPT_SizeLarge,"Button",BS_AUTORADIOBUTTON,140,\r
-                    15,50,10\r
-    CONTROL         "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,140,25,50,\r
+    CONTROL         "&Large",OPT_SizeLarge,"Button",BS_AUTORADIOBUTTON,134,\r
+                    14,50,10\r
+    CONTROL         "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,134,24,50,\r
                     10\r
-    CONTROL         "&Huge",OPT_SizeHuge,"Button",BS_AUTORADIOBUTTON,140,35,\r
+    CONTROL         "&Huge",OPT_SizeHuge,"Button",BS_AUTORADIOBUTTON,134,34,\r
                     50,10\r
-    CONTROL         "&Giant",OPT_SizeGiant,"Button",BS_AUTORADIOBUTTON,140,\r
-                    45,50,10\r
+    CONTROL         "&Giant",OPT_SizeGiant,"Button",BS_AUTORADIOBUTTON,134,\r
+                    44,50,10\r
     CONTROL         "&Colossal",OPT_SizeColossal,"Button",BS_AUTORADIOBUTTON,\r
-                    140,55,50,10\r
+                    134,54,50,10\r
     CONTROL         "Tita&nic",OPT_SizeTitanic,"Button",BS_AUTORADIOBUTTON,\r
-                    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
+                    134,64,50,10\r
+    PUSHBUTTON      "...",OPT_ChooseLightSquareColor,110,94,20,15\r
+    PUSHBUTTON      "...",OPT_ChooseDarkSquareColor,110,112,20,15\r
+    PUSHBUTTON      "...",OPT_ChooseWhitePieceColor,110,130,20,15\r
+    PUSHBUTTON      "...",OPT_ChooseBlackPieceColor,110,148,20,15\r
+    PUSHBUTTON      "...",OPT_ChooseHighlightSquareColor,110,166,20,15\r
+    PUSHBUTTON      "...",OPT_ChoosePremoveHighlightColor,110,184,20,15\r
+    CONTROL         "Monochrome",OPT_Monochrome,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,210,64,10\r
+    CONTROL         "All White",OPT_AllWhite,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,140,180,53,10\r
+    CONTROL         "Flip Black",OPT_UpsideDown,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,140,192,53,10\r
+    PUSHBUTTON      "Defaults",OPT_DefaultBoardColors,80,206,50,15\r
+    EDITTEXT        OPT_DarkSquareColor,80,112,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_LightSquareColor,104,100,25,15,ES_READONLY | \r
+    EDITTEXT        OPT_LightSquareColor,80,94,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_WhitePieceColor,104,140,25,15,ES_READONLY | \r
+    EDITTEXT        OPT_WhitePieceColor,80,130,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_BlackPieceColor,104,160,25,15,ES_READONLY | \r
+    EDITTEXT        OPT_BlackPieceColor,80,148,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_HighlightSquareColor,104,180,25,15,ES_READONLY | \r
+    EDITTEXT        OPT_HighlightSquareColor,80,166,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    GROUPBOX        "Colors",IDC_STATIC,10,90,185,155\r
-    EDITTEXT        OPT_PremoveHighlightColor,104,200,25,15,ES_READONLY | \r
+    GROUPBOX        "Colors",IDC_STATIC,4,84,185,142\r
+    EDITTEXT        OPT_PremoveHighlightColor,80,184,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    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
+    LTEXT           "Light Squares",IDC_STATIC,10,98,60,10\r
+    LTEXT           "Dark Squares",IDC_STATIC,10,116,60,10\r
+    LTEXT           "White Pieces",IDC_STATIC,10,134,60,10\r
+    LTEXT           "Black Pieces",IDC_STATIC,10,152,60,10\r
+    LTEXT           "Square Highlights",IDC_STATIC,10,170,60,10\r
+    LTEXT           "Premove Highlights",IDC_STATIC,10,188,70,10\r
+    GROUPBOX        "Size",IDC_STATIC,4,4,185,75\r
+    EDITTEXT        OPT_SampleLightSquare,144,96,39,36,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    EDITTEXT        OPT_SampleDarkSquare,205,165,39,36,ES_READONLY | \r
+    EDITTEXT        OPT_SampleDarkSquare,144,138,39,36,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
 END\r
 \r
-DLG_Fonts DIALOG DISCARDABLE  0, 0, 280, 231\r
+DLG_NewVariant DIALOG DISCARDABLE  0, 0, 194, 250\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Variants"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    DEFPUSHBUTTON   "OK",IDOK,84,232,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14\r
+    CONTROL         "&normal",OPT_VariantNormal,"Button",BS_AUTORADIOBUTTON | \r
+                    WS_GROUP | WS_TABSTOP,9,14,50,10\r
+    CONTROL         "&gothic",OPT_VariantGothic,"Button",BS_AUTORADIOBUTTON,9,24,\r
+                    50,10\r
+    CONTROL         "cra&zyhouse",OPT_VariantCrazyhouse,"Button",BS_AUTORADIOBUTTON,9,34,\r
+                    50,10\r
+    CONTROL         "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,9,\r
+                    44,50,10\r
+    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,9,54,50,\r
+                    10\r
+    CONTROL         "cou&rier",OPT_VariantCourier,"Button",BS_AUTORADIOBUTTON,9,64,\r
+                    50,10\r
+    CONTROL         "&Berolina",OPT_VariantBerolina,"Button",BS_AUTORADIOBUTTON,9,74,\r
+                    50,10\r
+    CONTROL         "&Janus",OPT_VariantJanus,"Button",BS_AUTORADIOBUTTON,9,84,\r
+                    50,10\r
+    CONTROL         "&knightmate",OPT_VariantKnightmate,"Button",BS_AUTORADIOBUTTON,\r
+                    70,14,50,10\r
+    CONTROL         "&atomic",OPT_VariantAtomic,"Button",BS_AUTORADIOBUTTON,\r
+                    70,24,50,10\r
+    CONTROL         "&losers",OPT_VariantLosers,"Button",BS_AUTORADIOBUTTON,\r
+                    70,34,50,10\r
+    CONTROL         "s&uicide",OPT_VariantSuicide,"Button",BS_AUTORADIOBUTTON,\r
+                    70,44,50,10\r
+    CONTROL         "&capablanca",OPT_VariantCapablanca,"Button",BS_AUTORADIOBUTTON,70,\r
+                    54,50,10\r
+    CONTROL         "&twokings",OPT_VariantTwoKings,"Button",BS_AUTORADIOBUTTON,70,64,\r
+                    50,10\r
+    CONTROL         "&CRC",OPT_VariantCRC,"Button",BS_AUTORADIOBUTTON,70,74,\r
+                    50,10\r
+    CONTROL         "&wildcastle",OPT_VariantWildcastle,"Button",BS_AUTORADIOBUTTON,70,84,\r
+                    50,10\r
+    CONTROL         "&fairy",OPT_VariantFairy,"Button",BS_AUTORADIOBUTTON,134,\r
+                    14,50,10\r
+    CONTROL         "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,134,24,50,\r
+                    10\r
+    CONTROL         "&Shatranj",OPT_VariantShatranj,"Button",BS_AUTORADIOBUTTON,134,\r
+                    34,50,10\r
+    CONTROL         "&FRC",OPT_VariantFRC,"Button",BS_AUTORADIOBUTTON,134,\r
+                    44,50,10\r
+    CONTROL         "c&ylinder",OPT_VariantCylinder,"Button",BS_AUTORADIOBUTTON,134,\r
+                    54,50,10\r
+    CONTROL         "&Falcon",OPT_VariantFalcon,"Button",BS_AUTORADIOBUTTON,134,\r
+                    64,50,10\r
+    CONTROL         "su&per",OPT_VariantSuper,"Button",BS_AUTORADIOBUTTON,134,\r
+                    74,50,10\r
+    CONTROL         "&nocastle",OPT_VariantNocastle,"Button",BS_AUTORADIOBUTTON,134,\r
+                    84,50,10\r
+    GROUPBOX        "Variant",IDC_STATIC,4,4,185,95\r
+    LTEXT           "Board size:",IDC_STATIC,10,115,40,8\r
+    EDITTEXT        IDC_Ranks,60,111,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "ranks",IDC_STATIC,77,115,22,8\r
+    EDITTEXT        IDC_Files,116,111,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "files",IDC_STATIC,133,115,37,8\r
+    LTEXT           "Holdings with room for:",IDC_STATIC,10,133,90,8\r
+    EDITTEXT        IDC_Holdings,93,129,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "pieces",IDC_STATIC,110,133,22,8\r
+    LTEXT           "('-1' means defaults for selected variant)",IDC_STATIC,10,151,150,8\r
+END\r
+\r
+DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 226\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,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
+    DEFPUSHBUTTON   "OK",IDOK,156,208,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,212,208,50,14\r
+    PUSHBUTTON      "Choose...",OPT_ChooseClockFont,212,15,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseMessageFont,212,39,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseCoordFont,212,63,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseTagFont,212,101,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseCommentsFont,212,125,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseConsoleFont,212,149,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseMoveHistoryFont,212,174,45,15\r
+    PUSHBUTTON      "&Defaults",OPT_DefaultFonts,3,208,50,15\r
     CONTROL         "",OPT_SampleCoordFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,70,72,140,20\r
+                    WS_DISABLED | WS_BORDER,67,59,140,20\r
     CONTROL         "",OPT_SampleTagFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,70,115,140,20\r
+                    WS_DISABLED | WS_BORDER,67,97,140,20\r
     CONTROL         "",OPT_SampleCommentsFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,70,145,140,20\r
+                    WS_DISABLED | WS_BORDER,67,121,140,20\r
     CONTROL         "",OPT_SampleConsoleFont,"RICHEDIT",ES_READONLY | \r
-                    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_DISABLED | WS_BORDER,67,145,140,20\r
+    LTEXT           "Clocks",OPT_ClockFont,13,16,45,10,NOT WS_GROUP\r
+    LTEXT           "Messages",OPT_MessageFont,13,40,45,10,NOT WS_GROUP\r
+    LTEXT           "Coordinates",OPT_CoordFont,13,64,45,10,NOT WS_GROUP\r
+    LTEXT           "Tags",OPT_EditTagsFont,13,102,45,10,NOT WS_GROUP\r
+    LTEXT           "Comments",OPT_CommentsFont,13,126,45,10,NOT WS_GROUP\r
+    LTEXT           "ICS Interaction",OPT_MessageFont5,13,150,50,10,NOT \r
                     WS_GROUP\r
     CONTROL         "",OPT_SampleClockFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,70,12,140,20\r
+                    WS_DISABLED | WS_BORDER,67,11,140,20\r
     CONTROL         "",OPT_SampleMessageFont,"RICHEDIT",ES_READONLY | \r
-                    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
+                    WS_DISABLED | WS_BORDER,67,35,140,20\r
+    GROUPBOX        "Current Board Size",IDC_STATIC,3,1,259,83\r
+    GROUPBOX        "All Board Sizes",IDC_STATIC,3,87,259,109\r
+    CONTROL         "",OPT_SampleMoveHistoryFont,"RICHEDIT",ES_READONLY | \r
+                    WS_DISABLED | WS_BORDER,67,170,140,20\r
+    LTEXT           "Move History",OPT_MessageFont6,13,175,50,10,NOT \r
+                    WS_GROUP\r
+END\r
+\r
+DLG_NewGameFRC DIALOG DISCARDABLE  0, 0, 176, 47\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "New Shuffle Game"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    LTEXT           "&Start Position Number:",IDC_NFG_Label,4,7,71,8\r
+    EDITTEXT        IDC_NFG_Edit,76,4,42,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "Random",IDC_NFG_Random,122,4,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,64,28,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,122,28,50,14\r
+END\r
+\r
+DLG_GameListOptions DIALOG DISCARDABLE  0, 0, 206, 140\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Game List Options"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    LTEXT           "PGN &Tags:",IDC_GLT,2,2,36,8\r
+    LISTBOX         IDC_GameListTags,2,12,158,102,LBS_USETABSTOPS | \r
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    PUSHBUTTON      "&Up",IDC_GLT_Up,164,12,38,14\r
+    PUSHBUTTON      "&Down",IDC_GLT_Down,164,30,38,14\r
+    PUSHBUTTON      "Default",IDC_GLT_Restore,164,82,38,14\r
+    PUSHBUTTON      "Factory",IDC_GLT_Default,164,100,38,14\r
+    DEFPUSHBUTTON   "OK",IDOK,96,122,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,152,122,50,14\r
+    LTEXT           "Restore to:",IDC_GLT_RestoreTo,164,70,36,8\r
+END\r
+\r
+DLG_MoveHistory DIALOGEX 0, 0, 225, 130\r
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+EXSTYLE WS_EX_TOOLWINDOW\r
+CAPTION "Move History"\r
+FONT 8, "MS Sans Serif", 0, 0, 0x1\r
+BEGIN\r
+    CONTROL         "",IDC_MoveHistory,"RICHEDIT",ES_MULTILINE | ES_READONLY | \r
+                    WS_BORDER | WS_VSCROLL | WS_TABSTOP,2,2,222,128\r
+END\r
+\r
+DLG_EvalGraph DIALOGEX 0, 0, 216, 75\r
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+EXSTYLE WS_EX_TOOLWINDOW\r
+CAPTION "Evaluation Diagram"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+END\r
+\r
+DLG_EngineOutput DIALOGEX 0, 0, 266, 167\r
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+EXSTYLE WS_EX_TOOLWINDOW\r
+CAPTION "Engine output"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    LTEXT           "Engine #1",IDC_EngineLabel1,14,2,84,8\r
+    RTEXT           "NPS",IDC_Engine1_NPS,206,2,57,8\r
+    CONTROL         "",IDC_EngineMemo1,"RICHEDIT",ES_MULTILINE | \r
+                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | \r
+                    WS_HSCROLL | WS_TABSTOP,0,10,262,72\r
+    LTEXT           "Engine #2",IDC_EngineLabel2,15,84,103,8\r
+    RTEXT           "NPS",IDC_Engine2_NPS,210,84,55,8\r
+    CONTROL         "",IDC_EngineMemo2,"RICHEDIT",ES_MULTILINE | \r
+                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | \r
+                    WS_HSCROLL | WS_TABSTOP,2,92,262,74\r
+    ICON            IDI_UNKNOWN_14,IDC_Color1,2,4,20,20,SS_REALSIZEIMAGE\r
+    ICON            IDI_UNKNOWN_14,IDC_Color2,4,84,20,20\r
+    LTEXT           "Static",IDC_StateData1,120,2,83,8\r
+    ICON            IDI_TRANS_14,IDC_StateIcon1,98,0,21,20\r
+    LTEXT           "Static",IDC_StateData2,186,84,19,8\r
+    ICON            IDI_TRANS_14,IDC_StateIcon2,164,84,20,20\r
+END\r
+\r
+DLG_EnginePlayOptions DIALOG DISCARDABLE  0, 0, 208, 202\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Engine Options"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    CONTROL         "Ponder Next Move",IDC_EpPonder,"Button",BS_AUTOCHECKBOX |\r
+                    WS_TABSTOP,4,4,75,10\r
+    CONTROL         "Enable and Show Thinking (recommended)",\r
+                    IDC_EpShowThinking,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,\r
+                    4,16,152,10\r
+    CONTROL         "Hide Thinking when Playing against Human",\r
+                    IDC_EpHideThinkingHuman,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,4,28,153,10\r
+    CONTROL         "Periodic Updates (for Analysis Mode)",\r
+                    IDC_EpPeriodicUpdates,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,4,40,131,10\r
+    GROUPBOX        "Engine-engine matches",IDC_STATIC,4,56,200,98\r
+    LTEXT           "Adjudicate draw after:",IDC_STATIC,10,72,70,8\r
+    EDITTEXT        IDC_EpDrawMoveCount,116,68,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "moves",IDC_STATIC,158,72,22,8\r
+    LTEXT           "Win/loss adjudication threshold:",IDC_STATIC,10,90,102,\r
+                    8\r
+    EDITTEXT        IDC_EpAdjudicationThreshold,116,86,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "centipawns",IDC_STATIC,158,90,37,8\r
+    CONTROL         "&Verify Engine Claims",IDC_TestClaims,"Button",BS_AUTOCHECKBOX |\r
+                    WS_TABSTOP,10,108,100,10\r
+    CONTROL         "Detect &Mates",\r
+                    IDC_DetectMates,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,\r
+                    10,118,100,10\r
+    CONTROL         "Draw if &Insufficient Material",\r
+                    IDC_MaterialDraws,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,128,100,10\r
+    CONTROL         "Adjudicate &Trivial Draws",\r
+                    IDC_TrivialDraws,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,138,100,10\r
+    GROUPBOX        "Apply",IDC_STATIC,115,102,81,47\r
+    EDITTEXT        IDC_RuleMoves,120,113,20,14,ES_AUTOHSCROLL\r
+    LTEXT           "-move rule",IDC_STATIC,142,117,35,8\r
+    EDITTEXT        IDC_DrawRepeats,120,130,20,14,ES_AUTOHSCROLL\r
+    LTEXT           "-fold repeats",IDC_STATIC,142,134,50,8\r
+    CONTROL         "Engine #1 Score is Absolute",\r
+                    IDC_ScoreAbs1,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,156,120,10\r
+    CONTROL         "Engine #2 Score is Absolute",\r
+                    IDC_ScoreAbs2,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,168,120,10\r
+    DEFPUSHBUTTON   "OK",IDOK,98,185,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,154,185,50,14\r
+END\r
+\r
+DLG_OptionsUCI DIALOG DISCARDABLE  0, 0, 228, 124\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "UCI Options"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    LTEXT           "Polyglot Directory:",IDC_STATIC,2,8,58,8\r
+    EDITTEXT        IDC_PolyglotDir,62,4,140,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",IDC_BrowseForPolyglotDir,206,4,17,14\r
+    LTEXT           "Hash Size (MB):",IDC_STATIC,2,26,52,8\r
+    EDITTEXT        IDC_HashSize,62,22,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "EGTB Path:",IDC_STATIC,2,44,39,8\r
+    EDITTEXT        IDC_PathToEGTB,62,40,140,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",IDC_BrowseForEGTB,206,40,17,14\r
+    LTEXT           "EGTB Size (MB):",IDC_STATIC,2,62,54,8\r
+    EDITTEXT        IDC_SizeOfEGTB,62,58,40,14,ES_AUTOHSCROLL\r
+    CONTROL         "Use Book:",IDC_UseBook,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,2,80,49,10\r
+    EDITTEXT        IDC_BookFile,62,76,140,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",IDC_BrowseForBook,206,76,17,14\r
+    LTEXT           "Max nr of CPUs:",IDC_STATIC,106,26,52,8\r
+    EDITTEXT        IDC_Cores,162,22,40,14,ES_AUTOHSCROLL\r
+    CONTROL         "First has Own Book",IDC_OwnBook1,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,2,94,100,10\r
+    CONTROL         "Second has Own Book",IDC_OwnBook2,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,2,107,100,10\r
+    DEFPUSHBUTTON   "OK",IDOK,118,106,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,174,106,50,14\r
+END\r
+\r
+DLG_Null DIALOG DISCARDABLE  0, 0, 186, 50\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Null"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
 END\r
 \r
 \r
@@ -633,26 +889,36 @@ END
 #ifdef APSTUDIO_INVOKED\r
 GUIDELINES DESIGNINFO DISCARDABLE \r
 BEGIN\r
+    DLG_GameList, DIALOG\r
+    BEGIN\r
+        RIGHTMARGIN, 258\r
+    END\r
+\r
+    DLG_Colorize, DIALOG\r
+    BEGIN\r
+        BOTTOMMARGIN, 32\r
+    END\r
+\r
     DLG_GeneralOptions, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 264\r
+        RIGHTMARGIN, 213\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 128\r
+        BOTTOMMARGIN, 176\r
     END\r
 \r
     DLG_IcsOptions, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 311\r
+        RIGHTMARGIN, 295\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 264\r
+        BOTTOMMARGIN, 248\r
     END\r
 \r
     DLG_BoardOptions, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 255\r
+        RIGHTMARGIN, 187\r
         TOPMARGIN, 7\r
         BOTTOMMARGIN, 243\r
     END\r
@@ -660,9 +926,73 @@ BEGIN
     DLG_Fonts, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 273\r
+        RIGHTMARGIN, 259\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 219\r
+    END\r
+\r
+    DLG_NewGameFRC, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 169\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 40\r
+    END\r
+\r
+    DLG_GameListOptions, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 199\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 133\r
+    END\r
+\r
+    DLG_MoveHistory, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 218\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 123\r
+    END\r
+\r
+    DLG_EvalGraph, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 209\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 224\r
+        BOTTOMMARGIN, 68\r
+    END\r
+\r
+    DLG_EngineOutput, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 259\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 160\r
+    END\r
+\r
+    DLG_EnginePlayOptions, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 201\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 122\r
+    END\r
+\r
+    DLG_OptionsUCI, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 221\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 117\r
+    END\r
+\r
+    DLG_Null, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 179\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 43\r
     END\r
 END\r
 #endif    // APSTUDIO_INVOKED\r
@@ -675,9 +1005,18 @@ 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"\r
 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"\r
+IDI_PONDER_14           ICON    DISCARDABLE     "bitmaps/ponder_14.ico"\r
+IDI_TRANS_14            ICON    DISCARDABLE     "bitmaps/trans_14.ico"\r
+IDI_CLOCK_14            ICON    DISCARDABLE     "bitmaps/clock_14.ico"\r
+IDI_UNKNOWN_14          ICON    DISCARDABLE     "bitmaps/unknown_14.ico"\r
+IDI_BALOON_14           ICON    DISCARDABLE     "bitmaps/baloon_14.ico"\r
+IDI_ANALYZE_14          ICON    DISCARDABLE     "bitmaps/analyze_14.ico"\r
+IDI_ANALYZE2_14         ICON    DISCARDABLE     "bitmaps/analyze2_14.ico"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
@@ -688,23 +1027,28 @@ WINBOARD MENU DISCARDABLE
 BEGIN\r
     POPUP "&File"\r
     BEGIN\r
-        MENUITEM "Reset &Game",                 IDM_NewGame\r
+        MENUITEM "New &Game\tCtrl-N",           IDM_NewGame\r
+        MENUITEM "New Shuffle Game...",         IDM_NewGameFRC\r
+        MENUITEM "New Variant...",              IDM_NewVariant\r
         MENUITEM SEPARATOR\r
-        MENUITEM "&Load Game...",               IDM_LoadGame\r
+        MENUITEM "&Load Game...\tCtrl-O",       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...",               IDM_SaveGame\r
+        MENUITEM "&Save Game...\tCtrl-S",       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\r
+        MENUITEM SEPARATOR\r
         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
                                                 IDM_LoadPrevPosition\r
         MENUITEM "Reload Sa&me Position",       IDM_ReloadPosition\r
         MENUITEM "S&ave Position...",           IDM_SavePosition\r
+        MENUITEM "Save &Diagram...",            IDM_SaveDiagram\r
         MENUITEM SEPARATOR\r
         MENUITEM "Cop&y Position To Clipboard\tAlt+Shift+C", \r
                                                 IDM_CopyPosition\r
@@ -718,6 +1062,7 @@ BEGIN
         MENUITEM "Machine &White",              IDM_MachineWhite\r
         MENUITEM "Machine &Black",              IDM_MachineBlack\r
         MENUITEM "Two &Machines",               IDM_TwoMachines\r
+        MENUITEM "Machine Bot&h",               IDM_MachineBoth\r
         MENUITEM "&Analysis Mode",              IDM_AnalysisMode\r
         MENUITEM "Analyze &File",               IDM_AnalyzeFile\r
         MENUITEM "&ICS Client",                 IDM_IcsClient\r
@@ -725,9 +1070,14 @@ BEGIN
         MENUITEM "&Edit Position",              IDM_EditPosition\r
         MENUITEM "Trai&ning",                   IDM_Training, GRAYED\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Show Game &List...",          IDM_ShowGameList\r
+        MENUITEM "Show Engine &Output",         IDM_ShowEngineOutput\r
+        MENUITEM "Show Evaluation Graph",       IDM_ShowEvalGraph\r
+        MENUITEM "Show Game &List",             IDM_ShowGameList\r
+        MENUITEM "Show Move History",           IDM_ShowMoveHistory\r
+        MENUITEM SEPARATOR\r
         MENUITEM "Edit &Tags...",               IDM_EditTags\r
         MENUITEM "Edit &Comment...",            IDM_EditComment\r
+        MENUITEM "Enter &Username...",          IDM_TypeInName\r
         MENUITEM "&Pause\tPause",               IDM_Pause\r
     END\r
     POPUP "&Action"\r
@@ -744,6 +1094,10 @@ BEGIN
         MENUITEM SEPARATOR\r
         MENUITEM "Stop &Observing\tF10",        IDM_StopObserving\r
         MENUITEM "Stop E&xamining\tF11",        IDM_StopExamining\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Adjudicate to White",         IDM_UserAdjudication_White\r
+        MENUITEM "Adjudicate to Black",         IDM_UserAdjudication_Black\r
+        MENUITEM "Adjudicate Draw",             IDM_UserAdjudication_Draw\r
     END\r
     POPUP "&Step"\r
     BEGIN\r
@@ -762,12 +1116,16 @@ BEGIN
     POPUP "&Options"\r
     BEGIN\r
         MENUITEM "Flip &View\tF2",              IDM_FlipView\r
+        MENUITEM "Swap &Clocks",                IDM_FlipClock\r
         MENUITEM SEPARATOR\r
         MENUITEM "&General...",                 IDM_GeneralOptions\r
         MENUITEM "&Board...",                   IDM_BoardOptions\r
+        MENUITEM "Engines...",                  IDM_EnginePlayOptions\r
+        MENUITEM "UCI...",                      IDM_OptionsUCI\r
         MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED\r
         MENUITEM "&Fonts...",                   IDM_Fonts\r
         MENUITEM "Soun&ds...",                  IDM_Sounds\r
+        MENUITEM "Game List...",                IDM_GameListOptions\r
         MENUITEM SEPARATOR\r
         MENUITEM "Comm&unications...",          IDM_CommPort\r
         MENUITEM "&Load Game...",               IDM_LoadOptions\r
@@ -796,6 +1154,8 @@ BEGIN
     BEGIN\r
         MENUITEM "White",                       EP_White\r
         MENUITEM SEPARATOR\r
+        MENUITEM "Promote",                     EP_Promote\r
+        MENUITEM SEPARATOR\r
         MENUITEM "Pawn",                        EP_WhitePawn\r
         MENUITEM "Knight",                      EP_WhiteKnight\r
         MENUITEM "Bishop",                      EP_WhiteBishop\r
@@ -803,9 +1163,16 @@ BEGIN
         MENUITEM "Queen",                       EP_WhiteQueen\r
         MENUITEM "King",                        EP_WhiteKing\r
         MENUITEM SEPARATOR\r
+        MENUITEM "Archbishop",                  EP_WhiteCardinal\r
+        MENUITEM "Chancellor",                  EP_WhiteMarshall\r
+        MENUITEM "Elephant",                    EP_WhiteAlfil\r
+        MENUITEM "Cannon",                      EP_WhiteCannon\r
+        MENUITEM SEPARATOR\r
         MENUITEM "Empty Square",                EP_EmptySquare\r
         MENUITEM "Black",                       EP_Black, MENUBARBREAK\r
         MENUITEM SEPARATOR\r
+        MENUITEM "Demote",                      EP_Demote\r
+        MENUITEM SEPARATOR\r
         MENUITEM "Pawn",                        EP_BlackPawn\r
         MENUITEM "Knight",                      EP_BlackKnight\r
         MENUITEM "Bishop",                      EP_BlackBishop\r
@@ -813,6 +1180,46 @@ BEGIN
         MENUITEM "Queen",                       EP_BlackQueen\r
         MENUITEM "King",                        EP_BlackKing\r
         MENUITEM SEPARATOR\r
+        MENUITEM "Archbishop",                  EP_BlackCardinal\r
+        MENUITEM "Chancellor",                  EP_BlackMarshall\r
+        MENUITEM "Elephant",                    EP_BlackAlfil\r
+        MENUITEM "Cannon",                      EP_BlackCannon\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Clear Board    ",             EP_ClearBoard\r
+    END\r
+END\r
+\r
+SHOGIPIECEMENU MENU DISCARDABLE \r
+BEGIN\r
+    POPUP ""\r
+    BEGIN\r
+        MENUITEM "White",                       EP_White\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Pawn",                        EP_WhitePawn\r
+        MENUITEM "Knight",                      EP_WhiteKnight\r
+        MENUITEM "Bishop",                      EP_WhiteBishop\r
+        MENUITEM "Rook",                        EP_WhiteRook\r
+        MENUITEM "Lance",                       EP_WhiteQueen\r
+        MENUITEM "Silver",                      EP_WhiteFerz\r
+        MENUITEM "Gold",                        EP_WhiteWazir\r
+        MENUITEM "King",                        EP_WhiteKing\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Promote",                     EP_Promote\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Empty Square",                EP_EmptySquare\r
+        MENUITEM "Black",                       EP_Black, MENUBARBREAK\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Pawn",                        EP_BlackPawn\r
+        MENUITEM "Knight",                      EP_BlackKnight\r
+        MENUITEM "Bishop",                      EP_BlackBishop\r
+        MENUITEM "Rook",                        EP_BlackRook\r
+        MENUITEM "Lance",                       EP_BlackQueen\r
+        MENUITEM "Silver",                      EP_BlackFerz\r
+        MENUITEM "Gold",                        EP_BlackWazir\r
+        MENUITEM "King",                        EP_BlackKing\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Demote",                      EP_Demote\r
+        MENUITEM SEPARATOR\r
         MENUITEM "Clear Board    ",             EP_ClearBoard\r
     END\r
 END\r
@@ -901,12 +1308,17 @@ 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\r
     "C",            IDM_CopyGame,           VIRTKEY, ALT, NOINVERT\r
-    "C",            IDM_CopyPosition,       VIRTKEY, SHIFT, ALT, \r
-                                                    NOINVERT\r
+    "C",            IDM_CopyPosition,       VIRTKEY, SHIFT, ALT, NOINVERT\r
+    "I",            IDM_TypeInMove,         VIRTKEY, ALT, NOINVERT\r
+    "N",            IDM_NewGame,            VIRTKEY, CONTROL, NOINVERT\r
+    "O",            IDM_LoadGame,           VIRTKEY, CONTROL, NOINVERT\r
+    "S",            IDM_SaveGame,           VIRTKEY, CONTROL, NOINVERT\r
     "V",            IDM_PasteGame,          VIRTKEY, ALT, NOINVERT\r
-    "V",            IDM_PastePosition,      VIRTKEY, SHIFT, ALT, \r
+    "V",            IDM_PasteAny,           VIRTKEY, SHIFT, CONTROL, \r
                                                     NOINVERT\r
+    "V",            IDM_PastePosition,      VIRTKEY, SHIFT, ALT, 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
@@ -953,6 +1365,12 @@ BEGIN
     VK_UP,          IDM_ToStart,            VIRTKEY, NOINVERT\r
 END\r
 \r
+NO_ICS ACCELERATORS DISCARDABLE \r
+BEGIN\r
+    "A",            IDM_AnalysisMode,       VIRTKEY, CONTROL, NOINVERT\r
+    "V",            IDM_PasteAny,           VIRTKEY, CONTROL, NOINVERT\r
+END\r
+\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
@@ -1285,6 +1703,258 @@ Q129W                   BITMAP  MOVEABLE PURE   "bitmaps/q129w.bmp"
 K129W                   BITMAP  MOVEABLE PURE   "bitmaps/k129w.bmp"\r
 GALACTIC                BITMAP  MOVEABLE PURE   "bitmaps/galactic.bmp"\r
 TIM                     BITMAP  MOVEABLE PURE   "bitmaps/tim.bmp"\r
+// [HGM] Some fairy symbols:\r
+E72O                    BITMAP  MOVEABLE PURE   "bitmaps/e72o.bmp"\r
+A72O                    BITMAP  MOVEABLE PURE   "bitmaps/a72o.bmp"\r
+AA72O                   BITMAP  MOVEABLE PURE   "bitmaps/as72o.bmp"\r
+C72O                    BITMAP  MOVEABLE PURE   "bitmaps/c72o.bmp"\r
+CV72O                   BITMAP  MOVEABLE PURE   "bitmaps/cv72o.bmp"\r
+F72O                    BITMAP  MOVEABLE PURE   "bitmaps/f72o.bmp"\r
+M72O                    BITMAP  MOVEABLE PURE   "bitmaps/m72o.bmp"\r
+W72O                    BITMAP  MOVEABLE PURE   "bitmaps/w72o.bmp"\r
+O72O                    BITMAP  MOVEABLE PURE   "bitmaps/o72o.bmp"\r
+U72O                    BITMAP  MOVEABLE PURE   "bitmaps/u72o.bmp"\r
+H72O                    BITMAP  MOVEABLE PURE   "bitmaps/h72o.bmp"\r
+G72O                    BITMAP  MOVEABLE PURE   "bitmaps/g72o.bmp"\r
+V72O                    BITMAP  MOVEABLE PURE   "bitmaps/v72o.bmp"\r
+S72O                    BITMAP  MOVEABLE PURE   "bitmaps/s72o.bmp"\r
+L72O                    BITMAP  MOVEABLE PURE   "bitmaps/l72o.bmp"\r
+DK72O                   BITMAP  MOVEABLE PURE   "bitmaps/dk72o.bmp"\r
+WP72O                   BITMAP  MOVEABLE PURE   "bitmaps/wp72o.bmp"\r
+WN72O                   BITMAP  MOVEABLE PURE   "bitmaps/wn72o.bmp"\r
+WL72O                   BITMAP  MOVEABLE PURE   "bitmaps/wl72o.bmp"\r
+WS72O                   BITMAP  MOVEABLE PURE   "bitmaps/ws72o.bmp"\r
+E72S                    BITMAP  MOVEABLE PURE   "bitmaps/e72s.bmp"\r
+A72S                    BITMAP  MOVEABLE PURE   "bitmaps/a72s.bmp"\r
+AA72S                   BITMAP  MOVEABLE PURE   "bitmaps/as72s.bmp"\r
+C72S                    BITMAP  MOVEABLE PURE   "bitmaps/c72s.bmp"\r
+CV72S                   BITMAP  MOVEABLE PURE   "bitmaps/cv72s.bmp"\r
+F72S                    BITMAP  MOVEABLE PURE   "bitmaps/f72s.bmp"\r
+M72S                    BITMAP  MOVEABLE PURE   "bitmaps/m72s.bmp"\r
+W72S                    BITMAP  MOVEABLE PURE   "bitmaps/w72s.bmp"\r
+O72S                    BITMAP  MOVEABLE PURE   "bitmaps/o72s.bmp"\r
+U72S                    BITMAP  MOVEABLE PURE   "bitmaps/u72s.bmp"\r
+H72S                    BITMAP  MOVEABLE PURE   "bitmaps/h72s.bmp"\r
+G72S                    BITMAP  MOVEABLE PURE   "bitmaps/g72s.bmp"\r
+V72S                    BITMAP  MOVEABLE PURE   "bitmaps/v72s.bmp"\r
+S72S                    BITMAP  MOVEABLE PURE   "bitmaps/s72s.bmp"\r
+L72S                    BITMAP  MOVEABLE PURE   "bitmaps/l72s.bmp"\r
+DK72S                   BITMAP  MOVEABLE PURE   "bitmaps/dk72s.bmp"\r
+WP72S                   BITMAP  MOVEABLE PURE   "bitmaps/wp72s.bmp"\r
+WN72S                   BITMAP  MOVEABLE PURE   "bitmaps/wn72s.bmp"\r
+WL72S                   BITMAP  MOVEABLE PURE   "bitmaps/wl72s.bmp"\r
+WS72S                   BITMAP  MOVEABLE PURE   "bitmaps/ws72s.bmp"\r
+E72W                    BITMAP  MOVEABLE PURE   "bitmaps/e72w.bmp"\r
+A72W                    BITMAP  MOVEABLE PURE   "bitmaps/a72w.bmp"\r
+AA72W                   BITMAP  MOVEABLE PURE   "bitmaps/as72w.bmp"\r
+C72W                    BITMAP  MOVEABLE PURE   "bitmaps/c72w.bmp"\r
+CV72W                   BITMAP  MOVEABLE PURE   "bitmaps/cv72w.bmp"\r
+F72W                    BITMAP  MOVEABLE PURE   "bitmaps/f72w.bmp"\r
+M72W                    BITMAP  MOVEABLE PURE   "bitmaps/m72w.bmp"\r
+W72W                    BITMAP  MOVEABLE PURE   "bitmaps/w72w.bmp"\r
+O72W                    BITMAP  MOVEABLE PURE   "bitmaps/o72w.bmp"\r
+U72W                    BITMAP  MOVEABLE PURE   "bitmaps/u72w.bmp"\r
+H72W                    BITMAP  MOVEABLE PURE   "bitmaps/h72w.bmp"\r
+G72W                    BITMAP  MOVEABLE PURE   "bitmaps/g72w.bmp"\r
+V72W                    BITMAP  MOVEABLE PURE   "bitmaps/v72w.bmp"\r
+S72W                    BITMAP  MOVEABLE PURE   "bitmaps/s72w.bmp"\r
+L72W                    BITMAP  MOVEABLE PURE   "bitmaps/l72w.bmp"\r
+DK72W                   BITMAP  MOVEABLE PURE   "bitmaps/dk72w.bmp"\r
+E49O                    BITMAP  MOVEABLE PURE   "bitmaps/e49o.bmp"\r
+A49O                    BITMAP  MOVEABLE PURE   "bitmaps/a49o.bmp"\r
+AA49O                   BITMAP  MOVEABLE PURE   "bitmaps/as49o.bmp"\r
+C49O                    BITMAP  MOVEABLE PURE   "bitmaps/c49o.bmp"\r
+CV49O                   BITMAP  MOVEABLE PURE   "bitmaps/cv49o.bmp"\r
+F49O                    BITMAP  MOVEABLE PURE   "bitmaps/f49o.bmp"\r
+M49O                    BITMAP  MOVEABLE PURE   "bitmaps/m49o.bmp"\r
+W49O                    BITMAP  MOVEABLE PURE   "bitmaps/w49o.bmp"\r
+O49O                    BITMAP  MOVEABLE PURE   "bitmaps/o49o.bmp"\r
+U49O                    BITMAP  MOVEABLE PURE   "bitmaps/u49o.bmp"\r
+H49O                    BITMAP  MOVEABLE PURE   "bitmaps/h49o.bmp"\r
+G49O                    BITMAP  MOVEABLE PURE   "bitmaps/g49o.bmp"\r
+V49O                    BITMAP  MOVEABLE PURE   "bitmaps/v49o.bmp"\r
+S49O                    BITMAP  MOVEABLE PURE   "bitmaps/s49o.bmp"\r
+L49O                    BITMAP  MOVEABLE PURE   "bitmaps/l49o.bmp"\r
+DK49O                   BITMAP  MOVEABLE PURE   "bitmaps/dk49o.bmp"\r
+WP49O                   BITMAP  MOVEABLE PURE   "bitmaps/wp49o.bmp"\r
+WN49O                   BITMAP  MOVEABLE PURE   "bitmaps/wn49o.bmp"\r
+WL49O                   BITMAP  MOVEABLE PURE   "bitmaps/wl49o.bmp"\r
+WS49O                   BITMAP  MOVEABLE PURE   "bitmaps/ws49o.bmp"\r
+E49S                    BITMAP  MOVEABLE PURE   "bitmaps/e49s.bmp"\r
+A49S                    BITMAP  MOVEABLE PURE   "bitmaps/a49s.bmp"\r
+AA49S                   BITMAP  MOVEABLE PURE   "bitmaps/as49s.bmp"\r
+C49S                    BITMAP  MOVEABLE PURE   "bitmaps/c49s.bmp"\r
+CV49S                   BITMAP  MOVEABLE PURE   "bitmaps/cv49s.bmp"\r
+F49S                    BITMAP  MOVEABLE PURE   "bitmaps/f49s.bmp"\r
+M49S                    BITMAP  MOVEABLE PURE   "bitmaps/m49s.bmp"\r
+W49S                    BITMAP  MOVEABLE PURE   "bitmaps/w49s.bmp"\r
+O49S                    BITMAP  MOVEABLE PURE   "bitmaps/o49s.bmp"\r
+U49S                    BITMAP  MOVEABLE PURE   "bitmaps/u49s.bmp"\r
+H49S                    BITMAP  MOVEABLE PURE   "bitmaps/h49s.bmp"\r
+G49S                    BITMAP  MOVEABLE PURE   "bitmaps/g49s.bmp"\r
+V49S                    BITMAP  MOVEABLE PURE   "bitmaps/v49s.bmp"\r
+S49S                    BITMAP  MOVEABLE PURE   "bitmaps/s49s.bmp"\r
+L49S                    BITMAP  MOVEABLE PURE   "bitmaps/l49s.bmp"\r
+DK49S                   BITMAP  MOVEABLE PURE   "bitmaps/dk49s.bmp"\r
+WP49S                   BITMAP  MOVEABLE PURE   "bitmaps/wp49s.bmp"\r
+WN49S                   BITMAP  MOVEABLE PURE   "bitmaps/wn49s.bmp"\r
+WL49S                   BITMAP  MOVEABLE PURE   "bitmaps/wl49s.bmp"\r
+WS49S                   BITMAP  MOVEABLE PURE   "bitmaps/ws49s.bmp"\r
+E49W                    BITMAP  MOVEABLE PURE   "bitmaps/e49w.bmp"\r
+A49W                    BITMAP  MOVEABLE PURE   "bitmaps/a49w.bmp"\r
+AA49W                   BITMAP  MOVEABLE PURE   "bitmaps/as49w.bmp"\r
+C49W                    BITMAP  MOVEABLE PURE   "bitmaps/c49w.bmp"\r
+CV49W                   BITMAP  MOVEABLE PURE   "bitmaps/cv49w.bmp"\r
+F49W                    BITMAP  MOVEABLE PURE   "bitmaps/f49w.bmp"\r
+M49W                    BITMAP  MOVEABLE PURE   "bitmaps/m49w.bmp"\r
+W49W                    BITMAP  MOVEABLE PURE   "bitmaps/w49w.bmp"\r
+O49W                    BITMAP  MOVEABLE PURE   "bitmaps/o49w.bmp"\r
+U49W                    BITMAP  MOVEABLE PURE   "bitmaps/u49w.bmp"\r
+H49W                    BITMAP  MOVEABLE PURE   "bitmaps/h49w.bmp"\r
+G49W                    BITMAP  MOVEABLE PURE   "bitmaps/g49w.bmp"\r
+V49W                    BITMAP  MOVEABLE PURE   "bitmaps/v49w.bmp"\r
+S49W                    BITMAP  MOVEABLE PURE   "bitmaps/s49w.bmp"\r
+L49W                    BITMAP  MOVEABLE PURE   "bitmaps/l49w.bmp"\r
+DK49W                   BITMAP  MOVEABLE PURE   "bitmaps/dk49w.bmp"\r
+A33O                    BITMAP  MOVEABLE PURE   "bitmaps/a33o.bmp"\r
+AA33O                   BITMAP  MOVEABLE PURE   "bitmaps/as33o.bmp"\r
+C33O                    BITMAP  MOVEABLE PURE   "bitmaps/c33o.bmp"\r
+CV33O                   BITMAP  MOVEABLE PURE   "bitmaps/cv33o.bmp"\r
+V33O                    BITMAP  MOVEABLE PURE   "bitmaps/v33o.bmp"\r
+E33O                    BITMAP  MOVEABLE PURE   "bitmaps/e33o.bmp"\r
+F33O                    BITMAP  MOVEABLE PURE   "bitmaps/f33o.bmp"\r
+H33O                    BITMAP  MOVEABLE PURE   "bitmaps/h33o.bmp"\r
+G33O                    BITMAP  MOVEABLE PURE   "bitmaps/g33o.bmp"\r
+L33O                    BITMAP  MOVEABLE PURE   "bitmaps/l33o.bmp"\r
+W33O                    BITMAP  MOVEABLE PURE   "bitmaps/w33o.bmp"\r
+M33O                    BITMAP  MOVEABLE PURE   "bitmaps/m33o.bmp"\r
+O33O                    BITMAP  MOVEABLE PURE   "bitmaps/o33o.bmp"\r
+DK33O                   BITMAP  MOVEABLE PURE   "bitmaps/dk33o.bmp"\r
+A33W                    BITMAP  MOVEABLE PURE   "bitmaps/a33w.bmp"\r
+AA33W                   BITMAP  MOVEABLE PURE   "bitmaps/as33w.bmp"\r
+C33W                    BITMAP  MOVEABLE PURE   "bitmaps/c33w.bmp"\r
+CV33W                   BITMAP  MOVEABLE PURE   "bitmaps/cv33w.bmp"\r
+V33W                    BITMAP  MOVEABLE PURE   "bitmaps/v33w.bmp"\r
+E33W                    BITMAP  MOVEABLE PURE   "bitmaps/e33w.bmp"\r
+F33W                    BITMAP  MOVEABLE PURE   "bitmaps/f33w.bmp"\r
+H33W                    BITMAP  MOVEABLE PURE   "bitmaps/h33w.bmp"\r
+G33W                    BITMAP  MOVEABLE PURE   "bitmaps/g33w.bmp"\r
+L33W                    BITMAP  MOVEABLE PURE   "bitmaps/l33w.bmp"\r
+W33W                    BITMAP  MOVEABLE PURE   "bitmaps/w33w.bmp"\r
+M33W                    BITMAP  MOVEABLE PURE   "bitmaps/m33w.bmp"\r
+O33W                    BITMAP  MOVEABLE PURE   "bitmaps/o33w.bmp"\r
+DK33W                   BITMAP  MOVEABLE PURE   "bitmaps/dk33w.bmp"\r
+A33S                    BITMAP  MOVEABLE PURE   "bitmaps/a33s.bmp"\r
+AA33S                   BITMAP  MOVEABLE PURE   "bitmaps/as33s.bmp"\r
+C33S                    BITMAP  MOVEABLE PURE   "bitmaps/c33s.bmp"\r
+CV33S                   BITMAP  MOVEABLE PURE   "bitmaps/cv33s.bmp"\r
+V33S                    BITMAP  MOVEABLE PURE   "bitmaps/v33s.bmp"\r
+E33S                    BITMAP  MOVEABLE PURE   "bitmaps/e33s.bmp"\r
+F33S                    BITMAP  MOVEABLE PURE   "bitmaps/f33s.bmp"\r
+H33S                    BITMAP  MOVEABLE PURE   "bitmaps/h33s.bmp"\r
+G33S                    BITMAP  MOVEABLE PURE   "bitmaps/g33s.bmp"\r
+L33S                    BITMAP  MOVEABLE PURE   "bitmaps/l33s.bmp"\r
+W33S                    BITMAP  MOVEABLE PURE   "bitmaps/w33s.bmp"\r
+M33S                    BITMAP  MOVEABLE PURE   "bitmaps/m33s.bmp"\r
+O33S                    BITMAP  MOVEABLE PURE   "bitmaps/o33s.bmp"\r
+DK33S                   BITMAP  MOVEABLE PURE   "bitmaps/dk33s.bmp"\r
+\r
+A37O                    BITMAP  MOVEABLE PURE   "bitmaps/a37o.bmp"\r
+L37O                    BITMAP  MOVEABLE PURE   "bitmaps/l37o.bmp"\r
+C37O                    BITMAP  MOVEABLE PURE   "bitmaps/c37o.bmp"\r
+CV37O                   BITMAP  MOVEABLE PURE   "bitmaps/cv37o.bmp"\r
+A40O                    BITMAP  MOVEABLE PURE   "bitmaps/a40o.bmp"\r
+L40O                    BITMAP  MOVEABLE PURE   "bitmaps/l40o.bmp"\r
+C40O                    BITMAP  MOVEABLE PURE   "bitmaps/c40o.bmp"\r
+CV40O                   BITMAP  MOVEABLE PURE   "bitmaps/cv40o.bmp"\r
+A45O                    BITMAP  MOVEABLE PURE   "bitmaps/a45o.bmp"\r
+L45O                    BITMAP  MOVEABLE PURE   "bitmaps/l45o.bmp"\r
+C45O                    BITMAP  MOVEABLE PURE   "bitmaps/c45o.bmp"\r
+CV45O                   BITMAP  MOVEABLE PURE   "bitmaps/cv45o.bmp"\r
+A54O                    BITMAP  MOVEABLE PURE   "bitmaps/a54o.bmp"\r
+L54O                    BITMAP  MOVEABLE PURE   "bitmaps/l54o.bmp"\r
+C54O                    BITMAP  MOVEABLE PURE   "bitmaps/c54o.bmp"\r
+CV54O                   BITMAP  MOVEABLE PURE   "bitmaps/cv54o.bmp"\r
+V54O                    BITMAP  MOVEABLE PURE   "bitmaps/v54o.bmp"\r
+A58O                    BITMAP  MOVEABLE PURE   "bitmaps/a58o.bmp"\r
+L58O                    BITMAP  MOVEABLE PURE   "bitmaps/l58o.bmp"\r
+C58O                    BITMAP  MOVEABLE PURE   "bitmaps/c58o.bmp"\r
+CV58O                   BITMAP  MOVEABLE PURE   "bitmaps/cv58o.bmp"\r
+A64O                    BITMAP  MOVEABLE PURE   "bitmaps/a64o.bmp"\r
+L64O                    BITMAP  MOVEABLE PURE   "bitmaps/l64o.bmp"\r
+C64O                    BITMAP  MOVEABLE PURE   "bitmaps/c64o.bmp"\r
+CV64O                   BITMAP  MOVEABLE PURE   "bitmaps/cv64o.bmp"\r
+A37W                    BITMAP  MOVEABLE PURE   "bitmaps/a37w.bmp"\r
+L37W                    BITMAP  MOVEABLE PURE   "bitmaps/l37w.bmp"\r
+C37W                    BITMAP  MOVEABLE PURE   "bitmaps/c37w.bmp"\r
+CV37W                   BITMAP  MOVEABLE PURE   "bitmaps/cv37w.bmp"\r
+A40W                    BITMAP  MOVEABLE PURE   "bitmaps/a40w.bmp"\r
+L40W                    BITMAP  MOVEABLE PURE   "bitmaps/l40w.bmp"\r
+C40W                    BITMAP  MOVEABLE PURE   "bitmaps/c40w.bmp"\r
+CV40W                   BITMAP  MOVEABLE PURE   "bitmaps/cv40w.bmp"\r
+A45W                    BITMAP  MOVEABLE PURE   "bitmaps/a45w.bmp"\r
+L45W                    BITMAP  MOVEABLE PURE   "bitmaps/l45w.bmp"\r
+C45W                    BITMAP  MOVEABLE PURE   "bitmaps/c45w.bmp"\r
+CV45W                   BITMAP  MOVEABLE PURE   "bitmaps/cv45w.bmp"\r
+A54W                    BITMAP  MOVEABLE PURE   "bitmaps/a54w.bmp"\r
+L54W                    BITMAP  MOVEABLE PURE   "bitmaps/l54w.bmp"\r
+C54W                    BITMAP  MOVEABLE PURE   "bitmaps/c54w.bmp"\r
+CV54W                   BITMAP  MOVEABLE PURE   "bitmaps/cv54w.bmp"\r
+V54W                    BITMAP  MOVEABLE PURE   "bitmaps/v54w.bmp"\r
+A58W                    BITMAP  MOVEABLE PURE   "bitmaps/a58w.bmp"\r
+L58W                    BITMAP  MOVEABLE PURE   "bitmaps/l58w.bmp"\r
+C58W                    BITMAP  MOVEABLE PURE   "bitmaps/c58w.bmp"\r
+CV58W                   BITMAP  MOVEABLE PURE   "bitmaps/cv58w.bmp"\r
+A64W                    BITMAP  MOVEABLE PURE   "bitmaps/a64w.bmp"\r
+L64W                    BITMAP  MOVEABLE PURE   "bitmaps/l64w.bmp"\r
+C64W                    BITMAP  MOVEABLE PURE   "bitmaps/c64w.bmp"\r
+CV64W                   BITMAP  MOVEABLE PURE   "bitmaps/cv64w.bmp"\r
+A37S                    BITMAP  MOVEABLE PURE   "bitmaps/a37s.bmp"\r
+L37S                    BITMAP  MOVEABLE PURE   "bitmaps/l37s.bmp"\r
+C37S                    BITMAP  MOVEABLE PURE   "bitmaps/c37s.bmp"\r
+CV37S                   BITMAP  MOVEABLE PURE   "bitmaps/cv37s.bmp"\r
+A40S                    BITMAP  MOVEABLE PURE   "bitmaps/a40s.bmp"\r
+L40S                    BITMAP  MOVEABLE PURE   "bitmaps/l40s.bmp"\r
+C40S                    BITMAP  MOVEABLE PURE   "bitmaps/c40s.bmp"\r
+CV40S                   BITMAP  MOVEABLE PURE   "bitmaps/cv40s.bmp"\r
+A45S                    BITMAP  MOVEABLE PURE   "bitmaps/a45s.bmp"\r
+L45S                    BITMAP  MOVEABLE PURE   "bitmaps/l45s.bmp"\r
+C45S                    BITMAP  MOVEABLE PURE   "bitmaps/c45s.bmp"\r
+CV45S                   BITMAP  MOVEABLE PURE   "bitmaps/cv45s.bmp"\r
+A54S                    BITMAP  MOVEABLE PURE   "bitmaps/a54s.bmp"\r
+L54S                    BITMAP  MOVEABLE PURE   "bitmaps/l54s.bmp"\r
+C54S                    BITMAP  MOVEABLE PURE   "bitmaps/c54s.bmp"\r
+CV54S                   BITMAP  MOVEABLE PURE   "bitmaps/cv54s.bmp"\r
+V54S                    BITMAP  MOVEABLE PURE   "bitmaps/v54s.bmp"\r
+A58S                    BITMAP  MOVEABLE PURE   "bitmaps/a58s.bmp"\r
+L58S                    BITMAP  MOVEABLE PURE   "bitmaps/l58s.bmp"\r
+C58S                    BITMAP  MOVEABLE PURE   "bitmaps/c58s.bmp"\r
+CV58S                   BITMAP  MOVEABLE PURE   "bitmaps/cv58s.bmp"\r
+A64S                    BITMAP  MOVEABLE PURE   "bitmaps/a64s.bmp"\r
+L64S                    BITMAP  MOVEABLE PURE   "bitmaps/l64s.bmp"\r
+C64S                    BITMAP  MOVEABLE PURE   "bitmaps/c64s.bmp"\r
+CV64S                   BITMAP  MOVEABLE PURE   "bitmaps/cv64s.bmp"\r
+\r
+SP58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sp58o.bmp"\r
+SN58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sn58o.bmp"\r
+SB58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sb58o.bmp"\r
+SR58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sr58o.bmp"\r
+SL58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sl58o.bmp"\r
+SK58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sk58o.bmp"\r
+SF58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sf58o.bmp"\r
+SW58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sw58o.bmp"\r
+SU58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/su58o.bmp"\r
+SH58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sh58o.bmp"\r
+SA58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sa58o.bmp"\r
+SC58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sc58o.bmp"\r
+SG58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/sg58o.bmp"\r
+SS58O                   BITMAP  MOVEABLE PURE   "shogibitmaps/ss58o.bmp"\r
+SP58W                   BITMAP  MOVEABLE PURE   "shogibitmaps/sp58w.bmp"\r
+SN58W                   BITMAP  MOVEABLE PURE   "shogibitmaps/sn58w.bmp"\r
+SR58W                   BITMAP  MOVEABLE PURE   "shogibitmaps/sr58w.bmp"\r
+SL58W                   BITMAP  MOVEABLE PURE   "shogibitmaps/sl58w.bmp"\r
+SK58W                   BITMAP  MOVEABLE PURE   "shogibitmaps/sk58w.bmp"\r
+SW58W                   BITMAP  MOVEABLE PURE   "shogibitmaps/sw58w.bmp"\r
 \r
 #ifdef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -1321,39 +1991,38 @@ END
 // WAVE\r
 //\r
 \r
-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
+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
 #endif    // English (U.S.) resources\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r