Fix multi-leg promotions
[xboard.git] / winboard / winboard.rc
index a2e9a96..c55c6da 100644 (file)
@@ -44,14 +44,13 @@ BEGIN
     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-2009   Free Software Foundation",\r
+    LTEXT           "Enhancements Copyright 1992-2015  Free Software Foundation",\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,160,8\r
     LTEXT           "Enhancements Copyright 2005\r\nAlessandro Scotti",\r
                     IDC_STATIC,6,65,120,24\r
-    LTEXT           "",\r
-                    OPT_MESS,6,85,120,16\r
+    LTEXT           "      ", OPT_MESS,6,85,120,16\r
 END\r
 \r
 DLG_TimeControl DIALOG DISCARDABLE  6, 18, 263, 212\r
@@ -60,7 +59,7 @@ CAPTION "Time Control"
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
     LTEXT           "Use arrow keys to specify which clock setting type, then press tab to alter values.",\r
-                    IDC_STATIC,9,9,231,20\r
+                    IDC_Babble,9,9,231,20\r
     CONTROL         "Conventional chess clock",OPT_TCUseMoves,"Button",\r
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,36,113,10\r
     CONTROL         "Incremental clock",OPT_TCUseInc,"Button",\r
@@ -72,59 +71,87 @@ BEGIN
     LTEXT           "Within number of minutes:",OPT_TCtext2,113,54,81,8,NOT \r
                     WS_GROUP\r
     EDITTEXT        OPT_TCTime,197,52,32,12,ES_AUTOHSCROLL\r
-    LTEXT           "Initial number of minutes:",405,15,89,106,8,NOT \r
+    LTEXT           "Initial number of minutes:",OPT_TCitext1,15,89,126,8,NOT \r
                     WS_GROUP\r
-    EDITTEXT        OPT_TCTime2,127,87,32,12,ES_AUTOHSCROLL | WS_GROUP\r
-    LTEXT           "Plus number of seconds per move:",406,15,105,109,8,NOT \r
+    EDITTEXT        OPT_TCTime2,147,87,32,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "Plus number of seconds per move:",OPT_TCitext2,15,105,129,8,NOT \r
                     WS_GROUP\r
-    EDITTEXT        OPT_TCInc,127,103,32,12,ES_AUTOHSCROLL\r
-    LTEXT           "Maximum seconds per move:",OPT_TCftext,15,142,109,8,NOT \r
+    EDITTEXT        OPT_TCInc,147,103,32,12,ES_AUTOHSCROLL\r
+    LTEXT           "Maximum seconds per move:",OPT_TCftext,15,142,129,8,NOT \r
                     WS_GROUP\r
-    EDITTEXT        OPT_TCFixed,127,140,32,12,ES_AUTOHSCROLL\r
-    LTEXT           "",408,185,148,67,8,NOT WS_GROUP\r
-    LTEXT           "Time-Odds Factors:",IDC_STATIC,6,158,150,8,NOT WS_GROUP\r
-    EDITTEXT        OPT_TCOdds1,47,171,32,12,ES_AUTOHSCROLL | WS_GROUP\r
-    LTEXT           "Engine #1:",IDC_STATIC,6,173,40,8,NOT WS_GROUP\r
-    EDITTEXT        OPT_TCOdds2,127,171,32,12,ES_AUTOHSCROLL\r
-    LTEXT           "Engine #2:",IDC_STATIC,86,173,40,8,NOT WS_GROUP\r
-    PUSHBUTTON      "OK",IDOK,29,190,40,14,WS_GROUP\r
-    PUSHBUTTON      "Cancel",IDCANCEL,85,190,40,14\r
+    EDITTEXT        OPT_TCFixed,147,140,32,12,ES_AUTOHSCROLL\r
+    LTEXT           "",OPT_TCitext3,185,148,67,8,NOT WS_GROUP\r
+    LTEXT           "Time-Odds Factors:",GPB_Factors,6,158,150,8,NOT WS_GROUP | WS_TABSTOP\r
+    LTEXT           "Engine #1:",IDC_Factor1,6,173,60,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCOdds1,67,171,32,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "Engine #2:",IDC_Factor2,106,173,60,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCOdds2,167,171,32,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "OK",IDOK,139,190,40,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,195,190,40,14\r
 END\r
 \r
-DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 136, 55\r
+DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 170, 281\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Load Game Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    CONTROL         "Load games with automatic stepping",OPT_Autostep,"Button",\r
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,130,10\r
+    CONTROL         "Load games with &automatic stepping",OPT_Autostep,"Button",\r
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,160,10\r
+    LTEXT           "&seconds per move",OPT_AStext1,46,20,90,8,NOT WS_GROUP\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
+    LTEXT           "when filtering game list on position, use thresholds:",OPT_thresholds,4,36,160,8,NOT WS_GROUP\r
+    LTEXT           "minimum Elo for &best player",OPT_elo1t,46,54,90,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_elo1,16,50,28,14,ES_AUTOHSCROLL\r
+    LTEXT           "minimum Elo for &weakest players",OPT_elo2t,46,74,90,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_elo2,16,70,28,14,ES_AUTOHSCROLL\r
+    LTEXT           "or later &year",OPT_datet,46,94,94,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_date,16,90,28,14,ES_AUTOHSCROLL\r
+    LTEXT           "co&nsecutive positions",OPT_Stretcht,46,114,94,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_Stretch,16,110,28,14,ES_AUTOHSCROLL\r
+    LTEXT           "final piece count",OPT_Ranget,46,134,94,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_Counts,16,130,28,14,ES_AUTOHSCROLL\r
+    CONTROL         "Match exact &position",OPT_Exact,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,6,156,159,10\r
+    CONTROL         "Match if position is s&ubset",OPT_Subset,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,169,159,10\r
+    CONTROL         "Match material with e&xact pawn structure",OPT_Struct,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,182,159,10\r
+    CONTROL         "Match &material",OPT_Material,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,195,159,10\r
+    CONTROL         "Material &range (upper board-half is optional)",OPT_Range,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,208,159,10\r
+    CONTROL         "Material &difference (optional material balanced)",OPT_Difference,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,221,159,10\r
+    GROUPBOX        "Search Mode: ",OPT_SearchMode,3,146,164,87,WS_GROUP\r
+    CONTROL         "Also match reversed &colors",OPT_Reversed,"Button",\r
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,234,160,10\r
+    CONTROL         "Also match &left-right mirror image",OPT_Mirror,"Button",\r
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,247,160,10\r
+    PUSHBUTTON      "OK",IDOK,56,262,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,112,262,50,14\r
 END\r
 \r
-DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 178, 119\r
+DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 218, 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
 BEGIN\r
     CONTROL         "Save games automatically",OPT_Autosave,"Button",\r
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,97,10\r
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,157,10\r
     CONTROL         "Prompt for filename",OPT_AVPrompt,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,18,75,10\r
+                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,18,150,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
+                    32,56,10\r
+    EDITTEXT        OPT_AVFilename,74,30,117,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",OPT_AVBrowse,196,30,18,14\r
+    GROUPBOX        "Save As: ",801,4,48,210,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
+                    60,59,10\r
+    CONTROL         "Old",OPT_Old,"Button",BS_AUTORADIOBUTTON,74,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
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,82,169,10\r
+    PUSHBUTTON      "OK",IDOK,108,100,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,164,100,50,14\r
 END\r
 \r
 1536 DIALOG DISCARDABLE  36, 24, 264, 134\r
@@ -137,7 +164,7 @@ BEGIN
     LISTBOX         1120,6,32,90,68,LBS_SORT | LBS_OWNERDRAWFIXED | \r
                     LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | \r
                     WS_TABSTOP\r
-    LTEXT           "&Directories:",-1,110,6,92,9\r
+    LTEXT           "&Directories:",IDC_Directories,110,6,92,9\r
     LTEXT           "",1088,110,18,92,9,SS_NOPREFIX | NOT WS_GROUP\r
     LISTBOX         1121,110,32,92,68,LBS_SORT | LBS_OWNERDRAWFIXED | \r
                     LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | \r
@@ -152,7 +179,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,208,6,50,14,WS_GROUP\r
     PUSHBUTTON      "Cancel",IDCANCEL,208,24,50,14,WS_GROUP\r
     PUSHBUTTON      "&Help",1038,208,46,50,14,NOT WS_VISIBLE | WS_GROUP\r
-    LTEXT           "&Index number:",-1,208,74,48,8\r
+    LTEXT           "&Index number:",IDC_IndexNr,208,74,48,8\r
     EDITTEXT        OPT_IndexNumberOld,208,84,50,12,ES_AUTOHSCROLL\r
     PUSHBUTTON      "Net&work...",1037,208,113,50,14,WS_GROUP\r
 END\r
@@ -164,22 +191,22 @@ FONT 8, "Helv"
 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
+    RTEXT           "&Port:",IDC_Port,4,6,40,10\r
     COMBOBOX        OPT_Port,49,4,55,60,CBS_DROPDOWN | WS_VSCROLL | \r
                     WS_TABSTOP\r
-    RTEXT           "Data &Rate:",-1,114,6,40,10,NOT WS_GROUP\r
+    RTEXT           "Data &Rate:",IDC_Rate,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,25,40,10,NOT WS_GROUP\r
+    RTEXT           "Data &Bits:",IDC_Bits,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,114,24,40,10,NOT WS_GROUP\r
+    RTEXT           "P&arity:",IDC_Parity,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
+    RTEXT           "&Stop Bits:",IDC_Stop,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,114,42,40,10,NOT WS_GROUP\r
+    RTEXT           "F&low:",IDC_Flow,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,4,60,50,14,NOT WS_VISIBLE\r
@@ -212,8 +239,6 @@ BEGIN
     PUSHBUTTON      "K&night",PB_Knight,139,23,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           "      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
