diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index 974748fe0e..3e1836820c 100644
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -23,10 +23,11 @@ BCCDIR = $(MAKEDIR)\..
 
 MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
-	-DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" -DUNICODE="$(UNICODE)" \
-	-DMSLU="$(MSLU)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
-	-DDEBUG_FLAG="$(DEBUG_FLAG)" -DMONOLITHIC="$(MONOLITHIC)" \
-	-DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" -DUSE_XRC="$(USE_XRC)" \
+	-DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \
+	-DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
+	-DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
+	-DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
+	-DUSE_HTML="$(USE_HTML)" -DUSE_XRC="$(USE_XRC)" \
 	-DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
 	-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
 	-DUSE_THREADS="$(USE_THREADS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
@@ -41,7 +42,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Targets: ###
 
-all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -203,10 +204,6 @@ clean:
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>menu.bat
 	call menu.bat
 	@del menu.bat
-	@echo cd mfc >mfc.bat
-	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mfc.bat
-	call mfc.bat
-	@del mfc.bat
 	@echo cd minifram >minifram.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>minifram.bat
 	call minifram.bat
@@ -267,10 +264,6 @@ clean:
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>render.bat
 	call render.bat
 	@del render.bat
-	@echo cd richedit >richedit.bat
-	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>richedit.bat
-	call richedit.bat
-	@del richedit.bat
 	@echo cd rotate >rotate.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>rotate.bat
 	call rotate.bat
@@ -351,6 +344,10 @@ clean:
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wizard.bat
 	call wizard.bat
 	@del wizard.bat
+	@echo cd mfc >mfc.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mfc.bat
+	call mfc.bat
+	@del mfc.bat
 
 access: 
 	@echo cd access >access.bat
@@ -586,12 +583,6 @@ menu:
 	call menu.bat
 	@del menu.bat
 
-mfc: 
-	@echo cd mfc >mfc.bat
-	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mfc.bat
-	call mfc.bat
-	@del mfc.bat
-
 minifram: 
 	@echo cd minifram >minifram.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>minifram.bat
@@ -682,12 +673,6 @@ render:
 	call render.bat
 	@del render.bat
 
-richedit: 
-	@echo cd richedit >richedit.bat
-	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richedit.bat
-	call richedit.bat
-	@del richedit.bat
-
 rotate: 
 	@echo cd rotate >rotate.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>rotate.bat
@@ -808,3 +793,9 @@ wizard:
 	call wizard.bat
 	@del wizard.bat
 
+mfc: 
+	@echo cd mfc >mfc.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mfc.bat
+	call mfc.bat
+	@del mfc.bat
+
diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 8dcf0d7bfd..f19206d73f 100644
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -13,7 +13,7 @@ include ../build/msw/config.gcc
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
 	WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
 	DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
 	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
@@ -31,7 +31,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 clean: 
 	-if exist .\*.o del .\*.o
