diff --git a/wince/xwords.vcp b/wince/xwords.vcp
index fbd94d0de..7cca8d1ae 100644
--- a/wince/xwords.vcp
+++ b/wince/xwords.vcp
@@ -49,10 +49,10 @@ CFG=xwords - Win32 (WCE ARM) Debug
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-# ADD RSC /l 0x409 /d "NDEBUG" /d "ARM" /d "_ARM_" /d "FEATURE_TRAY_EDIT" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "MY_COLOR_SEL" /r
+# ADD RSC /l 0x409 /d "NDEBUG" /d "ARM" /d "_ARM_" /d "FEATURE_TRAY_EDIT" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "MY_COLOR_SEL" /d "XWFEATURE_SEARCHLIMIT" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "../common" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "XWFEATURE_CE_EDITCOLORS" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /D "MY_COLOR_SEL" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "." /I "../common" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "XWFEATURE_CE_EDITCOLORS" /D "XWFEATURE_SEARCHLIMIT" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /D "MY_COLOR_SEL" /YX /Oxs /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -83,10 +83,10 @@ LINK32=link.exe
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-# ADD RSC /l 0x409 /d "DEBUG" /d "ARM" /d "_ARM_" /d "FEATURE_TRAY_EDIT" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "MY_COLOR_SEL" /r
+# ADD RSC /l 0x409 /d "DEBUG" /d "ARM" /d "_ARM_" /d "FEATURE_TRAY_EDIT" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "MY_COLOR_SEL" /d "XWFEATURE_SEARCHLIMIT" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "../common" /D "DEBUG" /D "ARM" /D "_ARM_" /D "XWFEATURE_CE_EDITCOLORS" /D "MY_COLOR_SEL" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "../common" /D "DEBUG" /D "ARM" /D "_ARM_" /D "XWFEATURE_CE_EDITCOLORS" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /D "MY_COLOR_SEL" /D "XWFEATURE_SEARCHLIMIT" /YX /M$(CECrtMTDebug) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -116,10 +116,10 @@ LINK32=link.exe
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_X86_" /d "x86" /d "_i386_" /d "FEATURE_TRAY_EDIT" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "MY_COLOR_SEL" /r
+# ADD RSC /l 0x409 /d "NDEBUG" /d "_X86_" /d "x86" /d "_i386_" /d "FEATURE_TRAY_EDIT" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "MY_COLOR_SEL" /d "XWFEATURE_SEARCHLIMIT" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /Oxs /c
-# ADD CPP /nologo /W3 /I "." /I "../common" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "NDEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /D "XWFEATURE_CE_EDITCOLORS" /D "MY_COLOR_SEL" /YX /Gs8192 /GF /Oxs /c
+# ADD CPP /nologo /W3 /I "." /I "../common" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "XWFEATURE_CE_EDITCOLORS" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /D "MY_COLOR_SEL" /D "XWFEATURE_SEARCHLIMIT" /YX /Gs8192 /GF /Oxs /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -150,10 +150,10 @@ LINK32=link.exe
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
-# ADD RSC /l 0x409 /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /d "FEATURE_TRAY_EDIT" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "MY_COLOR_SEL" /r
+# ADD RSC /l 0x409 /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /d "FEATURE_TRAY_EDIT" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "MY_COLOR_SEL" /d "XWFEATURE_SEARCHLIMIT" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "../common" /D "DEBUG" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /D "MY_COLOR_SEL" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "../common" /D "DEBUG" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /D "MY_COLOR_SEL" /D "XWFEATURE_SEARCHLIMIT" /YX /Gs8192 /GF /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -893,6 +893,101 @@ DEP_CPP_CEGIN=\
 	".\xwords4.h"\
 	
 
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\cehntlim.c
+
+!IF  "$(CFG)" == "xwords - Win32 (WCE ARM) Release"
+
+DEP_CPP_CEHNT=\
+	"..\common\board.h"\
+	"..\common\commmgr.h"\
+	"..\common\comms.h"\
+	"..\common\comtypes.h"\
+	"..\common\dawg.h"\
+	"..\common\dictnry.h"\
+	"..\common\draw.h"\
+	"..\common\game.h"\
+	"..\common\mempool.h"\
+	"..\common\model.h"\
+	"..\common\server.h"\
+	"..\common\xwstream.h"\
+	".\cehntlim.h"\
+	".\cemain.h"\
+	".\stdafx.h"\
+	".\xptypes.h"\
+	".\xwords4.h"\
+	
+
+!ELSEIF  "$(CFG)" == "xwords - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CEHNT=\
+	"..\common\board.h"\
+	"..\common\commmgr.h"\
+	"..\common\comms.h"\
+	"..\common\comtypes.h"\
+	"..\common\dawg.h"\
+	"..\common\dictnry.h"\
+	"..\common\draw.h"\
+	"..\common\game.h"\
+	"..\common\mempool.h"\
+	"..\common\model.h"\
+	"..\common\server.h"\
+	"..\common\xwstream.h"\
+	".\cehntlim.h"\
+	".\cemain.h"\
+	".\stdafx.h"\
+	".\xptypes.h"\
+	".\xwords4.h"\
+	
+
+!ELSEIF  "$(CFG)" == "xwords - Win32 (WCE x86) Release"
+
+DEP_CPP_CEHNT=\
+	"..\common\board.h"\
+	"..\common\commmgr.h"\
+	"..\common\comms.h"\
+	"..\common\comtypes.h"\
+	"..\common\dawg.h"\
+	"..\common\dictnry.h"\
+	"..\common\draw.h"\
+	"..\common\game.h"\
+	"..\common\mempool.h"\
+	"..\common\model.h"\
+	"..\common\server.h"\
+	"..\common\xwstream.h"\
+	".\cehntlim.h"\
+	".\cemain.h"\
+	".\stdafx.h"\
+	".\xptypes.h"\
+	".\xwords4.h"\
+	
+
+!ELSEIF  "$(CFG)" == "xwords - Win32 (WCE x86) Debug"
+
+DEP_CPP_CEHNT=\
+	"..\common\board.h"\
+	"..\common\commmgr.h"\
+	"..\common\comms.h"\
+	"..\common\comtypes.h"\
+	"..\common\dawg.h"\
+	"..\common\dictnry.h"\
+	"..\common\draw.h"\
+	"..\common\game.h"\
+	"..\common\mempool.h"\
+	"..\common\model.h"\
+	"..\common\server.h"\
+	"..\common\xwstream.h"\
+	".\cehntlim.h"\
+	".\cemain.h"\
+	".\stdafx.h"\
+	".\xptypes.h"\
+	".\xwords4.h"\
+	
+
 !ENDIF 
 
 # End Source File
@@ -1028,6 +1123,7 @@ DEP_CPP_CEMAI=\
 	".\cedefines.h"\
 	".\cedict.h"\
 	".\ceginfo.h"\
+	".\cehntlim.h"\
 	".\ceir.h"\
 	".\cemain.h"\
 	".\ceprefs.h"\