@@ -222,10 +247,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About WinBoard"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    RTEXT           "Chessboard for Windows",DLG_TimeControl,196,154,80,8\r
+    RTEXT           "Chessboard for Windows",IDC_ChessBoard,196,154,80,8\r
     LTEXT           "Copyright 1991 Digital Equipment Corporation",201,4,168,\r
                     151,8\r
-    LTEXT           "Enhancements Copyright 1992-2003   Free Software Foundation",\r
+    LTEXT           "Enhancements Copyright 1992-2014   Free Software Foundation",\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
@@ -236,31 +261,33 @@ BEGIN
     LTEXT           "(unofficial version ""X"")",IDC_STATIC,68,154,71,8\r
 END\r
 \r
-DLG_GameList DIALOG DISCARDABLE  6, 18, 259, 153\r
+DLG_GameList DIALOG DISCARDABLE  6, 18, 282, 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,2,2,254,130,LBS_NOINTEGRALHEIGHT | \r
+    LISTBOX         OPT_GameListText,2,2,277,130,LBS_NOINTEGRALHEIGHT | \r
                     WS_VSCROLL | WS_HSCROLL | WS_TABSTOP\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
+    PUSHBUTTON      "&Thresholds",OPT_GameListLoad,2,136,40,15\r
+    PUSHBUTTON      "&Find Position",OPT_GameListFind,45,136,48,15\r
+    PUSHBUTTON      "&Narrow",OPT_GameListNarrow,96,136,30,15\r
+    PUSHBUTTON      "&Close",OPT_GameListClose,129,136,20,15\r
+    PUSHBUTTON      ">",OPT_GameListNext,152,136,17,15\r
+    PUSHBUTTON      "&Filter",IDC_GameListDoFilter,172,136,25,14\r
+    EDITTEXT        IDC_GameListFilter,201,136,78,14,ES_AUTOHSCROLL\r
 END\r
 \r
-DLG_EditTags DIALOG DISCARDABLE  6, 18, 167, 140\r
+DLG_EditTags DIALOG DISCARDABLE  6, 18, 223, 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,58,122,50,14\r
-    PUSHBUTTON      "Cancel",OPT_TagsCancel,114,122,50,14\r
+    PUSHBUTTON      "OK",IDOK,114,122,50,14\r
+    PUSHBUTTON      "Cancel",OPT_TagsCancel,170,122,50,14\r
+    PUSHBUTTON      "Save",OPT_TagsSave,58,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,2,2,162,115\r
+                    WS_HSCROLL | WS_TABSTOP,2,2,218,115\r
     PUSHBUTTON      "&Edit",OPT_EditTags,2,122,50,14\r
 END\r
 \r
@@ -334,42 +361,42 @@ BEGIN
     ICON            32514,IDC_STATIC,4,4,20,20\r
 END\r
 \r
-DLG_Startup DIALOG DISCARDABLE  0, 0, 276, 159\r
+DLG_Startup DIALOG DISCARDABLE  0, 0, 326, 159\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "WinBoard Startup"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    GROUPBOX        "What would you like to do?",IDC_STATIC,4,4,211,56\r
+    GROUPBOX        "What would you like to do?",IDC_Welcome,4,4,318,56\r
     CONTROL         "&Play against a chess engine or match two engines",\r
                     OPT_ChessEngine,"Button",BS_AUTORADIOBUTTON | WS_GROUP | \r
-                    WS_TABSTOP,8,17,193,10\r
+                    WS_TABSTOP,8,17,310,10\r
     CONTROL         "&Use an Internet Chess Server",OPT_ChessServer,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,30,193,10\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,30,310,10\r
     CONTROL         "Just &view or edit game files",OPT_View,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,43,193,10\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,43,310,10\r
     LTEXT           "Specify Chess &Engines:",IDC_SPECIFY_ENG_STATIC,11,63,\r
-                    102,10\r
-    COMBOBOX        OPT_ChessEngineName,17,74,194,129,CBS_DROPDOWN | \r
+                    200,10\r
+    COMBOBOX        OPT_ChessEngineName,17,74,244,129,CBS_DROPDOWN | \r
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        OPT_SecondChessEngineName,17,92,194,129,CBS_DROPDOWN | \r
+    COMBOBOX        OPT_SecondChessEngineName,17,92,244,129,CBS_DROPDOWN | \r
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
     LTEXT           "Specify Chess &Server:",IDC_SPECIFY_SERVER_STATIC,11,\r
-                    108,102,10\r
-    COMBOBOX        OPT_ChessServerName,17,122,194,129,CBS_DROPDOWN | \r
+                    108,200,10\r
+    COMBOBOX        OPT_ChessServerName,17,122,244,129,CBS_DROPDOWN | \r
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
     CONTROL         "&Additional options",OPT_AnyAdditional,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,11,142,71,10\r
-    EDITTEXT        OPT_AdditionalOptions,85,142,187,13,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,222,4,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,222,21,50,14\r
-    PUSHBUTTON      "&Help",IDM_HELPCONTENTS,222,38,50,14\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,11,142,91,10\r
+    EDITTEXT        OPT_AdditionalOptions,105,142,215,13,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,272,73,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,272,91,50,14\r
+    PUSHBUTTON      "&Help",IDM_HELPCONTENTS,272,109,50,14\r
 END\r
 \r
 DLG_IndexNumber DIALOG DISCARDABLE  0, 0, 236, 18\r
 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Inde&x number:",IDC_STATIC,5,2,46,8\r
+    LTEXT           "Inde&x number:",IDC_Index,5,2,46,8\r
     EDITTEXT        OPT_IndexNumber,54,0,155,13,ES_AUTOHSCROLL\r
 END\r
 \r
@@ -393,207 +420,235 @@ BEGIN
     EDITTEXT        OPT_Name,4,4,86,13,ES_AUTOHSCROLL\r
 END\r
 \r
-DLG_Sound DIALOG DISCARDABLE  0, 0, 242, 105\r
+DLG_Sound DIALOG DISCARDABLE  0, 0, 262, 105\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Sounds"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "&Event:",IDC_STATIC,4,7,26,9\r
-    COMBOBOX        CBO_Sounds,30,4,208,110,CBS_DROPDOWNLIST | WS_VSCROLL | \r
+    LTEXT           "&Event:",IDC_Event,4,7,46,9\r
+    COMBOBOX        CBO_Sounds,50,4,208,110,CBS_DROPDOWNLIST | WS_VSCROLL | \r
                     WS_TABSTOP\r
 //    GROUPBOX        "sound type",IDC_STATIC,8,18,66,62\r
     CONTROL         "&No sound",OPT_NoSound,"Button",BS_AUTORADIOBUTTON | \r
                     WS_GROUP | WS_TABSTOP,12,22,47,10\r
     CONTROL         "&Default beep",OPT_DefaultBeep,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,36,57,10\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,36,83,10\r
     CONTROL         "&Built-in sound:",OPT_BuiltInSound,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,51,60,10\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,51,83,10\r
     CONTROL         "&WAV file:",OPT_WavFile,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,12,66,45,10\r
-    COMBOBOX        OPT_BuiltInSoundName,76,48,103,109,CBS_DROPDOWNLIST | \r
+                    WS_TABSTOP,12,66,83,10\r
+    COMBOBOX        OPT_BuiltInSoundName,96,48,103,109,CBS_DROPDOWNLIST | \r
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_GROUP\r
-    EDITTEXT        OPT_WavFileName,76,65,103,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "B&rowse...",OPT_BrowseSound,188,64,50,14\r
+    EDITTEXT        OPT_WavFileName,96,65,103,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "B&rowse...",OPT_BrowseSound,208,64,50,14\r
+    PUSHBUTTON      "&Play",OPT_PlaySound,208,47,50,14\r
     PUSHBUTTON      "Defaults",OPT_DefaultSounds,6,86,50,14\r
-    DEFPUSHBUTTON   "OK",IDOK,132,86,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,188,86,50,14\r
-    PUSHBUTTON      "&Play",OPT_PlaySound,188,47,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,152,86,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,208,86,50,14\r
 END\r
 \r
-DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 250, 183\r
+DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 300, 225\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "General Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,110,164,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,166,164,50,14\r
     CONTROL         "Always on &Top",OPT_AlwaysOnTop,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,6,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,6,151,10\r
     CONTROL         "Highlight Last &Move",OPT_HighlightLastMove,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,6,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,6,151,10\r
     CONTROL         "Always &Queen            Ctrl+Shift+Q",OPT_AlwaysQueen,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,20,126,10\r
+                    WS_TABSTOP,4,20,151,10\r
     CONTROL         "Periodic &Updates",OPT_PeriodicUpdates,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,20,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,20,151,10\r
     CONTROL         "Animate &Dragging",OPT_AnimateDragging,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,34,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,34,151,10\r
     CONTROL         "Ponder &Next Move  Ctrl+Shift+P",OPT_PonderNextMove,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,34,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,34,151,10\r
     CONTROL         "&Animate Moving         Ctrl+Shift+A",OPT_AnimateMoving,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,48,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,48,151,10\r
     CONTROL         "&Popup Exit Message",OPT_PopupExitMessage,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,48,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,48,151,10\r
     CONTROL         "Auto &Flag                   Ctrl+Shift+F",OPT_AutoFlag,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,62,126,10\r
+                    WS_TABSTOP,4,62,151,10\r
     CONTROL         "Popup Move &Errors",OPT_PopupMoveErrors,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,62,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,62,151,10\r
     CONTROL         "Auto Flip &View",OPT_AutoFlipView,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,76,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,76,151,10\r
     CONTROL         "Show Butt&on Bar",OPT_ShowButtonBar,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,76,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,76,151,10\r
     CONTROL         "Auto &Raise Board",OPT_AutoRaiseBoard,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,90,71,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,90,151,10\r
     CONTROL         "Show &Coordinates",OPT_ShowCoordinates,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,90,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,90,151,10\r
     CONTROL         "&Blindfold",OPT_Blindfold,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,104,126,10\r