@@ -75,7 +75,6 @@ clean:
 	$(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean
-	$(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C minifram -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) clean
@@ -91,7 +90,6 @@ clean:
 	$(MAKE) -C propsize -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean
-	$(MAKE) -C richedit -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C rotate -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean
@@ -112,6 +110,7 @@ clean:
 	$(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
+	$(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean
 
 access: 
 	$(MAKE) -C access -f makefile.gcc $(MAKEARGS) all
@@ -230,9 +229,6 @@ memcheck:
 menu: 
 	$(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all
 
-mfc: 
-	$(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
-
 minifram: 
 	$(MAKE) -C minifram -f makefile.gcc $(MAKEARGS) all
 
@@ -278,9 +274,6 @@ regtest:
 render: 
 	$(MAKE) -C render -f makefile.gcc $(MAKEARGS) all
 
-richedit: 
-	$(MAKE) -C richedit -f makefile.gcc $(MAKEARGS) all
-
 rotate: 
 	$(MAKE) -C rotate -f makefile.gcc $(MAKEARGS) all
 
@@ -341,7 +334,10 @@ widgets:
 wizard: 
 	$(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+mfc: 
+	$(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 
 # Dependencies tracking:
diff --git a/samples/makefile.vc b/samples/makefile.vc
index 347c004a6b..8a089161f5 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -13,7 +13,7 @@
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
 	WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
 	TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
 	DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
@@ -32,7 +32,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: sub_access sub_artprov sub_calendar sub_caret sub_checklst sub_config sub_console sub_controls sub_db sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_dynamic sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listbox sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minifram sub_minimal sub_mobile sub_multimon sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_png sub_popup sub_printing sub_propsize sub_regtest sub_render sub_richedit sub_rotate sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_mfc 
+all: sub_access sub_artprov sub_calendar sub_caret sub_checklst sub_config sub_console sub_controls sub_db sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_dynamic sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listbox sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minifram sub_minimal sub_mobile sub_multimon sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_png sub_popup sub_printing sub_propsize sub_regtest sub_render sub_rotate sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_mfc
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -155,9 +155,6 @@ clean:
 	cd menu
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd $(MAKEDIR)
-	cd mfc
-	$(MAKE) -f makefile.vc $(MAKEARGS) clean
-	cd $(MAKEDIR)
 	cd minifram
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd $(MAKEDIR)
@@ -203,9 +200,6 @@ clean:
 	cd render
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd $(MAKEDIR)
-	cd richedit
-	$(MAKE) -f makefile.vc $(MAKEARGS) clean
-	cd $(MAKEDIR)
 	cd rotate
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd $(MAKEDIR)
@@ -266,6 +260,9 @@ clean:
 	cd wizard
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd $(MAKEDIR)
+	cd mfc
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
 
 sub_access: 
 	cd access
@@ -462,11 +459,6 @@ sub_menu:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-sub_mfc: 
-	cd mfc
-	$(MAKE) -f makefile.vc $(MAKEARGS) all
-	cd $(MAKEDIR)
-
 sub_minifram: 
 	cd minifram
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
@@ -542,11 +534,6 @@ sub_render:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-sub_richedit: 
-	cd richedit
-	$(MAKE) -f makefile.vc $(MAKEARGS) all
-	cd $(MAKEDIR)
-
 sub_rotate: 
 	cd rotate
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
@@ -647,3 +634,8 @@ sub_wizard:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
+sub_mfc: 
+	cd mfc
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd $(MAKEDIR)
+
diff --git a/samples/makefile.wat b/samples/makefile.wat
index bdcf5596c2..75c9708861 100644
--- a/samples/makefile.wat
+++ b/samples/makefile.wat
@@ -31,7 +31,7 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
-	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" &
+	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" &
 	WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
 	DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
 	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
@@ -46,7 +46,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
 
 ### Targets: ###
 
-all : .SYMBOLIC access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+all : .SYMBOLIC access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 clean : .SYMBOLIC 
 	-if exist .\*.obj del .\*.obj
@@ -171,9 +171,6 @@ clean : .SYMBOLIC
 	cd menu
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
-	cd mfc
-	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
-	cd $(WATCOM_CWD)
 	cd minifram
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
@@ -219,9 +216,6 @@ clean : .SYMBOLIC
 	cd render
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
-	cd richedit
-	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
-	cd $(WATCOM_CWD)
 	cd rotate
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
@@ -282,6 +276,9 @@ clean : .SYMBOLIC
 	cd wizard
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
+	cd mfc
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+	cd $(WATCOM_CWD)
 
 access : .SYMBOLIC 
 	cd access
@@ -478,11 +475,6 @@ menu : .SYMBOLIC
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
-mfc : .SYMBOLIC 
-	cd mfc
-	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
-	cd $(WATCOM_CWD)
-
 minifram : .SYMBOLIC 
 	cd minifram
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
@@ -558,11 +550,6 @@ render : .SYMBOLIC
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
-richedit : .SYMBOLIC 
-	cd richedit
-	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
-	cd $(WATCOM_CWD)
-
 rotate : .SYMBOLIC 
 	cd rotate
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
@@ -663,3 +650,8 @@ wizard : .SYMBOLIC
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
+mfc : .SYMBOLIC 
+	cd mfc
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
diff --git a/samples/samples.bkl b/samples/samples.bkl
index b058a62546..97791cde49 100644
--- a/samples/samples.bkl
+++ b/samples/samples.bkl
@@ -63,7 +63,6 @@
     <subproject id="propsize" template="sub"/>
     <subproject id="regtest" template="sub"/>
     <subproject id="render" template="sub"/>
-    <subproject id="richedit" template="sub"/>
     <subproject id="rotate" template="sub"/>
     <subproject id="sashtest" template="sub"/>
     <subproject id="scroll" template="sub"/>