+                    WS_TABSTOP,4,104,151,10\r
     CONTROL         "&Send Engine Think",OPT_ShowThinking,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,104,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,104,151,10\r
     CONTROL         "Highlight Dra&gging",OPT_HighlightDragging,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,118,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,118,151,10\r
     CONTROL         "Test &Legality            Ctrl+Shift+L",OPT_TestLegality,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,118,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,118,151,10\r
     CONTROL         "E&xtended PGN Info    Ctrl+Shift+X",OPT_SaveExtPGN,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,132,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,132,151,10\r
     CONTROL         "&Hide Thinking          Ctrl+Shift+H",OPT_HideThinkFromHuman,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,132,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,132,151,10\r
     CONTROL         "&Info in Move History   Ctrl+Shift+I",OPT_ExtraInfoInMoveHistory,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,146,126,10\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,146,151,10\r
     CONTROL         "Highlight with Arro&w",OPT_HighlightMoveArrow,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,131,145,126,10\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,146,151,10\r
+    CONTROL         "Displa&y Logos",OPT_AutoLogo,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,160,151,10\r
+    CONTROL         "One-Click Move",OPT_SmartMove,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,160,151,10\r
+    CONTROL         "auto-Display Tags",OPT_AutoTags,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,174,151,10\r
+    CONTROL         "auto-Display Comment",OPT_AutoComment,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,174,151,10\r
+    CONTROL         "Headers in Engine Output",OPT_Headers,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,188,151,10\r
+    CONTROL         "Enable Variation Trees",OPT_Variations,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,188,151,10\r
+    CONTROL         "Play Analysis PV on Click",OPT_AutoExtend,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,202,151,10\r
+    DEFPUSHBUTTON   "OK",IDOK,180,206,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,236,206,50,14\r
 END\r
 \r
-DLG_IcsOptions DIALOGEX 0, 0, 302, 255\r
+DLG_IcsOptions DIALOGEX 0, 0, 302, 268\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,194,237,50,15\r
-    PUSHBUTTON      "Cancel",IDCANCEL,248,237,50,15\r
+    DEFPUSHBUTTON   "OK",IDOK,194,250,50,15\r
+    PUSHBUTTON      "Cancel",IDCANCEL,248,250,50,15\r
     CONTROL         "&Auto Comment",OPT_AutoComment,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,12,63,8\r
+                    WS_TABSTOP,10,12,73,8\r
+    CONTROL         "&Auto Kibitz",OPT_AutoKibitz,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,94,12,73,8\r
     CONTROL         "Auto &Observe",OPT_AutoObserve,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,25,63,8\r
+                    WS_TABSTOP,10,25,73,8\r
+    CONTROL         "Auto &Create Logon",OPT_AutoCreate,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,94,25,73,8\r
     CONTROL         "&Get Move List",OPT_GetMoveList,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,38,63,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,38,150,8\r
     CONTROL         "&Local Line Editing",OPT_LocalLineEditing,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,51,84,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,51,150,8\r
     CONTROL         "&Quiet Play",OPT_QuietPlay,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,64,63,8\r
+                    WS_TABSTOP,10,64,150,8\r
+    CONTROL         "See&k Graph",OPT_SeekGraph,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,77,73,8\r
+    CONTROL         "auto-&Refresh",OPT_AutoRefresh,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,94,77,73,8\r
+    CONTROL         "Bckgnd Obser&ve",OPT_BgObserve,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,90,73,8\r
+    CONTROL         "&Dual Board",OPT_DualBoard,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,94,90,73,8\r
     CONTROL         "&Premove",OPT_Premove,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,160,12,46,10\r
+                    WS_TABSTOP,180,12,117,10\r
     CONTROL         "&White first move",OPT_PremoveWhite,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,160,26,67,10\r
-    EDITTEXT        OPT_PremoveWhiteText,236,22,25,14,ES_AUTOHSCROLL\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,180,26,67,10\r
+    EDITTEXT        OPT_PremoveWhiteText,256,22,25,14,ES_AUTOHSCROLL\r
     CONTROL         "&Black first move",OPT_PremoveBlack,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,160,40,66,10\r
-    EDITTEXT        OPT_PremoveBlackText,236,38,25,14,ES_AUTOHSCROLL\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,180,40,66,10\r
+    EDITTEXT        OPT_PremoveBlackText,256,38,25,14,ES_AUTOHSCROLL\r
+    CONTROL         "One-Click &Move",OPT_SmartMove,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,180,54,117,10\r
     CONTROL         "&Sound alarm at",OPT_IcsAlarm,"Button",BS_AUTOCHECKBOX | \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
+                    WS_TABSTOP,180,85,63,10\r
+    EDITTEXT        OPT_IcsAlarmTime,244,81,18,14,ES_AUTOHSCROLL\r
+    LTEXT           "seconds",IDC_Sec,264,85,33,8\r
+    PUSHBUTTON      "Choose...",OPT_ChooseShoutColor,97,114,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseSShoutColor,97,134,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseChannel1Color,97,154,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseChannelColor,97,174,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseKibitzColor,97,194,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseTellColor,246,114,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseChallengeColor,246,134,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseRequestColor,246,154,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseSeekColor,246,174,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseNormalColor,246,194,45,15\r
+    PUSHBUTTON      "Background...",OPT_ChooseBackgroundColor,10,221,50,16\r
+    PUSHBUTTON      "&Defaults...",OPT_DefaultColors,68,221,50,16\r
     CONTROL         "Do &not colorize messages",OPT_DontColorize,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,192,212,97,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,192,225,97,10\r
     CONTROL         "",OPT_SampleShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,10,101,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,10,114,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleSShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,10,121,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,10,134,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleChannel1,"RICHEDIT",ES_CENTER | \r
                     ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,10,\r
-                    141,75,15,WS_EX_CLIENTEDGE\r
+                    154,75,15,WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleChannel,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,10,161,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,10,174,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleKibitz,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_GROUP,10,181,75,15,WS_EX_CLIENTEDGE\r
+                    ES_READONLY | WS_GROUP,10,194,75,15,WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleTell,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,101,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,114,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleChallenge,"RICHEDIT",ES_CENTER | \r
                     ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,159,\r
-                    121,75,15,WS_EX_CLIENTEDGE\r
+                    134,75,15,WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleRequest,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,141,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,154,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleSeek,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,161,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,174,75,15,\r
                     WS_EX_CLIENTEDGE\r
     CONTROL         "",OPT_SampleNormal,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
-                    ES_READONLY | WS_DISABLED | WS_GROUP,159,181,75,15,\r
+                    ES_READONLY | WS_DISABLED | WS_GROUP,159,194,75,15,\r
                     WS_EX_CLIENTEDGE\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
+    LTEXT           "Startup &Chat Boxes:",IDC_Boxes,4,251,65,8\r
+    EDITTEXT        OPT_StartupChatBoxes,72,249,90,14,ES_AUTOHSCROLL\r
+    GROUPBOX        "Interaction Colors",GPB_Colors,4,103,294,140\r
+    GROUPBOX        "Premove",GPB_Premove,174,0,124,69\r
+    GROUPBOX        "General",GPB_General,4,0,166,101\r
+    GROUPBOX        "Alarm",GPB_Alarm,174,71,124,30\r
 END\r
 \r
-DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 194, 250\r
+DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 224, 262\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Board Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,84,232,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14\r
     CONTROL         "&Tiny",OPT_SizeTiny,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_GROUP | WS_TABSTOP,9,14,50,10\r
+                    WS_GROUP,9,14,50,10\r
     CONTROL         "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,9,24,\r
-                    50,10\r
+                    60,10\r
     CONTROL         "&Dinky",OPT_SizeDinky,"Button",BS_AUTORADIOBUTTON,9,34,\r
-                    50,10\r
+                    60,10\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
+                    44,60,10\r
+    CONTROL         "Sl&im",OPT_SizeSlim,"Button",BS_AUTORADIOBUTTON,9,54,60,\r
                     10\r
     CONTROL         "&Small",OPT_SizeSmall,"Button",BS_AUTORADIOBUTTON,9,64,\r
-                    50,10\r
+                    60,10\r
     CONTROL         "Medi&ocre",OPT_SizeMediocre,"Button",BS_AUTORADIOBUTTON,\r
-                    70,14,50,10\r
+                    80,14,60,10\r
     CONTROL         "&Middling",OPT_SizeMiddling,"Button",BS_AUTORADIOBUTTON,\r
-                    70,24,50,10\r
+                    80,24,60,10\r
     CONTROL         "&Average",OPT_SizeAverage,"Button",BS_AUTORADIOBUTTON,\r
-                    70,34,50,10\r
+                    80,34,60,10\r
     CONTROL         "Mode&rate",OPT_SizeModerate,"Button",BS_AUTORADIOBUTTON,\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,134,\r
-                    14,50,10\r
-    CONTROL         "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,134,24,50,\r
+                    80,44,60,10\r
+    CONTROL         "Medi&um",OPT_SizeMedium,"Button",BS_AUTORADIOBUTTON,80,\r
+                    54,60,10\r
+    CONTROL         "Bul&ky",OPT_SizeBulky,"Button",BS_AUTORADIOBUTTON,80,64,\r
+                    60,10\r
+    CONTROL         "&Large",OPT_SizeLarge,"Button",BS_AUTORADIOBUTTON,154,\r
+                    14,60,10\r
+    CONTROL         "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,154,24,60,\r
                     10\r
-    CONTROL         "&Huge",OPT_SizeHuge,"Button",BS_AUTORADIOBUTTON,134,34,\r
-                    50,10\r
-    CONTROL         "&Giant",OPT_SizeGiant,"Button",BS_AUTORADIOBUTTON,134,\r
-                    44,50,10\r
+    CONTROL         "&Huge",OPT_SizeHuge,"Button",BS_AUTORADIOBUTTON,154,34,\r
+                    60,10\r
+    CONTROL         "&Giant",OPT_SizeGiant,"Button",BS_AUTORADIOBUTTON,154,\r
+                    44,60,10\r
     CONTROL         "&Colossal",OPT_SizeColossal,"Button",BS_AUTORADIOBUTTON,\r
-                    134,54,50,10\r
+                    154,54,60,10\r
     CONTROL         "Tita&nic",OPT_SizeTitanic,"Button",BS_AUTORADIOBUTTON,\r
-                    134,64,50,10\r
+                    154,64,60,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
@@ -603,9 +658,15 @@ BEGIN
     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
+                    WS_TABSTOP,140,179,73,10\r
     CONTROL         "Flip Black",OPT_UpsideDown,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,140,192,53,10\r
+                    WS_TABSTOP,140,191,73,10\r
+    CONTROL         "Use Board Textures",OPT_Bitmaps,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,140,203,73,10\r
+    CONTROL         "Use Piece Font",OPT_PieceFont,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,140,215,73,10\r
+    CONTROL         "Suppress Grid",OPT_Grid,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,140,227,73,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
@@ -617,106 +678,132 @@ BEGIN
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
     EDITTEXT        OPT_HighlightSquareColor,80,166,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    GROUPBOX        "Colors",IDC_STATIC,4,84,185,142\r
+    GROUPBOX        "Colors",GPB_Colors,4,84,215,154\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,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
+    LTEXT           "Light Squares",IDC_Light,10,98,60,10\r
+    LTEXT           "Dark Squares",IDC_Dark,10,116,60,10\r
+    LTEXT           "White Pieces",IDC_White,10,134,60,10\r
+    LTEXT           "Black Pieces",IDC_Black,10,152,60,10\r
+    LTEXT           "Square Highlights",IDC_High,10,170,60,10\r
+    LTEXT           "Premove Highlights",IDC_PreHigh,10,188,70,10\r
+    GROUPBOX        "Size",GPB_Size,4,4,215,75\r
     EDITTEXT        OPT_SampleLightSquare,144,96,39,36,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
     EDITTEXT        OPT_SampleDarkSquare,144,138,39,36,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
+    DEFPUSHBUTTON   "OK",IDOK,84,244,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,140,244,50,14\r
 END\r
 \r
-DLG_NewVariant DIALOG DISCARDABLE  0, 0, 194, 250\r
+DLG_NewVariant DIALOG DISCARDABLE  0, 0, 224, 270\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
+                    WS_GROUP,9,14,70,10\r
     CONTROL         "&FRC",OPT_VariantFRC,"Button",BS_AUTORADIOBUTTON,9,\r
-                    24,50,10\r
+                    24,70,10\r
     CONTROL         "&wildcastle",OPT_VariantWildcastle,"Button",BS_AUTORADIOBUTTON,9,34,\r
                     50,10\r
     CONTROL         "&nocastle",OPT_VariantNocastle,"Button",BS_AUTORADIOBUTTON,9,\r
-                    44,50,10\r
+                    44,70,10\r
     CONTROL         "&losers",OPT_VariantLosers,"Button",BS_AUTORADIOBUTTON,\r
-                    9,54,50,10\r
+                    9,54,70,10\r
     CONTROL         "&giveaway",OPT_VariantGiveaway,"Button",BS_AUTORADIOBUTTON,\r
-                    9,64,50,10\r
+                    9,64,70,10\r
     CONTROL         "s&uicide",OPT_VariantSuicide,"Button",BS_AUTORADIOBUTTON,\r
-                    9,74,50,10\r
+                    9,74,70,10\r
     CONTROL         "&3Check",OPT_Variant3Check,"Button",BS_AUTORADIOBUTTON,9,84,\r
-                    50,10\r
+                    70,10\r
     CONTROL         "&twokings",OPT_VariantTwoKings,"Button",BS_AUTORADIOBUTTON,9,94,\r
-                    50,10\r
+                    70,10\r
     CONTROL         "&atomic",OPT_VariantAtomic,"Button",BS_AUTORADIOBUTTON,\r
-                    9,104,50,10\r
-    CONTROL         "cra&zyhouse",OPT_VariantCrazyhouse,"Button",BS_AUTORADIOBUTTON,70,14,\r
-                    50,10\r
-    CONTROL         "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,70,24,50,\r
+                    9,104,70,10\r
+    CONTROL         "&Mighty Lion",OPT_VariantLion,"Button",BS_AUTORADIOBUTTON,\r
+                    9,114,70,10\r
+    CONTROL         "cra&zyhouse",OPT_VariantCrazyhouse,"Button",BS_AUTORADIOBUTTON,80,14,\r
+                    70,10\r
+    CONTROL         "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,80,24,70,\r
                     10\r
-    CONTROL         "&Twilight",OPT_VariantTwilight,"Button",BS_AUTORADIOBUTTON,70,34,50,\r
+    CONTROL         "Sp&artan",OPT_VariantSpartan,"Button",BS_AUTORADIOBUTTON,80,34,70,\r
                     10\r
-    CONTROL         "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,70,\r
-                    44,50,10\r
-    CONTROL         "su&per",OPT_VariantSuper,"Button",BS_AUTORADIOBUTTON,70,\r
-                    54,50,10\r
+    CONTROL         "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,80,\r
+                    44,70,10\r
+    CONTROL         "su&per",OPT_VariantSuper,"Button",BS_AUTORADIOBUTTON,80,\r
+                    54,70,10\r
     CONTROL         "&knightmate",OPT_VariantKnightmate,"Button",BS_AUTORADIOBUTTON,\r
-                    70,64,50,10\r
-    CONTROL         "&Berolina",OPT_VariantBerolina,"Button",BS_AUTORADIOBUTTON,70,74,\r
-                    50,10\r
-    CONTROL         "c&ylinder",OPT_VariantCylinder,"Button",BS_AUTORADIOBUTTON,70,\r
-                    84,50,10\r
-    CONTROL         "&fairy",OPT_VariantFairy,"Button",BS_AUTORADIOBUTTON,70,\r
-                    94,50,10\r
-    CONTROL         "&makruk",OPT_VariantMakruk,"Button",BS_AUTORADIOBUTTON,70,\r
-                    104,50,10\r
-    CONTROL         "&gothic",OPT_VariantGothic,"Button",BS_AUTORADIOBUTTON,134,14,\r
-                    50,10\r
-    CONTROL         "&capablanca",OPT_VariantCapablanca,"Button",BS_AUTORADIOBUTTON,134,\r
-                    24,50,10\r
-    CONTROL         "&Janus",OPT_VariantJanus,"Button",BS_AUTORADIOBUTTON,134,34,\r
-                    50,10\r
-    CONTROL         "&CRC",OPT_VariantCRC,"Button",BS_AUTORADIOBUTTON,134,44,\r
-                    50,10\r
-    CONTROL         "&Falcon",OPT_VariantFalcon,"Button",BS_AUTORADIOBUTTON,134,\r
-                    54,50,10\r
-    CONTROL         "cou&rier",OPT_VariantCourier,"Button",BS_AUTORADIOBUTTON,134,64,\r
-                    50,10\r
-    CONTROL         "&Great",OPT_VariantGreat,"Button",BS_AUTORADIOBUTTON,134,74,\r
-                    50,10\r
-    CONTROL         "&Shatranj",OPT_VariantShatranj,"Button",BS_AUTORADIOBUTTON,134,\r
-                    84,50,10\r
-    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,134,94,50,\r
+                    80,64,70,10\r
+    CONTROL         "&Berolina",OPT_VariantBerolina,"Button",BS_AUTORADIOBUTTON,80,74,\r
+                    70,10\r
+    CONTROL         "c&ylinder",OPT_VariantCylinder,"Button",BS_AUTORADIOBUTTON,80,\r
+                    84,70,10\r
+    CONTROL         "&fairy",OPT_VariantFairy,"Button",BS_AUTORADIOBUTTON,80,\r
+                    94,70,10\r
+    CONTROL         "&makruk",OPT_VariantMakruk,"Button",BS_AUTORADIOBUTTON,80,\r
+                    104,70,10\r
+    CONTROL         "&ASEAN",OPT_VariantASEAN,"Button",BS_AUTORADIOBUTTON,80,\r
+                    114,70,10\r
+    CONTROL         "&gothic",OPT_VariantGothic,"Button",BS_AUTORADIOBUTTON,154,14,\r
+                    70,10\r
+    CONTROL         "&capablanca",OPT_VariantCapablanca,"Button",BS_AUTORADIOBUTTON,154,\r
+                    24,70,10\r
+    CONTROL         "&Janus",OPT_VariantJanus,"Button",BS_AUTORADIOBUTTON,154,34,\r
+                    70,10\r
+    CONTROL         "&CRC",OPT_VariantCRC,"Button",BS_AUTORADIOBUTTON,154,44,\r
+                    70,10\r
+    CONTROL         "&Falcon",OPT_VariantFalcon,"Button",BS_AUTORADIOBUTTON,154,\r
+                    54,70,10\r
+    CONTROL         "cou&rier",OPT_VariantCourier,"Button",BS_AUTORADIOBUTTON,154,64,\r
+                    70,10\r
+    CONTROL         "&Great",OPT_VariantGreat,"Button",BS_AUTORADIOBUTTON,154,74,\r
+                    70,10\r
+    CONTROL         "&Shatranj",OPT_VariantShatranj,"Button",BS_AUTORADIOBUTTON,154,\r
+                    84,70,10\r
+    CONTROL         "Seira&wan",OPT_VariantSChess,"Button",BS_AUTORADIOBUTTON,154,94,70,\r
+                    10\r
+    CONTROL         "&Grand",OPT_VariantGrand,"Button",BS_AUTORADIOBUTTON,154,104,70,\r
                     10\r
-    GROUPBOX        "Variant",IDC_STATIC,4,4,185,115\r
-    LTEXT           "Board size:",IDC_STATIC,10,135,40,8\r
-    EDITTEXT        IDC_Ranks,60,131,14,14,ES_AUTOHSCROLL\r
-    LTEXT           "ranks",IDC_STATIC,77,135,22,8\r
-    EDITTEXT        IDC_Files,116,131,14,14,ES_AUTOHSCROLL\r
-    LTEXT           "files",IDC_STATIC,133,135,37,8\r
-    LTEXT           "Holdings with room for:",IDC_STATIC,10,153,90,8\r
-    EDITTEXT        IDC_Holdings,93,149,14,14,ES_AUTOHSCROLL\r
-    LTEXT           "pieces",IDC_STATIC,110,153,22,8\r
-    LTEXT           "('-1' means defaults for selected variant)",IDC_STATIC,10,171,150,8\r
+    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,154,114,70,\r
+                    10\r
+    CONTROL         "",OPT_EngineVariant+0,"Button",BS_AUTORADIOBUTTON,9,134,70,10\r
+    CONTROL         "",OPT_EngineVariant+1,"Button",BS_AUTORADIOBUTTON,80,134,70,10\r
+    CONTROL         "",OPT_EngineVariant+2,"Button",BS_AUTORADIOBUTTON,154,134,70,10\r
+    CONTROL         "",OPT_EngineVariant+3,"Button",BS_AUTORADIOBUTTON,9,144,70,10\r
+    CONTROL         "",OPT_EngineVariant+4,"Button",BS_AUTORADIOBUTTON,80,144,70,10\r
+    CONTROL         "",OPT_EngineVariant+5,"Button",BS_AUTORADIOBUTTON,154,144,70,10\r
+    CONTROL         "",OPT_EngineVariant+6,"Button",BS_AUTORADIOBUTTON,9,154,70,10\r
+\r
+    CONTROL         "",OPT_EngineVariant+7,"Button",BS_AUTORADIOBUTTON,80,154,70,10\r
+    CONTROL         "",OPT_EngineVariant+8,"Button",BS_AUTORADIOBUTTON,154,154,70,10\r
+    CONTROL         "",OPT_EngineVariant+9,"Button",BS_AUTORADIOBUTTON,9,164,70,10\r
+    CONTROL         "",OPT_EngineVariant+10,"Button",BS_AUTORADIOBUTTON,80,164,70,10\r
+    CONTROL         "",OPT_EngineVariant+11,"Button",BS_AUTORADIOBUTTON,154,164,70,10\r
+    CONTROL         "",OPT_EngineVariant+12,"Button",BS_AUTORADIOBUTTON,9,174,70,10\r
+    CONTROL         "",OPT_EngineVariant+13,"Button",BS_AUTORADIOBUTTON,80,174,70,10\r
+    CONTROL         "",OPT_EngineVariant+14,"Button",BS_AUTORADIOBUTTON,154,174,70,10\r
+    GROUPBOX        "Variant",GPB_Variant,4,4,215,185\r
+    LTEXT           "Board size:",GPB_Board,10,203,40,8,WS_TABSTOP\r
+    LTEXT           "ranks",IDC_Height,77,203,38,8\r
+    EDITTEXT        IDC_Ranks,60,199,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "files",IDC_Width,133,203,80,8\r
+    EDITTEXT        IDC_Files,116,199,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "Holdings with room for:",IDC_Hand,10,221,90,8\r
+    EDITTEXT        IDC_Holdings,93,217,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "pieces",IDC_Pieces,110,221,100,8\r
+    LTEXT           "('-1' means defaults for selected variant)",IDC_Def,10,237,210,8\r
+    DEFPUSHBUTTON   "OK",IDOK,114,252,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,170,252,50,14\r
 END\r
 \r
-DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 226\r
+DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 274\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Fonts"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,156,208,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,212,208,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,156,256,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,212,256,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
@@ -724,31 +811,41 @@ BEGIN
     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
+    PUSHBUTTON      "Choose...",OPT_ChooseGameListFont,212,198,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChoosePieceFont,212,222,45,15\r
+    PUSHBUTTON      "&Defaults",OPT_DefaultFonts,3,256,50,15\r
     CONTROL         "",OPT_SampleCoordFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,59,140,20\r
+                    WS_DISABLED | WS_BORDER,77,59,130,20\r
     CONTROL         "",OPT_SampleTagFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,97,140,20\r
+                    WS_DISABLED | WS_BORDER,77,97,130,20\r
     CONTROL         "",OPT_SampleCommentsFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,121,140,20\r
+                    WS_DISABLED | WS_BORDER,77,121,130,20\r
     CONTROL         "",OPT_SampleConsoleFont,"RICHEDIT",ES_READONLY | \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           "I C S Interaction",OPT_MessageFont5,13,150,50,10,NOT \r
+                    WS_DISABLED | WS_BORDER,77,145,130,20\r
+    LTEXT           "Clocks",OPT_ClockFont,13,16,63,10,NOT WS_GROUP\r
+    LTEXT           "Messages",OPT_MessageFont,13,40,63,10,NOT WS_GROUP\r
+    LTEXT           "Coordinates",OPT_CoordFont,13,64,63,10,NOT WS_GROUP\r
+    LTEXT           "Tags",OPT_EditTagsFont,13,102,63,10,NOT WS_GROUP\r
+    LTEXT           "Comments",OPT_CommentsFont,13,126,63,10,NOT WS_GROUP\r
+    LTEXT           "I C S Interaction",OPT_MessageFont5,13,150,63,10,NOT \r
                     WS_GROUP\r
     CONTROL         "",OPT_SampleClockFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,11,140,20\r
+                    WS_DISABLED | WS_BORDER,77,11,130,20\r
     CONTROL         "",OPT_SampleMessageFont,"RICHEDIT",ES_READONLY | \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
+                    WS_DISABLED | WS_BORDER,77,35,130,20\r
+    GROUPBOX        "Current Board Size",GPB_Current,3,1,259,83\r
+    GROUPBOX        "All Board Sizes",GPB_All,3,87,259,157\r
     CONTROL         "",OPT_SampleMoveHistoryFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,170,140,20\r
-    LTEXT           "Move History, Engine Output",OPT_MessageFont6,13,171,50,20,NOT \r
+                    WS_DISABLED | WS_BORDER,77,170,130,20\r
+    LTEXT           "Move History, Engine Output",OPT_MessageFont6,13,171,63,20,NOT \r
+                    WS_GROUP\r
+    CONTROL         "",OPT_SampleGameListFont,"RICHEDIT",ES_READONLY | \r
+                    WS_DISABLED | WS_BORDER,77,194,130,20\r
+    LTEXT           "Game List",OPT_MessageFont7,13,199,63,20,NOT \r
+                    WS_GROUP\r
+    CONTROL         "",OPT_SamplePieceFont,"RICHEDIT", ES_AUTOHSCROLL | \r
+                    WS_BORDER,77,218,130,20\r
+    LTEXT           "Piece Font",OPT_MessageFont8,13,223,63,20,NOT \r
                     WS_GROUP\r
 END\r
 \r
@@ -764,21 +861,21 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,122,28,50,14\r
 END\r
 \r
-DLG_GameListOptions DIALOG DISCARDABLE  0, 0, 206, 150\r
+DLG_GameListOptions DIALOG DISCARDABLE  0, 0, 218, 150\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,112,LBS_USETABSTOPS | \r
+    LTEXT           "PGN &Tags:",IDC_GLT,2,2,158,8\r
+    LISTBOX         IDC_GameListTags,2,12,153,112,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,92,38,14\r
-    PUSHBUTTON      "Factory",IDC_GLT_Default,164,110,38,14\r
-    DEFPUSHBUTTON   "OK",IDOK,96,132,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,152,132,50,14\r
-    LTEXT           "Restore to:",IDC_GLT_RestoreTo,164,80,36,8\r
+    PUSHBUTTON      "&Up",IDC_GLT_Up,164,12,50,14\r
+    PUSHBUTTON      "&Down",IDC_GLT_Down,164,30,50,14\r
+    PUSHBUTTON      "Default",IDC_GLT_Restore,164,92,50,14\r
+    PUSHBUTTON      "Factory",IDC_GLT_Default,164,110,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,108,132,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,164,132,50,14\r
+    LTEXT           "Restore to:",IDC_GLT_RestoreTo,159,80,58,8\r
 END\r
 \r
 DLG_MoveHistory DIALOGEX 0, 0, 225, 130\r
@@ -805,16 +902,16 @@ EXSTYLE WS_EX_TOOLWINDOW
 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
+    LTEXT           "Engine #1",IDC_EngineLabel1,14,2,84,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
+    RTEXT           "NPS",IDC_Engine2_NPS,210,84,55,8\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
@@ -823,101 +920,112 @@ BEGIN
     ICON            IDI_TRANS_14,IDC_StateIcon2,164,84,20,20\r
 END\r
 \r
-DLG_Chat DIALOGEX 0, 0, 256, 106\r
+DLG_Chat DIALOGEX 0, 0, 290, 106\r
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
 EXSTYLE WS_EX_TOOLWINDOW\r
 CAPTION "Chat Window"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Chat partner:",IDC_STATIC,5,5,45,10\r
-    EDITTEXT        IDC_ChatPartner,50,3,100,13,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "Change",IDC_Change,155,3,35,13\r
-    PUSHBUTTON      "Clear",IDC_Clear,198,3,25,13\r
-    DEFPUSHBUTTON   "Send",IDC_Send,228,3,25,13\r
+    LTEXT           "Chat partner:",IDC_Partner,5,5,45,10\r
+    EDITTEXT        IDC_ChatPartner,50,3,45,13,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "",IDC_Focus1,100,3,30,13\r
+    PUSHBUTTON      "",IDC_Focus2,133,3,30,13\r
+    PUSHBUTTON      "",IDC_Focus3,166,3,30,13\r
+    PUSHBUTTON      "",IDC_Focus4,199,3,30,13\r
+    PUSHBUTTON      "Clear",IDC_Clear,232,3,25,13\r
+    DEFPUSHBUTTON   "Send",IDC_Send,262,3,25,13\r
     CONTROL         "",IDC_ChatMemo,"RICHEDIT",ES_MULTILINE | ES_READONLY |\r
-                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | \r
-                    WS_HSCROLL | WS_TABSTOP,3,17,250,70\r
+                    ES_AUTOVSCROLL | WS_BORDER | WS_VSCROLL | \r
+                    WS_HSCROLL | WS_TABSTOP,3,17,284,70\r
     CONTROL         "",OPT_ChatInput,"RICHEDIT",ES_AUTOHSCROLL | ES_NOHIDESEL | \r
-                    WS_BORDER | WS_TABSTOP,3,90,250,13\r
+                    WS_BORDER | WS_TABSTOP,3,90,284,13\r
 END\r
 \r
-DLG_EnginePlayOptions DIALOG DISCARDABLE  0, 0, 208, 202\r
+DLG_EnginePlayOptions DIALOG DISCARDABLE  0, 0, 248, 202\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Adjudications"\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
+                    WS_TABSTOP,4,4,240,10\r
     CONTROL         "Enable and Show Thinking (recommended)",\r
                     IDC_EpShowThinking,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,\r
-                    4,16,152,10\r
+                    4,16,240,10\r
     CONTROL         "Hide Thinking when Playing against Human",\r
                     IDC_EpHideThinkingHuman,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,28,153,10\r
+                    WS_TABSTOP,4,28,240,10\r
     CONTROL         "Periodic Updates (for Analysis Mode)",\r
                     IDC_EpPeriodicUpdates,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,40,131,10\r
-    GROUPBOX        "Adjudications in non-ICS games",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
+                    WS_TABSTOP,4,40,240,10\r
+    GROUPBOX        "Adjudications in non-ICS games",GPB_Adjudications,4,56,240,98\r
+    LTEXT           "Adjudicate draw after:",IDC_Draw,10,72,124,8\r
+    EDITTEXT        IDC_EpDrawMoveCount,136,68,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "moves",IDC_Moves,178,72,22,8\r
+    LTEXT           "Win/loss adjudication threshold:",IDC_Threshold,10,90,124,\r
                     8\r
-    EDITTEXT        IDC_EpAdjudicationThreshold,116,86,40,14,ES_AUTOHSCROLL\r
-    LTEXT           "centipawns",IDC_STATIC,158,90,37,8\r
+    EDITTEXT        IDC_EpAdjudicationThreshold,136,86,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "centipawns",IDC_Centi,178,90,65,8\r
     CONTROL         "&Verify Engine Claims",IDC_TestClaims,"Button",BS_AUTOCHECKBOX |\r
-                    WS_TABSTOP,10,108,100,10\r
+                    WS_TABSTOP,10,108,119,10\r
     CONTROL         "Detect &Mates",\r
                     IDC_DetectMates,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,\r
-                    10,118,100,10\r
+                    10,118,119,10\r
     CONTROL         "Draw if &Insufficient Material",\r
                     IDC_MaterialDraws,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,128,100,10\r
+                    WS_TABSTOP,10,128,119,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
+                    WS_TABSTOP,10,138,119,10\r
+    GROUPBOX        "Apply",GPB_Apply,130,102,106,47\r
+    EDITTEXT        IDC_RuleMoves,135,113,20,14,ES_AUTOHSCROLL\r
+    LTEXT           "-move rule",IDC_Rule,157,117,75,8\r
+    EDITTEXT        IDC_DrawRepeats,135,130,20,14,ES_AUTOHSCROLL\r
+    LTEXT           "-fold repeats",IDC_Repeats,157,134,75,8\r
     CONTROL         "Engine #1 Score is Absolute",\r
                     IDC_ScoreAbs1,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,156,120,10\r
+                    WS_TABSTOP,10,156,140,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
+                    WS_TABSTOP,10,168,140,10\r
+    DEFPUSHBUTTON   "OK",IDOK,138,185,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,194,185,50,14\r
 END\r
 \r
-DLG_OptionsUCI DIALOG DISCARDABLE  0, 0, 228, 124\r
+DLG_OptionsUCI DIALOG DISCARDABLE  0, 0, 248, 160\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Engine Settings"\r
+CAPTION "Common Engine Settings"\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
+    LTEXT           "Polyglot Directory:",IDC_PolyDir,2,8,78,8\r
+    EDITTEXT        IDC_PolyglotDir,82,4,140,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",IDC_BrowseForPolyglotDir,226,4,17,14\r
+    LTEXT           "Hash Size (MB):",IDC_Hash,2,26,78,8\r
+    EDITTEXT        IDC_HashSize,82,22,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "Max nr of CPUs:",IDC_CPU,126,26,60,8\r
+    EDITTEXT        IDC_Cores,187,22,35,14,ES_AUTOHSCROLL\r
+    LTEXT           "EGTB Path:",IDC_Path,2,44,78,8\r
+    EDITTEXT        IDC_PathToEGTB,82,40,140,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",IDC_BrowseForEGTB,226,40,17,14\r
+    LTEXT           "EGTB Size (MB):",IDC_Cache,2,62,78,8\r
+    EDITTEXT        IDC_SizeOfEGTB,82,58,40,14,ES_AUTOHSCROLL\r
+    CONTROL         "Ponder Next Move",OPT_PonderNextMove,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,136,62,100,10\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
+                    WS_TABSTOP,2,80,78,10\r
+    EDITTEXT        IDC_BookFile,82,76,140,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",IDC_BrowseForBook,226,76,17,14\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
+    LTEXT           "Book Depth:",IDC_Depth,126,98,60,8\r
+    EDITTEXT        IDC_BookDep,187,94,35,14,ES_AUTOHSCROLL\r
+    LTEXT           "Book Variation:",IDC_Variation,126,116,60,8\r
+    EDITTEXT        IDC_BookStr,187,112,35,14,ES_AUTOHSCROLL\r
+    LTEXT           "Default Match Games:",IDC_DefGames,2,135,72,8\r
+    EDITTEXT        IDC_Games,82,131,28,14,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,128,142,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,194,142,50,14\r
 END\r
 \r
 DLG_Null DIALOG DISCARDABLE  0, 0, 186, 50\r
@@ -1056,6 +1164,7 @@ IDI_WHITE_14            ICON    DISCARDABLE     "bitmaps/white_14.ico"
 ICON_BLACK              ICON    DISCARDABLE     "bitmaps/icon_ob.ico"\r
 ICON_BOARD              ICON    DISCARDABLE     "bitmaps/board.ico"\r
 ICON_WHITE              ICON    DISCARDABLE     "bitmaps/icon_whi.ico"\r
+ICON_XTOURNEY           ICON    DISCARDABLE     "bitmaps/cross.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
@@ -1074,58 +1183,91 @@ WINBOARD MENU DISCARDABLE
 BEGIN\r
     POPUP "&File"\r
     BEGIN\r
-        MENUITEM "New &Game\tCtrl-N",           IDM_NewGame\r
-        MENUITEM "New Shuffle Game...",         IDM_NewGameFRC\r
-        MENUITEM "New Variant...\tAlt+Shift+V",  IDM_NewVariant\r
+        MENUITEM "&New Game\tCtrl-N",           IDM_NewGame\r
+        MENUITEM "New Sh&uffle Game...",        IDM_NewGameFRC\r
+        MENUITEM "New &Variant...\tAlt+Shift+V",IDM_NewVariant\r
         MENUITEM SEPARATOR\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...\tCtrl-S",       IDM_SaveGame\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "&Copy Game To Clipboard\tCtrl+C", IDM_CopyGame\r
-        MENUITEM "Paste Game &From Clipboard\tCtrl+V", IDM_PasteGame\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "Copy Game List to Clipboard", IDM_CopyGameListToClipboard\r
-        MENUITEM SEPARATOR\r
         MENUITEM "L&oad Position...\tCtrl+Shift+O", IDM_LoadPosition\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 "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 "Reload Sa&me Position",       IDM_ReloadPosition\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Save Game...\tCtrl-S",       IDM_SaveGame\r
         MENUITEM "S&ave Position...\tCtrl+Shift+S",IDM_SavePosition\r
-        MENUITEM "Save &Diagram...",            IDM_SaveDiagram\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Cop&y Position To Clipboard\tCtrl+Shift+C", \r
+        MENUITEM "Save as &Diagram...",         IDM_SaveDiagram\r
+        MENUITEM "Save Selected Games...",      IDM_SaveSelected\r
+        MENUITEM "Save Games to &Book",         IDM_CreateBook\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Quit",                       IDM_Exit\r
+    END\r
+    POPUP "&Edit"\r
+    BEGIN\r
+        MENUITEM "&Copy Game To Clipboard\tCtrl+C", IDM_CopyGame\r
+        MENUITEM "C&opy Position To Clipboard\tCtrl+Shift+C", \r
                                                 IDM_CopyPosition\r
-        MENUITEM "Pas&te Position From Clipboard\tCtrl+Shift+V", \r
+        MENUITEM "Copy Game List to Clipboard", IDM_CopyGameListToClipboard\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Paste Game From Clipboard\tCtrl+V", IDM_PasteGame\r
+        MENUITEM "P&aste Position From Clipboard\tCtrl+Shift+V", \r
                                                 IDM_PasteAny\r
         MENUITEM SEPARATOR\r
-        MENUITEM "E&xit",                       IDM_Exit\r
+        MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame2\r
+        MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition2\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Edit Ta&gs...",               IDM_EditTags\r
+        MENUITEM "Edit Co&mment...",            IDM_EditComment\r
+        MENUITEM "Edit Boo&k...",               IDM_EditBook\r
+        MENUITEM "Enter &Username...",          IDM_TypeInName\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Revert\tHome",               IDM_Revert\r
+        MENUITEM "&Annotate",                   IDM_Annotate\r
+        MENUITEM "&Truncate Game\tEnd",         IDM_TruncateGame\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Backward\tAlt+Left",         IDM_Backward\r
+        MENUITEM "&Forward\tAlt+Right",         IDM_Forward\r
+        MENUITEM "Back to &Start\tAlt+Home",    IDM_ToStart\r
+        MENUITEM "For&ward to End\tAlt+End",    IDM_ToEnd\r
+    END\r
+    POPUP "&View"\r
+    BEGIN\r
+        MENUITEM "Flip &View\tF2",              IDM_FlipView\r
+        MENUITEM "&Swap Clocks",                IDM_FlipClock\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Engine &Output\tAlt+Shift+O", IDM_ShowEngineOutput\r
+        MENUITEM "Move &History\tAlt+Shift+H",  IDM_ShowMoveHistory\r
+        MENUITEM "Evaluation &Graph\tAlt+Shift+E",IDM_ShowEvalGraph\r
+        MENUITEM "Game &List\tAlt+Shift+G",     IDM_ShowGameList\r
+        MENUITEM "Open &New Chat Window",       IDM_NewChat\r
+        MENUITEM "Type In &Move...\tAlt+I",     IDM_TypeInMove\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Tags",                       IDM_Tags\r
+        MENUITEM "&Comments",                   IDM_Comment\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Game List Tags...",          IDM_GameListOptions\r
+        MENUITEM "Colo&rs...",                  IDM_BoardOptions\r
+        MENUITEM "&Board Themes...",            IDM_ThemeOptions\r
+        MENUITEM "&Fonts...",                   IDM_Fonts\r
     END\r
     POPUP "&Mode"\r
     BEGIN\r
         MENUITEM "Machine &White\tCtrl+W",      IDM_MachineWhite\r
         MENUITEM "Machine &Black\tCtrl+B",      IDM_MachineBlack\r
-        MENUITEM "Two &Machines\tCtrl+T",       IDM_TwoMachines\r
-        MENUITEM "Machine Bot&h",               IDM_MachineBoth\r
+        MENUITEM "&Two Machines\tCtrl+T",       IDM_TwoMachines\r
+//        MENUITEM "Machine Both",                IDM_MachineBoth\r
         MENUITEM "&Analysis Mode\tCtrl+A",      IDM_AnalysisMode\r
-        MENUITEM "Analyze &File\tCtrl+F",       IDM_AnalyzeFile\r
-        MENUITEM "&ICS Client",                 IDM_IcsClient\r
-        MENUITEM "Edit &Game\tCtrl+E",          IDM_EditGame\r
-        MENUITEM "&Edit Position\tShift+Ctrl+E",IDM_EditPosition\r
+        MENUITEM "Analyze &Game\tCtrl+G",       IDM_AnalyzeFile\r
+        MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame\r
+        MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition\r
         MENUITEM "Trai&ning",                   IDM_Training, GRAYED\r
+        MENUITEM "&ICS Client",                 IDM_IcsClient\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Show Engine &Output\tAlt+Shift+O",  IDM_ShowEngineOutput\r
-        MENUITEM "Show Evaluation Graph\tAlt+Shift+E",IDM_ShowEvalGraph\r
-        MENUITEM "Show Game &List\tAlt+Shift+G",      IDM_ShowGameList\r
-        MENUITEM "Show Move History\tAlt+Shift+H",    IDM_ShowMoveHistory\r
-        MENUITEM "Open Chat Window",            IDM_NewChat\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "Edit &Tags...",               IDM_EditTags\r
-        MENUITEM "Edit &Comment...",            IDM_EditComment\r
-        MENUITEM "Enter &Username...",          IDM_TypeInName\r
+        MENUITEM "&Machine Match",              IDM_Match\r
         MENUITEM "&Pause\tPause",               IDM_Pause\r
     END\r
     POPUP "&Action"\r
@@ -1142,46 +1284,45 @@ BEGIN
         MENUITEM SEPARATOR\r
         MENUITEM "Stop &Observing\tF10",        IDM_StopObserving\r
         MENUITEM "Stop E&xamining\tF11",        IDM_StopExamining\r
+        MENUITEM "&Upload to Examine",          IDM_Upload\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
+    POPUP "E&ngine"\r
     BEGIN\r
-        MENUITEM "T&ype In Move...\tAlt+I",     IDM_TypeInMove\r
+        MENUITEM "&Edit Engine List...",        IDM_EditProgs1\r
+        MENUITEM "Load &First Engine...",       IDM_LoadProg1\r
+        MENUITEM "Load &Second Engine...",      IDM_LoadProg2\r
         MENUITEM SEPARATOR\r
-        MENUITEM "&Backward\tAlt+Left",         IDM_Backward\r
-        MENUITEM "&Forward\tAlt+Right",         IDM_Forward\r
-        MENUITEM "Back to &Start\tAlt+Home",    IDM_ToStart\r
-        MENUITEM "Forward to &End\tAlt+End",    IDM_ToEnd\r
-        MENUITEM "Re&vert",                     IDM_Revert\r
-        MENUITEM "&Truncate Game",              IDM_TruncateGame\r
+        MENUITEM "&Common Settings...\tAlt+Shift+U",IDM_OptionsUCI\r
+        MENUITEM "Engine #&1 Settings...",      IDM_Engine1Options\r
+        MENUITEM "Engine #&2 Settings...",      IDM_Engine2Options\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Hint...",                    IDM_Hint\r
+        MENUITEM "&Book...",                    IDM_Book\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Move Now\tCtrl+M",           IDM_MoveNow\r
         MENUITEM "&Retract Move\tCtrl+X",       IDM_RetractMove\r
     END\r
     POPUP "&Options"\r
     BEGIN\r
-        MENUITEM "Flip &View\tF2",              IDM_FlipView\r
-        MENUITEM "Swap &Clocks",                IDM_FlipClock\r
         MENUITEM "&Mute all Sounds",            IDM_MuteSounds\r
         MENUITEM SEPARATOR\r
         MENUITEM "&General...",                 IDM_GeneralOptions\r
-        MENUITEM "&Board...",                   IDM_BoardOptions\r
-        MENUITEM "Adjudications...\tAlt+Shift+J",IDM_EnginePlayOptions\r
-        MENUITEM "Global Settings...\tAlt+Shift+U",IDM_OptionsUCI\r
-        MENUITEM "Engine #1 Settings...",       IDM_Engine1Options\r
-        MENUITEM "Engine #2 Settings...",       IDM_Engine2Options\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 "&Time Control...\tAlt+Shift+T",IDM_TimeControl\r
+        MENUITEM "Ad&judications...\tAlt+Shift+J",IDM_EnginePlayOptions\r
+        MENUITEM "Tournament...",               IDM_Tourney\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Comm&unications...",          IDM_CommPort\r
         MENUITEM "&Load Game...\tAlt+Shift+L",  IDM_LoadOptions\r
         MENUITEM "&Save Game...\tAlt+Shift+S",  IDM_SaveOptions\r
-        MENUITEM "&Time Control...\tAlt+Shift+T",IDM_TimeControl\r
+        MENUITEM "G&ame List...",               IDM_GameListOptions\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Soun&ds...",                  IDM_Sounds\r
+        MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED\r
+        MENUITEM "Add ICS...",                  IDM_EditServers\r
+        MENUITEM "Comm&unications...",          IDM_CommPort\r
         MENUITEM SEPARATOR\r
         MENUITEM "Save Settings &Now",          IDM_SaveSettings\r
         MENUITEM "Save Settings on E&xit",      IDM_SaveSettingsOnExit\r
@@ -1192,9 +1333,6 @@ BEGIN
         MENUITEM "Help &Index",                 IDM_HELPSEARCH\r
         MENUITEM "How to &Use Help",            IDM_HELPHELP\r
         MENUITEM SEPARATOR\r
-        MENUITEM "&Hint...",                    IDM_Hint\r
-        MENUITEM "&Book...",                    IDM_Book\r
-        MENUITEM SEPARATOR\r
         MENUITEM "&About WinBoard",             IDM_ABOUT\r
     END\r
 END\r
@@ -1391,7 +1529,8 @@ BEGIN
     "T",            IDM_TwoMachines,        VIRTKEY, CONTROL, NOINVERT\r
     "E",            IDM_EditGame,           VIRTKEY, CONTROL, NOINVERT\r
     "E",            IDM_EditPosition,       VIRTKEY, SHIFT, CONTROL, NOINVERT\r
-    "F",            IDM_AnalyzeFile,        VIRTKEY, CONTROL, NOINVERT\r
+    "D",            IDM_Debug,              VIRTKEY, CONTROL, NOINVERT\r
+    "G",            IDM_AnalyzeFile,        VIRTKEY, CONTROL, NOINVERT\r
     "M",            IDM_MoveNow,            VIRTKEY, CONTROL, NOINVERT\r
     "X",            IDM_RetractMove,        VIRTKEY, CONTROL, NOINVERT\r
     VK_DOWN,        IDM_ToEnd,              VIRTKEY, ALT, NOINVERT\r
@@ -1425,18 +1564,20 @@ END
 NO_ALT ACCELERATORS MOVEABLE PURE \r
 BEGIN\r
     VK_DELETE,      IDM_RetractMove,        VIRTKEY, NOINVERT\r
+    VK_INSERT,      IDM_MoveNow,            VIRTKEY, NOINVERT\r
+#ifndef JAWS\r
     VK_END,         IDM_TruncateGame,       VIRTKEY, NOINVERT\r
     VK_HOME,        IDM_Revert,             VIRTKEY, NOINVERT\r
-    VK_INSERT,      IDM_MoveNow,            VIRTKEY, NOINVERT\r
     VK_NEXT,        IDM_LoadNextGame,       VIRTKEY, NOINVERT\r
     VK_NEXT,        IDM_LoadNextPosition,   VIRTKEY, SHIFT, NOINVERT\r
     VK_PRIOR,       IDM_LoadPrevGame,       VIRTKEY, NOINVERT\r
     VK_PRIOR,       IDM_LoadPrevPosition,   VIRTKEY, SHIFT, NOINVERT\r
-#ifndef JAWS\r
     VK_LEFT,        IDM_Backward,           VIRTKEY, NOINVERT\r
     VK_RIGHT,       IDM_Forward,            VIRTKEY, NOINVERT\r
     VK_DOWN,        IDM_ToEnd,              VIRTKEY, NOINVERT\r
     VK_UP,          IDM_ToStart,            VIRTKEY, NOINVERT\r
+    VK_DOWN,        OPT_GameListNext,       VIRTKEY, CONTROL, NOINVERT\r
+    VK_UP,          OPT_GameListPrev,       VIRTKEY, CONTROL, NOINVERT\r
 #endif\r
 END\r
 \r
@@ -1795,6 +1936,10 @@ V72O                    BITMAP  MOVEABLE PURE   "bitmaps/v72o.bmp"
 S72O                    BITMAP  MOVEABLE PURE   "bitmaps/s72o.bmp"\r
 L72O                    BITMAP  MOVEABLE PURE   "bitmaps/l72o.bmp"\r
 DK72O                   BITMAP  MOVEABLE PURE   "bitmaps/dk72o.bmp"\r
+LN72O                   BITMAP  MOVEABLE PURE   "bitmaps/ln72o.bmp"\r
+WOLF72O                 BITMAP  MOVEABLE PURE   "bitmaps/wolf72o.bmp"\r
+CAMEL72O                BITMAP  MOVEABLE PURE   "bitmaps/camel72o.bmp"\r
+ZEBRA72O                BITMAP  MOVEABLE PURE   "bitmaps/zebra72o.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
@@ -1815,6 +1960,10 @@ V72S                    BITMAP  MOVEABLE PURE   "bitmaps/v72s.bmp"
 S72S                    BITMAP  MOVEABLE PURE   "bitmaps/s72s.bmp"\r
 L72S                    BITMAP  MOVEABLE PURE   "bitmaps/l72s.bmp"\r
 DK72S                   BITMAP  MOVEABLE PURE   "bitmaps/dk72s.bmp"\r
+LN72S                   BITMAP  MOVEABLE PURE   "bitmaps/ln72s.bmp"\r
+WOLF72S                 BITMAP  MOVEABLE PURE   "bitmaps/wolf72s.bmp"\r
+CAMEL72S                BITMAP  MOVEABLE PURE   "bitmaps/camel72s.bmp"\r
+ZEBRA72S                BITMAP  MOVEABLE PURE   "bitmaps/zebra72s.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
@@ -1835,6 +1984,9 @@ V72W                    BITMAP  MOVEABLE PURE   "bitmaps/v72w.bmp"
 S72W                    BITMAP  MOVEABLE PURE   "bitmaps/s72w.bmp"\r
 L72W                    BITMAP  MOVEABLE PURE   "bitmaps/l72w.bmp"\r
 DK72W                   BITMAP  MOVEABLE PURE   "bitmaps/dk72w.bmp"\r
+LN72W                   BITMAP  MOVEABLE PURE   "bitmaps/ln72w.bmp"\r
+WOLF72W                 BITMAP  MOVEABLE PURE   "bitmaps/wolf72w.bmp"\r
+CAMEL72W                BITMAP  MOVEABLE PURE   "bitmaps/camel72w.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
@@ -1851,6 +2003,10 @@ V49O                    BITMAP  MOVEABLE PURE   "bitmaps/v49o.bmp"
 S49O                    BITMAP  MOVEABLE PURE   "bitmaps/s49o.bmp"\r
 L49O                    BITMAP  MOVEABLE PURE   "bitmaps/l49o.bmp"\r
 DK49O                   BITMAP  MOVEABLE PURE   "bitmaps/dk49o.bmp"\r
+LN49O                   BITMAP  MOVEABLE PURE   "bitmaps/ln49o.bmp"\r
+WOLF49O                 BITMAP  MOVEABLE PURE   "bitmaps/wolf49o.bmp"\r
+CAMEL49O                BITMAP  MOVEABLE PURE   "bitmaps/camel49o.bmp"\r
+ZEBRA49O                BITMAP  MOVEABLE PURE   "bitmaps/zebra49o.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
@@ -1861,6 +2017,7 @@ AA49S                   BITMAP  MOVEABLE PURE   "bitmaps/as49s.bmp"
 C49S                    BITMAP  MOVEABLE PURE   "bitmaps/c49s.bmp"\r
 CV49S                   BITMAP  MOVEABLE PURE   "bitmaps/cv49s.bmp"\r
 F49S                    BITMAP  MOVEABLE PURE   "bitmaps/f49s.bmp"\r
+\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
@@ -1871,6 +2028,10 @@ V49S                    BITMAP  MOVEABLE PURE   "bitmaps/v49s.bmp"
 S49S                    BITMAP  MOVEABLE PURE   "bitmaps/s49s.bmp"\r
 L49S                    BITMAP  MOVEABLE PURE   "bitmaps/l49s.bmp"\r
 DK49S                   BITMAP  MOVEABLE PURE   "bitmaps/dk49s.bmp"\r
+LN49S                   BITMAP  MOVEABLE PURE   "bitmaps/ln49s.bmp"\r
+WOLF49S                 BITMAP  MOVEABLE PURE   "bitmaps/wolf49s.bmp"\r
+CAMEL49S                BITMAP  MOVEABLE PURE   "bitmaps/camel49s.bmp"\r
+ZEBRA49S                BITMAP  MOVEABLE PURE   "bitmaps/zebra49s.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
@@ -1891,6 +2052,9 @@ V49W                    BITMAP  MOVEABLE PURE   "bitmaps/v49w.bmp"
 S49W                    BITMAP  MOVEABLE PURE   "bitmaps/s49w.bmp"\r
 L49W                    BITMAP  MOVEABLE PURE   "bitmaps/l49w.bmp"\r
 DK49W                   BITMAP  MOVEABLE PURE   "bitmaps/dk49w.bmp"\r
+LN49W                   BITMAP  MOVEABLE PURE   "bitmaps/ln49w.bmp"\r
+WOLF49W                 BITMAP  MOVEABLE PURE   "bitmaps/wolf49w.bmp"\r
+CAMEL49W                BITMAP  MOVEABLE PURE   "bitmaps/camel49w.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
@@ -1905,6 +2069,11 @@ W33O                    BITMAP  MOVEABLE PURE   "bitmaps/w33o.bmp"
 M33O                    BITMAP  MOVEABLE PURE   "bitmaps/m33o.bmp"\r
 O33O                    BITMAP  MOVEABLE PURE   "bitmaps/o33o.bmp"\r
 DK33O                   BITMAP  MOVEABLE PURE   "bitmaps/dk33o.bmp"\r
+LN33O                   BITMAP  MOVEABLE PURE   "bitmaps/ln33o.bmp"\r
+WP33O                   BITMAP  MOVEABLE PURE   "bitmaps/wp33o.bmp"\r
+WN33O                   BITMAP  MOVEABLE PURE   "bitmaps/wn33o.bmp"\r
+WL33O                   BITMAP  MOVEABLE PURE   "bitmaps/wl33o.bmp"\r
+WS33O                   BITMAP  MOVEABLE PURE   "bitmaps/ws33o.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
@@ -1919,6 +2088,7 @@ W33W                    BITMAP  MOVEABLE PURE   "bitmaps/w33w.bmp"
 M33W                    BITMAP  MOVEABLE PURE   "bitmaps/m33w.bmp"\r
 O33W                    BITMAP  MOVEABLE PURE   "bitmaps/o33w.bmp"\r
 DK33W                   BITMAP  MOVEABLE PURE   "bitmaps/dk33w.bmp"\r
+LN33W                   BITMAP  MOVEABLE PURE   "bitmaps/ln33w.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
@@ -1933,6 +2103,11 @@ W33S                    BITMAP  MOVEABLE PURE   "bitmaps/w33s.bmp"
 M33S                    BITMAP  MOVEABLE PURE   "bitmaps/m33s.bmp"\r
 O33S                    BITMAP  MOVEABLE PURE   "bitmaps/o33s.bmp"\r
 DK33S                   BITMAP  MOVEABLE PURE   "bitmaps/dk33s.bmp"\r
+LN33S                   BITMAP  MOVEABLE PURE   "bitmaps/ln33s.bmp"\r
+WP33S                   BITMAP  MOVEABLE PURE   "bitmaps/wp33s.bmp"\r
+WN33S                   BITMAP  MOVEABLE PURE   "bitmaps/wn33s.bmp"\r
+WL33S                   BITMAP  MOVEABLE PURE   "bitmaps/wl33s.bmp"\r
+WS33S                   BITMAP  MOVEABLE PURE   "bitmaps/ws33s.bmp"\r
 \r
 A37O                    BITMAP  MOVEABLE PURE   "bitmaps/a37o.bmp"\r
 L37O                    BITMAP  MOVEABLE PURE   "bitmaps/l37o.bmp"\r
@@ -2095,6 +2270,7 @@ SSHOUT                  WAVE    DISCARDABLE     "sounds/sshout.wav"
 TELL                    WAVE    DISCARDABLE     "sounds/tell.wav"\r
 UNFINISHED              WAVE    DISCARDABLE     "sounds/unfinished.wav"\r
 WIN                     WAVE    DISCARDABLE     "sounds/win.wav"\r
+ROAR                    WAVE    DISCARDABLE     "sounds/roar.wav"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r