[sword-svn] r215 - in trunk/src: . Dll1 Dll1/winceSword/include Dll1/winceSword/src SlideBible SlideBible/ui SwordReader_GUI

Fri Oct 16 15:36:27 MST 2009

Author: kalemas
Date: 2009-10-16 15:36:27 -0700 (Fri, 16 Oct 2009)
New Revision: 215

Added:
   trunk/src/SlideBible.sln
   trunk/src/SlideBible/
   trunk/src/SlideBible/SlideBible.vcproj
   trunk/src/SlideBible/main.cpp
   trunk/src/SlideBible/sbCollection.cpp
   trunk/src/SlideBible/sbCollection.h
   trunk/src/SlideBible/sbControl.cpp
   trunk/src/SlideBible/sbControl.h
   trunk/src/SlideBible/sbCore.cpp
   trunk/src/SlideBible/sbCore.h
   trunk/src/SlideBible/sbCross.h
   trunk/src/SlideBible/sbItem.cpp
   trunk/src/SlideBible/sbItem.h
   trunk/src/SlideBible/sbList.cpp
   trunk/src/SlideBible/sbList.h
   trunk/src/SlideBible/sbObject.h
   trunk/src/SlideBible/sbTheme.cpp
   trunk/src/SlideBible/sbTheme.h
   trunk/src/SlideBible/todo.txt
   trunk/src/SlideBible/ui/
   trunk/src/SlideBible/ui/scheme.txt
   trunk/src/SlideBible/ui/ui.cdr
Removed:
   trunk/src/Dll1/winceSword/include/swordce.h
   trunk/src/Dll1/winceSword/include/swwinlog.h
   trunk/src/Dll1/winceSword/src/swordce.cpp
   trunk/src/Dll1/winceSword/src/swwinlog.cpp
Modified:
   trunk/src/Dll1/Dll1.vcproj
   trunk/src/Dll1/winceSword/include/dirent.h
   trunk/src/Dll1/winceSword/include/unistd.h
   trunk/src/Dll1/winceSword/src/dirent.cpp
   trunk/src/Dll1/winceSword/src/unistd.cpp
   trunk/src/SwRd.sln
   trunk/src/SwordReader_GUI/SRMainFrame.cpp
   trunk/src/SwordReader_GUI/SRModuleView.cpp
   trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
Log:
little SwordReader update, should work with locale path like as \?\208?\154?\208?\176?\209?\128?\209?\130?\208?\176 ?\208?\159?\208?\176?\208?\188?\209?\143?\209?\130?\208?\184\Program Files\SwordReader\.
my frontend, little time ago i'll upload binaries

Modified: trunk/src/Dll1/Dll1.vcproj
===================================================================

--- trunk/src/Dll1/Dll1.vcproj	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/Dll1/Dll1.vcproj	2009-10-16 22:36:27 UTC (rev 215)
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9,00"
 	Name="Dll1"
 	ProjectGUID="{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}"
 	RootNamespace="Dll1"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Smartphone 2003 (ARMV4)"
 		/>
 		<Platform
-			Name="Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="Pocket PC 2003 (ARMV4)"
 		/>
 		<Platform
-			Name="Pocket PC 2003 (ARMV4)"
+			Name="Windows Mobile 6 Professional SDK (ARMV4I)"
 		/>
 		<Platform
 			Name="Windows Mobile 6 Standard SDK (ARMV4I)"
@@ -58,7 +59,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\sword\include;winceSword\include"
+				AdditionalIncludeDirectories="..\..\..\..\sword\trunk\include;winceSword\include"
 				PreprocessorDefinitions="ARM;_ARM_;DEBUG;NO_VSNPRINTF;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -96,6 +97,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/sword.lib"
 			/>
 			<Tool
@@ -110,6 +113,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/Dll1.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -125,7 +131,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="Debug|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -159,16 +165,14 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\sword\include;winceSword\include"
+				AdditionalIncludeDirectories="..\..\..\..\sword\trunk\include;winceSword\include"
 				PreprocessorDefinitions="ARM;_ARM_;DEBUG;NO_VSNPRINTF;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
 				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/Dll1.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
-				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -188,18 +192,20 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem)  "
-				AdditionalDependencies="commctrl.lib coredll.lib"
+				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
+				AdditionalDependencies="commctrl.lib coredll.lib secchk.lib ccrtrtti.lib"
 				OutputFile="../../sword.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/sword.pdb"
-				StackReserveSize="131072"
-				StackCommitSize="8192"
+				StackReserveSize="65536"
+				StackCommitSize="4096"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/sword.lib"
 			/>
 			<Tool
@@ -214,6 +220,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/Dll1.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -221,7 +230,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="\Storage Card\Program Files\Sword\"
+				RemoteDirectory="\Storage Card\Program Files\sword\"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -229,7 +238,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Pocket PC 2003 (ARMV4)"
+			Name="Release|Smartphone 2003 (ARMV4)"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -252,7 +261,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
@@ -262,18 +271,21 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\sword\include;winceSword\include"
-				PreprocessorDefinitions="ARM;_ARM_;DEBUG;NO_VSNPRINTF;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
-				RuntimeLibrary="1"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\..\sword\trunk\include;winceSword\include"
+				PreprocessorDefinitions="ARM;_ARM_;NDEBUG;NO_VSNPRINTF;DEBUG;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/Dll1.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
+				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
 				UndefinePreprocessorDefinitions="USE_AUTOTOOLS,__GNUC__,_ICU_"
 			/>
 			<Tool
@@ -282,7 +294,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,DEBUG,$(CePlatform),ARM,_ARM_"
+				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,NDEBUG,$(CePlatform),ARM,_ARM_"
 				Culture="1033"
 			/>
 			<Tool
@@ -293,15 +305,16 @@
 				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
 				AdditionalDependencies="commctrl.lib coredll.lib secchk.lib ccrtrtti.lib"
 				OutputFile="../../sword.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/sword.pdb"
 				StackReserveSize="65536"
 				StackCommitSize="4096"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/sword.lib"
 			/>
 			<Tool
@@ -316,6 +329,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/Dll1.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -323,7 +339,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="\Storage Card\Program Files\sword\"
+				RemoteDirectory=""
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -331,7 +347,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Smartphone 2003 (ARMV4)"
+			Name="Release|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -366,7 +382,7 @@
 				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\sword\include;winceSword\include"
+				AdditionalIncludeDirectories="..\..\..\..\sword\trunk\include;winceSword\include"
 				PreprocessorDefinitions="ARM;_ARM_;NDEBUG;NO_VSNPRINTF;DEBUG;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -406,6 +422,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/sword.lib"
 			/>
 			<Tool
@@ -420,6 +438,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/Dll1.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -435,7 +456,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -458,7 +479,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
@@ -468,14 +489,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\sword\include;winceSword\include"
-				PreprocessorDefinitions="ARM;_ARM_;NDEBUG;NO_VSNPRINTF;DEBUG;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
-				StringPooling="true"
-				RuntimeLibrary="0"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\sword\trunk\include;winceSword\include"
+				PreprocessorDefinitions="ARM;_ARM_;DEBUG;NO_VSNPRINTF;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
+				RuntimeLibrary="1"
 				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/Dll1.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
@@ -484,6 +502,7 @@
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 				UndefinePreprocessorDefinitions="USE_AUTOTOOLS,__GNUC__,_ICU_"
 			/>
 			<Tool
@@ -492,7 +511,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,NDEBUG,$(CePlatform),ARM,_ARM_"
+				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,DEBUG,$(CePlatform),ARM,_ARM_"
 				Culture="1033"
 			/>
 			<Tool
@@ -503,12 +522,13 @@
 				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem)  "
 				AdditionalDependencies="commctrl.lib coredll.lib"
 				OutputFile="../../sword.dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/sword.pdb"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
+				StackReserveSize="131072"
+				StackCommitSize="8192"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/sword.lib"
@@ -540,7 +560,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Pocket PC 2003 (ARMV4)"
+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -575,10 +595,11 @@
 				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\sword\include;winceSword\include"
+				AdditionalIncludeDirectories="..\..\..\..\sword\trunk\include;winceSword\include"
 				PreprocessorDefinitions="ARM;_ARM_;NDEBUG;NO_VSNPRINTF;DEBUG;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
 				StringPooling="true"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/Dll1.pch"
@@ -604,8 +625,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="commctrl.lib coredll.lib secchk.lib ccrtrtti.lib"
+				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem)  "
+				AdditionalDependencies="commctrl.lib coredll.lib"
 				OutputFile="../../sword.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -636,7 +657,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory=""
+				RemoteDirectory="\Storage Card\Program Files\Sword\"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -678,7 +699,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\sword\include;winceSword\include"
+				AdditionalIncludeDirectories="..\..\..\..\sword\trunk\include;winceSword\include"
 				PreprocessorDefinitions="ARM;_ARM_;DEBUG;NO_VSNPRINTF;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
 				RuntimeLibrary="1"
 				BufferSecurityCheck="false"
@@ -784,7 +805,7 @@
 				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\sword\include;winceSword\include"
+				AdditionalIncludeDirectories="..\..\..\..\sword\trunk\include;winceSword\include"
 				PreprocessorDefinitions="ARM;_ARM_;NDEBUG;NO_VSNPRINTF;DEBUG;_i386_;_WIN32_WCE=$(CEVER);$(CePlatform);UNDER_CE=$(CEVER);UNICODE;_USRDLL;DLL1_EXPORTS;SWMAKINGDLL"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -869,7 +890,7 @@
 					Name="utilfuns"
 					>
 					<File
-						RelativePath="..\..\..\sword\src\utilfuns\regex.c"
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\regex.c"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -882,7 +903,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -892,17 +913,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -913,18 +935,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -957,7 +978,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\utilfuns\roman.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\roman.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -970,7 +991,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -980,17 +1001,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1001,18 +1023,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1045,7 +1066,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\utilfuns\swbuf.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\swbuf.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1058,7 +1079,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1068,17 +1089,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1089,18 +1111,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1133,7 +1154,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\utilfuns\swobject.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\swobject.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1146,7 +1167,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1156,17 +1177,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1177,18 +1199,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1221,7 +1242,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\utilfuns\swunicod.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\swunicod.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1234,7 +1255,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1244,17 +1265,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1265,18 +1287,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1309,7 +1330,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\utilfuns\swversion.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\swversion.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1322,7 +1343,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1332,17 +1353,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1353,18 +1375,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1397,7 +1418,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\utilfuns\url.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\url.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1410,7 +1431,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1420,17 +1441,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1441,18 +1463,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1485,7 +1506,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\utilfuns\utilstr.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\utilstr.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1498,7 +1519,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1508,17 +1529,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1529,18 +1551,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1573,7 +1594,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\utilfuns\utilxml.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\utilxml.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1586,7 +1607,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1596,17 +1617,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1617,18 +1639,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1664,7 +1685,7 @@
 						Name="zlib"
 						>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\adler32.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\adler32.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1677,7 +1698,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1687,17 +1708,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1708,18 +1730,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1752,7 +1773,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\compress.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\compress.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1765,7 +1786,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1775,17 +1796,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1796,18 +1818,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1840,7 +1861,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\crc32.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\crc32.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1853,7 +1874,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1863,17 +1884,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1884,18 +1906,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1928,7 +1949,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\deflate.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\deflate.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -1941,7 +1962,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1951,17 +1972,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1972,18 +1994,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2016,11 +2037,11 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\deflate.h"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\deflate.h"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\infblock.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infblock.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2033,7 +2054,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2043,17 +2064,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2064,18 +2086,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2108,11 +2129,11 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\infblock.h"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infblock.h"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\infcodes.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infcodes.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2125,7 +2146,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2135,17 +2156,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2156,18 +2178,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2200,11 +2221,11 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\infcodes.h"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infcodes.h"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\inffast.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inffast.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2217,7 +2238,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2227,17 +2248,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2248,18 +2270,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2292,15 +2313,15 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\inffast.h"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inffast.h"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\inffixed.h"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inffixed.h"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\inflate.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inflate.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2313,7 +2334,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2323,17 +2344,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2344,18 +2366,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2388,7 +2409,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\inftrees.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inftrees.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2401,7 +2422,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2411,17 +2432,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2432,18 +2454,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2476,11 +2497,11 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\inftrees.h"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inftrees.h"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\infutil.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infutil.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2493,7 +2514,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2503,17 +2524,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2524,18 +2546,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2568,11 +2589,11 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\infutil.h"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infutil.h"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\maketree.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\maketree.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2585,7 +2606,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2595,17 +2616,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2616,18 +2638,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2660,7 +2681,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\trees.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\trees.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2673,7 +2694,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2683,17 +2704,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2704,18 +2726,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2748,11 +2769,11 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\trees.h"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\trees.h"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\uncompr.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\uncompr.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2765,7 +2786,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2775,17 +2796,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2796,18 +2818,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2840,7 +2861,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\zutil.c"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\zutil.c"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2853,7 +2874,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2863,17 +2884,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2884,18 +2906,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2928,7 +2949,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\utilfuns\zlib\zutil.h"
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\zutil.h"
 							>
 						</File>
 					</Filter>
@@ -2937,7 +2958,7 @@
 					Name="modules"
 					>
 					<File
-						RelativePath="..\..\..\sword\src\modules\swmodule.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\modules\swmodule.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -2950,7 +2971,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2960,17 +2981,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2981,18 +3003,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -3028,7 +3049,7 @@
 						Name="comments"
 						>
 						<File
-							RelativePath="..\..\..\sword\src\modules\comments\swcom.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\comments\swcom.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3041,7 +3062,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3051,17 +3072,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3072,18 +3094,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3119,7 +3140,7 @@
 							Name="hrefcom"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\comments\hrefcom\hrefcom.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\hrefcom\hrefcom.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3132,7 +3153,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3142,17 +3163,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3163,18 +3185,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3211,7 +3232,7 @@
 							Name="rawcom"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\comments\rawcom\rawcom.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\rawcom\rawcom.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3224,7 +3245,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3234,17 +3255,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3255,18 +3277,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3303,7 +3324,7 @@
 							Name="rawfiles"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\comments\rawfiles\rawfiles.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\rawfiles\rawfiles.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3316,7 +3337,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3326,17 +3347,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3347,18 +3369,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3395,7 +3416,7 @@
 							Name="zcom"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\comments\zcom\zcom.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\zcom\zcom.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3408,7 +3429,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3418,17 +3439,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3439,18 +3461,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3487,7 +3508,7 @@
 							Name="rawcom4"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\comments\rawcom4\rawcom4.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\rawcom4\rawcom4.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3500,7 +3521,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3510,17 +3531,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3531,18 +3553,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -3580,7 +3601,7 @@
 						Name="common"
 						>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\entriesblk.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\entriesblk.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3593,7 +3614,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3603,17 +3624,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3624,18 +3646,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3668,7 +3689,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\lzsscomprs.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\lzsscomprs.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3681,7 +3702,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3691,17 +3712,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3712,18 +3734,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3756,7 +3777,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\rawstr.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\rawstr.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3769,7 +3790,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3779,17 +3800,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3800,18 +3822,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3844,7 +3865,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\rawstr4.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\rawstr4.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3857,7 +3878,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3867,17 +3888,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3888,18 +3910,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3932,7 +3953,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\rawverse.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\rawverse.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -3945,7 +3966,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3955,17 +3976,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -3976,18 +3998,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4020,7 +4041,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\rawverse4.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\rawverse4.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4033,7 +4054,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4043,17 +4064,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4064,18 +4086,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4108,7 +4129,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\sapphire.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\sapphire.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4121,7 +4142,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4131,17 +4152,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4152,18 +4174,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4196,7 +4217,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\swcipher.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\swcipher.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4209,7 +4230,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4219,17 +4240,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4240,18 +4262,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4284,7 +4305,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\swcomprs.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\swcomprs.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4297,7 +4318,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4307,17 +4328,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4328,18 +4350,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4372,7 +4393,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\zipcomprs.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\zipcomprs.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4385,7 +4406,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4395,17 +4416,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4416,18 +4438,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4460,7 +4481,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\zstr.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\zstr.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4473,7 +4494,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4483,17 +4504,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4504,18 +4526,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4548,7 +4569,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\common\zverse.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\zverse.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4561,7 +4582,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4571,17 +4592,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4592,18 +4614,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4640,7 +4661,7 @@
 						Name="filters"
 						>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\cipherfil.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\cipherfil.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4653,7 +4674,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4663,17 +4684,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4684,18 +4706,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4728,7 +4749,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbffootnotes.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbffootnotes.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4741,7 +4762,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4751,17 +4772,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4772,18 +4794,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4816,7 +4837,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfheadings.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfheadings.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4829,7 +4850,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4839,17 +4860,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4860,18 +4882,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4904,7 +4925,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfhtml.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfhtml.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -4917,7 +4938,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4927,17 +4948,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4948,18 +4970,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -4992,7 +5013,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfhtmlhref.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfhtmlhref.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5005,7 +5026,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5015,17 +5036,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5036,18 +5058,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5080,7 +5101,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfmorph.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfmorph.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5093,7 +5114,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5103,17 +5124,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5124,18 +5146,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5168,7 +5189,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfosis.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfosis.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5181,7 +5202,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5191,17 +5212,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5212,18 +5234,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5256,7 +5277,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfplain.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfplain.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5269,7 +5290,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5279,17 +5300,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5300,18 +5322,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5344,7 +5365,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfredletterwords.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfredletterwords.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5357,7 +5378,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5367,17 +5388,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5388,18 +5410,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5432,7 +5453,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfrtf.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfrtf.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5445,7 +5466,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5455,17 +5476,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5476,18 +5498,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5520,7 +5541,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfstrongs.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfstrongs.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5533,7 +5554,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5543,17 +5564,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5564,18 +5586,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5608,7 +5629,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfthml.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfthml.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5621,7 +5642,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5631,17 +5652,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5652,18 +5674,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5696,7 +5717,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\gbfwebif.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfwebif.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5709,7 +5730,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5719,17 +5740,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5740,18 +5762,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5784,8 +5805,12 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\greeklexattribs.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfwordjs.cpp"
 							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\greeklexattribs.cpp"
+							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
 								>
@@ -5797,7 +5822,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5807,17 +5832,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5828,18 +5854,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5872,7 +5897,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\latin1utf16.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\latin1utf16.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5885,7 +5910,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5895,17 +5920,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5916,18 +5942,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5960,7 +5985,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\latin1utf8.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\latin1utf8.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -5973,7 +5998,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -5983,17 +6008,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6004,18 +6030,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6048,7 +6073,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osisfootnotes.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisfootnotes.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6061,7 +6086,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6071,17 +6096,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6092,18 +6118,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6136,7 +6161,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osisheadings.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisheadings.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6149,7 +6174,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6159,17 +6184,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6180,18 +6206,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6224,7 +6249,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osishtmlhref.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osishtmlhref.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6237,7 +6262,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6247,17 +6272,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6268,18 +6294,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6312,7 +6337,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osislemma.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osislemma.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6325,7 +6350,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6335,17 +6360,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6356,18 +6382,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6400,7 +6425,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osismorph.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osismorph.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6413,7 +6438,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6423,17 +6448,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6444,18 +6470,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6488,7 +6513,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osismorphsegmentation.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osismorphsegmentation.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6501,7 +6526,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6511,17 +6536,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6532,18 +6558,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6576,7 +6601,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osisosis.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisosis.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6589,7 +6614,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6599,17 +6624,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6620,18 +6646,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6664,7 +6689,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osisplain.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisplain.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6677,7 +6702,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6687,17 +6712,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6708,18 +6734,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6752,7 +6777,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osisredletterwords.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisredletterwords.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6765,7 +6790,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6775,17 +6800,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6796,18 +6822,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6840,7 +6865,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osisrtf.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisrtf.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6853,7 +6878,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6863,17 +6888,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6884,18 +6910,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6928,11 +6953,11 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osisruby.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisruby.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osisscripref.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisscripref.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -6945,7 +6970,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6955,17 +6980,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -6976,18 +7002,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7020,7 +7045,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osisstrongs.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisstrongs.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -7033,7 +7058,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7043,17 +7068,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7064,18 +7090,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7108,8 +7133,12 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\osiswebif.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisvariants.cpp"
 							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osiswebif.cpp"
+							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
 								>
@@ -7121,7 +7150,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7131,17 +7160,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7152,18 +7182,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7196,8 +7225,12 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\papyriplain.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osiswordjs.cpp"
 							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\papyriplain.cpp"
+							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
 								>
@@ -7209,7 +7242,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7219,17 +7252,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7240,18 +7274,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7284,7 +7317,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\plainfootnotes.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\plainfootnotes.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -7297,7 +7330,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7307,17 +7340,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7328,18 +7362,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7372,7 +7405,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\plainhtml.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\plainhtml.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -7385,7 +7418,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7395,17 +7428,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7416,18 +7450,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7460,7 +7493,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\rtfhtml.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\rtfhtml.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -7473,7 +7506,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7483,17 +7516,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7504,18 +7538,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7548,7 +7581,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\swbasicfilter.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\swbasicfilter.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -7561,7 +7594,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7571,17 +7604,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7592,18 +7626,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7636,7 +7669,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\swoptfilter.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\swoptfilter.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -7649,7 +7682,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7659,17 +7692,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7680,18 +7714,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7724,11 +7757,11 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\teihtmlhref.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\teihtmlhref.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\teiplain.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\teiplain.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -7741,7 +7774,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7751,17 +7784,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7772,18 +7806,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7816,7 +7849,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\teirtf.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\teirtf.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -7829,7 +7862,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7839,17 +7872,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7860,18 +7894,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7904,7 +7937,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlfootnotes.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlfootnotes.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -7917,7 +7950,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7927,17 +7960,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7948,18 +7982,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -7992,7 +8025,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlgbf.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlgbf.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8005,7 +8038,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8015,17 +8048,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8036,18 +8070,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8080,7 +8113,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlheadings.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlheadings.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8093,7 +8126,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8103,17 +8136,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8124,18 +8158,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8168,7 +8201,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlhtml.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlhtml.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8181,7 +8214,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8191,17 +8224,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8212,18 +8246,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8256,7 +8289,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlhtmlhref.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlhtmlhref.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8269,7 +8302,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8279,17 +8312,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8300,18 +8334,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8344,7 +8377,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmllemma.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmllemma.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8357,7 +8390,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8367,17 +8400,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8388,18 +8422,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8432,7 +8465,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlmorph.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlmorph.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8445,7 +8478,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8455,17 +8488,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8476,18 +8510,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8520,7 +8553,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlosis.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlosis.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8533,7 +8566,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8543,17 +8576,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8564,18 +8598,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8608,7 +8641,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlplain.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlplain.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8621,7 +8654,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8631,17 +8664,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8652,18 +8686,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8696,7 +8729,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlrtf.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlrtf.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8709,7 +8742,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8719,17 +8752,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8740,18 +8774,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8784,7 +8817,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlscripref.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlscripref.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8797,7 +8830,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8807,17 +8840,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8828,18 +8862,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8872,7 +8905,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlstrongs.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlstrongs.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8885,7 +8918,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8895,17 +8928,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8916,18 +8950,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8960,7 +8993,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlvariants.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlvariants.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -8973,7 +9006,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -8983,17 +9016,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9004,18 +9038,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9048,7 +9081,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\thmlwebif.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlwebif.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -9061,7 +9094,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9071,17 +9104,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9092,18 +9126,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9136,8 +9169,12 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\unicodertf.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlwordjs.cpp"
 							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\unicodertf.cpp"
+							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
 								>
@@ -9149,7 +9186,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9159,17 +9196,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9180,18 +9218,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9224,7 +9261,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf16utf8.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf16utf8.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -9237,7 +9274,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9247,17 +9284,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9268,18 +9306,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9312,8 +9349,12 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8arshaping.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8arabicpoints.cpp"
 							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8arshaping.cpp"
+							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
 								>
@@ -9325,7 +9366,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9335,17 +9376,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9356,18 +9398,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9400,7 +9441,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8bidireorder.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8bidireorder.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -9413,7 +9454,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9423,17 +9464,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9444,18 +9486,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9488,7 +9529,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8cantillation.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8cantillation.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -9501,7 +9542,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9511,17 +9552,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9532,18 +9574,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9576,7 +9617,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8greekaccents.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8greekaccents.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -9589,7 +9630,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9599,17 +9640,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9620,18 +9662,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9664,7 +9705,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8hebrewpoints.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8hebrewpoints.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -9677,7 +9718,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9687,17 +9728,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9708,18 +9750,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9752,7 +9793,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8html.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8html.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -9765,7 +9806,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9775,17 +9816,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9796,18 +9838,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9840,7 +9881,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8latin1.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8latin1.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -9853,7 +9894,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9863,17 +9904,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9884,18 +9926,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9928,7 +9969,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8nfc.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8nfc.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -9941,7 +9982,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9951,17 +9992,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -9972,18 +10014,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10016,7 +10057,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8nfkd.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8nfkd.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10029,7 +10070,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10039,17 +10080,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10060,18 +10102,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10104,7 +10145,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8transliterator.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8transliterator.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10117,7 +10158,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10127,17 +10168,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10148,18 +10190,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10192,7 +10233,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="..\..\..\sword\src\modules\filters\utf8utf16.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8utf16.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10205,7 +10246,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10215,17 +10256,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10236,18 +10278,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10284,7 +10325,7 @@
 						Name="genbook"
 						>
 						<File
-							RelativePath="..\..\..\sword\src\modules\genbook\swgenbook.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\genbook\swgenbook.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10297,7 +10338,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10307,17 +10348,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10328,18 +10370,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10375,7 +10416,7 @@
 							Name="rawgenbook"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\genbook\rawgenbook\rawgenbook.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\genbook\rawgenbook\rawgenbook.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10388,7 +10429,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10398,17 +10439,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10419,18 +10461,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10468,7 +10509,7 @@
 						Name="lexdict"
 						>
 						<File
-							RelativePath="..\..\..\sword\src\modules\lexdict\swld.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\lexdict\swld.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10481,7 +10522,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10491,17 +10532,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10512,18 +10554,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10559,7 +10600,7 @@
 							Name="rawld"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\lexdict\rawld\rawld.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\lexdict\rawld\rawld.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10572,7 +10613,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10582,17 +10623,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10603,18 +10645,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10651,7 +10692,7 @@
 							Name="rawld4"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\lexdict\rawld4\rawld4.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\lexdict\rawld4\rawld4.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10664,7 +10705,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10674,17 +10715,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10695,18 +10737,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10743,7 +10784,7 @@
 							Name="zld"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\lexdict\zld\zld.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\lexdict\zld\zld.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10756,7 +10797,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10766,17 +10807,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10787,18 +10829,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10836,7 +10877,7 @@
 						Name="texts"
 						>
 						<File
-							RelativePath="..\..\..\sword\src\modules\texts\swtext.cpp"
+							RelativePath="..\..\..\..\sword\trunk\src\modules\texts\swtext.cpp"
 							>
 							<FileConfiguration
 								Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10849,7 +10890,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10859,17 +10900,18 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Pocket PC 2003 (ARMV4)"
+								Name="Release|Smartphone 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
+									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Smartphone 2003 (ARMV4)"
+								Name="Release|Pocket PC 2003 (ARMV4)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10880,18 +10922,17 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+								Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
 									AdditionalIncludeDirectories=""
 									UsePrecompiledHeader="0"
-									BrowseInformation="1"
 									UndefinePreprocessorDefinitions=""
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|Pocket PC 2003 (ARMV4)"
+								Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -10927,7 +10968,7 @@
 							Name="rawtext"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\texts\rawtext\rawtext.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\texts\rawtext\rawtext.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -10940,7 +10981,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10950,17 +10991,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -10971,18 +11013,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -11019,7 +11060,7 @@
 							Name="ztext"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\texts\ztext\ztext.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\texts\ztext\ztext.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11032,7 +11073,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -11042,17 +11083,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -11063,18 +11105,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -11111,7 +11152,7 @@
 							Name="rawtext4"
 							>
 							<File
-								RelativePath="..\..\..\sword\src\modules\texts\rawtext4\rawtext4.cpp"
+								RelativePath="..\..\..\..\sword\trunk\src\modules\texts\rawtext4\rawtext4.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11124,7 +11165,7 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -11134,17 +11175,18 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Debug|Pocket PC 2003 (ARMV4)"
+									Name="Release|Smartphone 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
+										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Smartphone 2003 (ARMV4)"
+									Name="Release|Pocket PC 2003 (ARMV4)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -11155,18 +11197,17 @@
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+									Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
 										AdditionalIncludeDirectories=""
 										UsePrecompiledHeader="0"
-										BrowseInformation="1"
 										UndefinePreprocessorDefinitions=""
 									/>
 								</FileConfiguration>
 								<FileConfiguration
-									Name="Release|Pocket PC 2003 (ARMV4)"
+									Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
@@ -11205,7 +11246,7 @@
 					Name="mgr"
 					>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\encfiltmgr.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\encfiltmgr.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11218,7 +11259,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11228,17 +11269,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11249,18 +11291,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11293,7 +11334,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\filemgr.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\filemgr.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11306,7 +11347,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11316,17 +11357,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11337,18 +11379,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11381,7 +11422,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\localemgr.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\localemgr.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11394,7 +11435,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11404,17 +11445,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11425,18 +11467,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11469,7 +11510,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\markupfiltmgr.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\markupfiltmgr.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11482,7 +11523,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11492,17 +11533,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11513,18 +11555,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11557,7 +11598,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\stringmgr.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\stringmgr.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11570,7 +11611,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11580,17 +11621,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11601,18 +11643,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11645,7 +11686,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\swcacher.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swcacher.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11658,7 +11699,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11668,17 +11709,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11689,18 +11731,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11733,7 +11774,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\swconfig.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swconfig.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11746,7 +11787,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11756,17 +11797,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11777,18 +11819,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11821,7 +11862,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\swfiltermgr.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swfiltermgr.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11834,7 +11875,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11844,17 +11885,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11865,18 +11907,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11909,7 +11950,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\swlocale.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swlocale.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -11922,7 +11963,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11932,17 +11973,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11953,18 +11995,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -11997,7 +12038,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\swmgr.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swmgr.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12010,7 +12051,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12020,17 +12061,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12041,18 +12083,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12085,7 +12126,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\swsearchable.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swsearchable.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12098,7 +12139,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12108,17 +12149,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12129,18 +12171,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12173,7 +12214,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\mgr\versemgr.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\versemgr.cpp"
 						>
 					</File>
 				</Filter>
@@ -12181,7 +12222,7 @@
 					Name="keys"
 					>
 					<File
-						RelativePath="..\..\..\sword\src\keys\listkey.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\keys\listkey.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12194,7 +12235,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12204,17 +12245,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12225,18 +12267,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12269,7 +12310,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\keys\strkey.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\keys\strkey.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12282,7 +12323,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12292,17 +12333,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12313,18 +12355,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12357,7 +12398,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\keys\swkey.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\keys\swkey.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12370,7 +12411,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12380,17 +12421,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12401,18 +12443,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12445,7 +12486,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\keys\treekey.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\keys\treekey.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12458,7 +12499,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12468,17 +12509,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12489,18 +12531,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12533,7 +12574,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\keys\treekeyidx.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\keys\treekeyidx.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12546,7 +12587,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12556,17 +12597,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12577,18 +12619,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12621,7 +12662,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\keys\versekey.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\keys\versekey.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12634,7 +12675,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12644,17 +12685,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12665,18 +12707,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12709,7 +12750,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\keys\versetreekey.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\keys\versetreekey.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12722,7 +12763,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12732,17 +12773,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12753,18 +12795,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12801,7 +12842,7 @@
 					Name="frontend"
 					>
 					<File
-						RelativePath="..\..\..\sword\src\frontend\swdisp.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\frontend\swdisp.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12814,7 +12855,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12824,17 +12865,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12845,18 +12887,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12889,7 +12930,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\..\sword\src\frontend\swlog.cpp"
+						RelativePath="..\..\..\..\sword\trunk\src\frontend\swlog.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Smartphone 2003 (ARMV4)"
@@ -12902,7 +12943,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12912,17 +12953,18 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Pocket PC 2003 (ARMV4)"
+							Name="Release|Smartphone 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
+								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Smartphone 2003 (ARMV4)"
+							Name="Release|Pocket PC 2003 (ARMV4)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12933,18 +12975,17 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+							Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								UsePrecompiledHeader="0"
-								BrowseInformation="1"
 								UndefinePreprocessorDefinitions=""
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Pocket PC 2003 (ARMV4)"
+							Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -12983,599 +13024,599 @@
 				Filter=".h"
 				>
 				<File
-					RelativePath="..\..\..\sword\include\apocrypha.h"
+					RelativePath="..\..\..\..\sword\trunk\include\apocrypha.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\canon.h"
+					RelativePath="..\..\..\..\sword\trunk\include\canon.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\cdsourcemgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\cdsourcemgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\cipherfil.h"
+					RelativePath="..\..\..\..\sword\trunk\include\cipherfil.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\defs.h"
+					RelativePath="..\..\..\..\sword\trunk\include\defs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\echomod.h"
+					RelativePath="..\..\..\..\sword\trunk\include\echomod.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\encfiltmgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\encfiltmgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\entriesblk.h"
+					RelativePath="..\..\..\..\sword\trunk\include\entriesblk.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\femain.h"
+					RelativePath="..\..\..\..\sword\trunk\include\femain.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\filemgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\filemgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\flatapi.h"
+					RelativePath="..\..\..\..\sword\trunk\include\flatapi.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\ftpparse.h"
+					RelativePath="..\..\..\..\sword\trunk\include\ftpparse.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbffootnotes.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbffootnotes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfheadings.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfheadings.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfhtml.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfhtml.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfhtmlhref.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfhtmlhref.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfmorph.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfmorph.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfosis.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfosis.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfplain.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfplain.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfredletterwords.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfredletterwords.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfrtf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfrtf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfstrongs.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfstrongs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfthml.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfthml.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\gbfwebif.h"
+					RelativePath="..\..\..\..\sword\trunk\include\gbfwebif.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\Greek2Greek.h"
+					RelativePath="..\..\..\..\sword\trunk\include\Greek2Greek.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\GreekChars.h"
+					RelativePath="..\..\..\..\sword\trunk\include\GreekChars.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\greeklexattribs.h"
+					RelativePath="..\..\..\..\sword\trunk\include\greeklexattribs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\hebrewmcim.h"
+					RelativePath="..\..\..\..\sword\trunk\include\hebrewmcim.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\hrefcom.h"
+					RelativePath="..\..\..\..\sword\trunk\include\hrefcom.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\installmgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\installmgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\latin1utf16.h"
+					RelativePath="..\..\..\..\sword\trunk\include\latin1utf16.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\latin1utf8.h"
+					RelativePath="..\..\..\..\sword\trunk\include\latin1utf8.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\listkey.h"
+					RelativePath="..\..\..\..\sword\trunk\include\listkey.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\localemgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\localemgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\lzsscomprs.h"
+					RelativePath="..\..\..\..\sword\trunk\include\lzsscomprs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\markupfiltmgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\markupfiltmgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\multimapwdef.h"
+					RelativePath="..\..\..\..\sword\trunk\include\multimapwdef.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\nullim.h"
+					RelativePath="..\..\..\..\sword\trunk\include\nullim.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osisfootnotes.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osisfootnotes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osisheadings.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osisheadings.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osishtmlhref.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osishtmlhref.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osislemma.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osislemma.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osismorph.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osismorph.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osisosis.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osisosis.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osisplain.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osisplain.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osisredletterwords.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osisredletterwords.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osisrtf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osisrtf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osisscripref.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osisscripref.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osisstrongs.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osisstrongs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\osiswebif.h"
+					RelativePath="..\..\..\..\sword\trunk\include\osiswebif.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\plainfootnotes.h"
+					RelativePath="..\..\..\..\sword\trunk\include\plainfootnotes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\plainhtml.h"
+					RelativePath="..\..\..\..\sword\trunk\include\plainhtml.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawcom.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawcom.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawfiles.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawfiles.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawgbf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawgbf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawgenbook.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawgenbook.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawld.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawld.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawld4.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawld4.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawstr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawstr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawstr4.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawstr4.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawtext.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawtext.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rawverse.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rawverse.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\regex.h"
+					RelativePath="..\..\..\..\sword\trunk\include\regex.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\remotesourcemgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\remotesourcemgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\roman.h"
+					RelativePath="..\..\..\..\sword\trunk\include\roman.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\rtfhtml.h"
+					RelativePath="..\..\..\..\sword\trunk\include\rtfhtml.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\sapphire.h"
+					RelativePath="..\..\..\..\sword\trunk\include\sapphire.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\stringmgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\stringmgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\strkey.h"
+					RelativePath="..\..\..\..\sword\trunk\include\strkey.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swbasicfilter.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swbasicfilter.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swbuf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swbuf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swcacher.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swcacher.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swcipher.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swcipher.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swcom.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swcom.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swcomprs.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swcomprs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swconfig.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swconfig.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swdisp.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swdisp.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swdisprtf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swdisprtf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swdisprtfchap.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swdisprtfchap.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swfilter.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swfilter.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swfiltermgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swfiltermgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swgenbook.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swgenbook.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swinputmeth.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swinputmeth.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swinstallmgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swinstallmgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swkey.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swkey.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swld.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swld.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swlocale.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swlocale.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swlog.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swlog.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swmacs.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swmacs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swmgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swmgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swmodule.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swmodule.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swobject.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swobject.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swoptfilter.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swoptfilter.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swremotemgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swremotemgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swsearchable.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swsearchable.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swsourcemgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swsourcemgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swtext.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swtext.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swunicod.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swunicod.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\swversion.h"
+					RelativePath="..\..\..\..\sword\trunk\include\swversion.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\sysdata.h"
+					RelativePath="..\..\..\..\sword\trunk\include\sysdata.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\tbdisp.h"
+					RelativePath="..\..\..\..\sword\trunk\include\tbdisp.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\teihtmlhref.h"
+					RelativePath="..\..\..\..\sword\trunk\include\teihtmlhref.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlfootnotes.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlfootnotes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlgbf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlgbf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlheadings.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlheadings.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlhtml.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlhtml.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlhtmlhref.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlhtmlhref.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmllemma.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmllemma.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlmorph.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlmorph.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlosis.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlosis.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlplain.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlplain.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlrtf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlrtf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlscripref.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlscripref.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlstrongs.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlstrongs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlvariants.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlvariants.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\thmlwebif.h"
+					RelativePath="..\..\..\..\sword\trunk\include\thmlwebif.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\treekey.h"
+					RelativePath="..\..\..\..\sword\trunk\include\treekey.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\treekeyidx.h"
+					RelativePath="..\..\..\..\sword\trunk\include\treekeyidx.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\unicodertf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\unicodertf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\unixstr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\unixstr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\untgz.h"
+					RelativePath="..\..\..\..\sword\trunk\include\untgz.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\url.h"
+					RelativePath="..\..\..\..\sword\trunk\include\url.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf16utf8.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf16utf8.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8arshaping.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8arshaping.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8bidireorder.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8bidireorder.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8cantillation.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8cantillation.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8greekaccents.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8greekaccents.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8hebrewpoints.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8hebrewpoints.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8html.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8html.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8latin1.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8latin1.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8nfc.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8nfc.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8nfkd.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8nfkd.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8transliterator.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8transliterator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utf8utf16.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utf8utf16.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utilconf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utilconf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utilfuns.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utilfuns.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utilstr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utilstr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utilweb.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utilweb.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\utilxml.h"
+					RelativePath="..\..\..\..\sword\trunk\include\utilxml.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\versekey.h"
+					RelativePath="..\..\..\..\sword\trunk\include\versekey.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\versemgr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\versemgr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\zcom.h"
+					RelativePath="..\..\..\..\sword\trunk\include\zcom.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\zconf.h"
+					RelativePath="..\..\..\..\sword\trunk\include\zconf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\zipcomprs.h"
+					RelativePath="..\..\..\..\sword\trunk\include\zipcomprs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\zld.h"
+					RelativePath="..\..\..\..\sword\trunk\include\zld.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\zlib.h"
+					RelativePath="..\..\..\..\sword\trunk\include\zlib.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\zstr.h"
+					RelativePath="..\..\..\..\sword\trunk\include\zstr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\ztext.h"
+					RelativePath="..\..\..\..\sword\trunk\include\ztext.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\sword\include\zverse.h"
+					RelativePath="..\..\..\..\sword\trunk\include\zverse.h"
 					>
 				</File>
 			</Filter>
@@ -13601,7 +13642,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Debug|Pocket PC 2003 (ARMV4)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -13611,17 +13652,18 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Pocket PC 2003 (ARMV4)"
+						Name="Release|Smartphone 2003 (ARMV4)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							AdditionalIncludeDirectories=""
 							UsePrecompiledHeader="0"
+							BrowseInformation="1"
 							UndefinePreprocessorDefinitions=""
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Smartphone 2003 (ARMV4)"
+						Name="Release|Pocket PC 2003 (ARMV4)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -13632,18 +13674,17 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							AdditionalIncludeDirectories=""
 							UsePrecompiledHeader="0"
-							BrowseInformation="1"
 							UndefinePreprocessorDefinitions=""
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Pocket PC 2003 (ARMV4)"
+						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -13689,16 +13730,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Debug|Pocket PC 2003 (ARMV4)"
 						>
 						<Tool
@@ -13720,17 +13751,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Release|Pocket PC 2003 (ARMV4)"
 						>
 						<Tool
@@ -13742,41 +13762,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="winceSword\src\swordce.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Smartphone 2003 (ARMV4)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
@@ -13787,27 +13772,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Pocket PC 2003 (ARMV4)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Smartphone 2003 (ARMV4)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
@@ -13819,17 +13783,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Pocket PC 2003 (ARMV4)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
 						>
 						<Tool
@@ -13852,7 +13805,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="winceSword\src\swwinlog.cpp"
+					RelativePath="winceSword\src\unistd.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Smartphone 2003 (ARMV4)"
@@ -13865,16 +13818,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Debug|Pocket PC 2003 (ARMV4)"
 						>
 						<Tool
@@ -13896,17 +13839,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Release|Pocket PC 2003 (ARMV4)"
 						>
 						<Tool
@@ -13918,41 +13850,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="winceSword\src\unistd.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Smartphone 2003 (ARMV4)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
@@ -13963,27 +13860,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Pocket PC 2003 (ARMV4)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Smartphone 2003 (ARMV4)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 						>
 						<Tool
@@ -13995,17 +13871,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Pocket PC 2003 (ARMV4)"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							UsePrecompiledHeader="0"
-							BrowseInformation="1"
-							UndefinePreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
 						>
 						<Tool
@@ -14049,14 +13914,6 @@
 					>
 				</File>
 				<File
-					RelativePath="winceSword\include\iostream"
-					>
-				</File>
-				<File
-					RelativePath="winceSword\include\swordce.h"
-					>
-				</File>
-				<File
 					RelativePath="winceSword\include\unistd.h"
 					>
 				</File>

Modified: trunk/src/Dll1/winceSword/include/dirent.h
===================================================================
--- trunk/src/Dll1/winceSword/include/dirent.h	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/Dll1/winceSword/include/dirent.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -19,4 +19,4 @@
 extern DIR* opendir( const char *pSpec);
 extern void closedir(DIR * pDir);
 extern struct dirent * readdir(DIR *pDir);
-extern void rewinddir( DIR* dir );
\ No newline at end of file
+extern void rewinddir( DIR* dir );

Deleted: trunk/src/Dll1/winceSword/include/swordce.h
===================================================================
--- trunk/src/Dll1/winceSword/include/swordce.h	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/Dll1/winceSword/include/swordce.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -1,18 +0,0 @@
-#ifndef SWORDCE_H
-#define SWORDCE_H
-
-#include <string.h>
-#include <ctype.h>
-#include <defs.h>
-
-SWDLLEXPORT wchar_t *strtowstr(wchar_t *dst, const char *src, int size);
-SWDLLEXPORT char *wstrtostr(char *dst, const wchar_t *src, int size);
-SWDLLEXPORT const char *getWorkingDirectory();
-SWDLLEXPORT const char *windizePath(const char *path);
-//int stricmp(const char *s1, const char *s2);
-
-//namespace sword {
-//	int stricmp(const char *s1, const char *s2);
-//}
-#define strcasecmp ::_stricmp
-#endif

Deleted: trunk/src/Dll1/winceSword/include/swwinlog.h
===================================================================
--- trunk/src/Dll1/winceSword/include/swwinlog.h	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/Dll1/winceSword/include/swwinlog.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -1,45 +0,0 @@
-/******************************************************************************
- *  swwinlog.h   - definition of SWWinLog-- a derivitive of SWLog used to
- *			handle logging in the MSWindows environment
- *
- * $Id: swwinlog.h,v 1.1 2004/01/21 06:15:33 scribe Exp $
- *
- * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
- *	CrossWire Bible Society
- *	P. O. Box 2528
- *	Tempe, AZ  85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- */
-
-//---------------------------------------------------------------------------
-#ifndef swwinlogH
-#define swwinlogH
-//---------------------------------------------------------------------------
-
-#include <swlog.h>
-#include <windows.h>
-
-SWORD_NAMESPACE_START
-
-class SWWinLog:public SWLog
-{
-  HWND parent;
-public:
-    SWWinLog (HWND iparent);
-  virtual void LogWarning (char *fmt, ...);
-  virtual void LogError (char *fmt, ...);
-  virtual void LogTimedInformation (char *fmt, ...);
-  virtual void LogInformation (char *fmt, ...);
-};
-
-SWORD_NAMESPACE_END
-#endif

Modified: trunk/src/Dll1/winceSword/include/unistd.h
===================================================================
--- trunk/src/Dll1/winceSword/include/unistd.h	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/Dll1/winceSword/include/unistd.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -18,14 +18,16 @@
 typedef long off_t;
 
 int close (int fd);
-int open(const char *path, int mode);
-int open(const char *path, int access, unsigned mode);
-int read(int fd, void* buf, size_t count);
-int write(int fd, const void * buf, size_t count);
-off_t lseek(int fildes, off_t offset, int whence);
-int access(const char* path, int mode);
-int mkdir(const char *);
-int remove(const char *);
-int stat(const char *, struct stat *);
+int open (const char *path, int mode);
+int open (const char *path, int access, unsigned mode);
+int read (int fd, void* buf, size_t count);
+int write (int fd, const void * buf, size_t count);
+off_t lseek (int fildes, off_t offset, int whence);
+int access (const char* path, int mode);
+int mkdir (const char *);
+int remove (const char *);
+int stat (const char *, struct stat *);
 
+const char* adaptpath (const char *path);
+
 #endif

Modified: trunk/src/Dll1/winceSword/src/dirent.cpp
===================================================================
--- trunk/src/Dll1/winceSword/src/dirent.cpp	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/Dll1/winceSword/src/dirent.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -1,37 +1,39 @@
 #include <dirent.h>
-#include <io.h>
-#include <swordce.h>
 #include <stdio.h>
 #include <swbuf.h>
+#include <unistd.h>
 
 using sword::SWBuf;
 
-DIR* opendir(const char *pSpec) {
+DIR* opendir(const char *pSpec)
+{
 	DIR *pDir = new DIR;
     memset(pDir, 0, sizeof(DIR));
 	pDir->dirPath = new SWBuf();
-    wchar_t buf[MAX_PATH + 1];
-	*(pDir->dirPath) = windizePath(pSpec);
+    TCHAR buf[MAX_PATH];
+	mbstowcs(buf, pDir->dirPath->c_str(), MAX_PATH);
+	*(pDir->dirPath) = adaptpath(pSpec);
 	*(pDir->dirPath) += "\\*";
-	pDir->hFind = FindFirstFile(strtowstr(buf, pDir->dirPath->c_str(), MAX_PATH + 1), &(pDir->wfd));
+	pDir->hFind = FindFirstFile(buf, &(pDir->wfd));
 	return pDir;
 }
 
-
-void closedir(DIR * pDir) {
-//MessageBox(0,L"closedir",L"STAGE",MB_OK|MB_ICONERROR);
+void closedir(DIR * pDir)
+{
     if(pDir->hFind)
 	    FindClose( pDir->hFind );
 	delete pDir->dirPath;
     delete pDir;
 }
 
+struct dirent* readdir(DIR *pDir)
+{
+    char buf[MAX_PATH + 1];
+	if (pDir->hFind)
+	{
+		wcstombs(buf, pDir->wfd.cFileName, MAX_PATH);
 
-struct dirent* readdir(DIR *pDir) {
-    char buf[MAX_PATH + 1];
-	if (pDir->hFind) {
-//MessageBox(0,pDir->wfd.cFileName,L"readdir returning",MB_OK|MB_ICONERROR);
-		strcpy(pDir->de.d_name, wstrtostr(buf, pDir->wfd.cFileName, MAX_PATH + 1));
+		strcpy(pDir->de.d_name, buf);
         if ( !FindNextFile(pDir->hFind, &(pDir->wfd)) ){
             FindClose(pDir->hFind);
 			pDir->hFind = NULL;
@@ -43,16 +45,15 @@
 	return NULL;
 }
 
+void rewinddir(DIR* dir)
+{
+    wchar_t buf[MAX_PATH];
 
-void rewinddir(DIR* dir) {
-    wchar_t buf[MAX_PATH + 1];
-//MessageBox(0,L"rewinddir",L"STAGE",MB_OK|MB_ICONERROR);
     if(dir->hFind)
         FindClose(dir->hFind);
-	dir->hFind = FindFirstFile(strtowstr(buf, dir->dirPath->c_str(), MAX_PATH + 1), &(dir->wfd));
-}
 
+	mbstowcs(buf, dir->dirPath->c_str(), MAX_PATH);
 
+	dir->hFind = FindFirstFile(buf, &(dir->wfd));
+}
 
-//#define fclose(f)  { if (f!=NULL) fclose(f); }
-

Deleted: trunk/src/Dll1/winceSword/src/swordce.cpp
===================================================================
--- trunk/src/Dll1/winceSword/src/swordce.cpp	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/Dll1/winceSword/src/swordce.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -1,93 +0,0 @@
-#include <swordce.h>
-#include <swbuf.h>
-#include <windows.h>
-
-using sword::SWBuf;
-// TODO: from the DLL entry point, figure out the path
-// to the dll file and use that for cwd  ........  done BD - see below
-const char *getWorkingDirectory() {  
-
-	// static const char *cwd = "\\Program Files\\sword";
-
-	//  November 2007 - this code added BD to get current directory rather than use the
-	//  string above.    
-
-	static char buf[MAX_PATH+1];
-	char *cwd;
-	TCHAR ThisName[MAX_PATH+1];
-	int thatChar = -1;
-	cwd=buf;
-	GetModuleFileName(NULL, ThisName, MAX_PATH);   
-	// NULL as first parameter returns full path and filename of running executable
-	while (ThisName[thatChar++]) buf[thatChar] = ThisName[thatChar];
-	while (buf[thatChar--] != '\\');  // string copied from TCHAR to char - find path end
-	buf[++thatChar] = NULL; // NULL terminate the c string
-  	return cwd;
-}
-
-
-wchar_t *strtowstr(wchar_t *dst, const char *src, int size) {
-  int i = 0;
-  while (i < (size - 1) && *src){
-    dst[i] = (wchar_t)src[i];
-    i++;
-  }
-  dst[i] = 0;
-  //MessageBoxW(0, dst, L"I'm leaving strtowstr()", MB_OK);
-  return dst;
-}
-
-char *wstrtostr(char *dst, const wchar_t *src, int size) {
-//  MessageBox(0, src, L"I'm in wstrtostr()", MB_OK);
-  int i = 0;
-  while (i < (size - 1) && *src){
-    dst[i] = (char)src[i];
-    i++;
-  }
-  dst[i] = 0;
-  return dst;
-}
-
-
-const char *windizePath(const char *path) {
-	static SWBuf retVal = "";
-	retVal = "";
-
-	if ((*path != '/') && (*path != '\\'))
-		retVal = getWorkingDirectory();
-	retVal += "/";
-	SWBuf tmp = path;
-	while ((tmp[0] == '/') || (tmp[0] == '\\') || (tmp[0] == '.'))
-		tmp << 1;
-	retVal += tmp;
-
-	for (int pos = 0; retVal[pos]; pos++) {
-	
-		switch (retVal[pos]) {
-		case '/':
-			retVal[pos] = '\\';
-			break;
-		}
-	}
-
-	return retVal.c_str();
-}
-
-
-/*
-int stricmp(const char *s1, const char *s2) {
-	char diff;
-	int i;
-	for (i = 0; ((*s2) && (*s1)); i++) {
-		if ((diff = toupper(*s1) - toupper(*s2)))
-			return diff;
-		s1++;
-		s2++;
-	}
-	return (!*s1)?((!*s2)?0:-1):1;
-}
-*/
-
-//namespace sword {
-//	int stricmp(const char *s1, const char *s2) { return ::stricmp(s1, s2); }
-//}
\ No newline at end of file

Deleted: trunk/src/Dll1/winceSword/src/swwinlog.cpp
===================================================================
--- trunk/src/Dll1/winceSword/src/swwinlog.cpp	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/Dll1/winceSword/src/swwinlog.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -1,97 +0,0 @@
-#include "swwinlog.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include <swordce.h>
-#include <swlog.h>
-
-SWORD_NAMESPACE_START
-
-
-// can't do this in main app cuz static class exports are not
-// really exported???
-
-class __staticsystemwinlog {
-public:
-	__staticsystemwinlog() {
-		SWLog::setSystemLog(new SWWinLog(0));
-	}
-} _staticsystemwinlog;
-
-// ---------------------------------------------------------
-
-
-SWWinLog::SWWinLog(HWND iparent) : SWLog() {
-	parent = iparent;
-}
-
- 
-void SWWinLog::LogWarning(char *fmt, ...)
-{
-	char msg[2048];
-    const int BUF_SIZE = 512;
-    wchar_t buf[BUF_SIZE];
-
-	va_list argptr;
-
-	if (logLevel >= 2) {
-		va_start(argptr, fmt);
-		vsprintf(msg, fmt, argptr);
-		va_end(argptr);
-
-		MessageBox(parent, strtowstr(buf, msg, BUF_SIZE), L"Warning", MB_OK);
-	}
-}
-
-
-void SWWinLog::LogError(char *fmt, ...)
-{
-	char msg[2048];
-    const int BUF_SIZE = 512;
-    wchar_t buf[BUF_SIZE];
-	va_list argptr;
-
-	if (logLevel) {
-		va_start(argptr, fmt);
-		vsprintf(msg, fmt, argptr);
-		va_end(argptr);
-
-		MessageBox(parent, strtowstr(buf, msg, BUF_SIZE), L"Error", MB_OK);
-	}
-}
-
-
-void SWWinLog::LogTimedInformation(char *fmt, ...)
-{
-	char msg[2048];
-    const int BUF_SIZE = 512;
-    wchar_t buf[BUF_SIZE];
-	va_list argptr;
-
-	if (logLevel >= 4) {
-		va_start(argptr, fmt);
-		vsprintf(msg, fmt, argptr);
-		va_end(argptr);
-
-		MessageBox(parent, strtowstr(buf, msg, BUF_SIZE), L"Information...", MB_OK);
-
-	}
-}
-
-
-void SWWinLog::LogInformation(char *fmt, ...)
-{
-	char msg[2048];
-    const int BUF_SIZE = 512;
-    wchar_t buf[BUF_SIZE];
-	va_list argptr;
-
-	if (logLevel >= 3) {
-		va_start(argptr, fmt);
-		vsprintf(msg, fmt, argptr);
-		va_end(argptr);
-
-		MessageBox(parent, strtowstr(buf, msg, BUF_SIZE), L"Information", MB_OK);
-	}
-}
-
-SWORD_NAMESPACE_END

Modified: trunk/src/Dll1/winceSword/src/unistd.cpp
===================================================================
--- trunk/src/Dll1/winceSword/src/unistd.cpp	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/Dll1/winceSword/src/unistd.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -2,17 +2,19 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <windows.h>
-#include <swordce.h>
 #include <unistd.h>
+#include <swbuf.h>
 
+using sword::SWBuf;
+
 // TODO: make list of our own file handles to make this work
 // static list<int, HANDLE> openFileHandles
 // static int nextFileHandle = 1
 
-
-int close (int fd) {
-//MessageBox(0,L"close",L"STAGE",MB_OK|MB_ICONERROR);
-	if (fd > 0) {
+int close (int fd)
+{
+	if (fd > 0)
+	{
 	  CloseHandle(*(HANDLE *)fd);
 	  delete (HANDLE *)fd;
 	  fd = 0;
@@ -21,52 +23,43 @@
 }
 
 
-int open(const char *path, int mode) {
-//MessageBox(0,strtowstr(path),L"open",MB_OK|MB_ICONERROR);
+int open(const char *path, int mode)
+{
   bool exists = false;
-  const char *winPath = windizePath(path);
-  wchar_t wbuf[MAX_PATH + 1];
+  const char *winPath = adaptpath(path);
+  wchar_t wbuf[MAX_PATH];
   DWORD access = 0;
   DWORD create = OPEN_EXISTING;
   DWORD share = FILE_SHARE_READ;
 
-  if (mode & O_WRONLY)
-    access |= GENERIC_WRITE;
-  else {
-    access |= GENERIC_READ;
-  }
-
-  if (mode & O_RDWR) {
-    access |= GENERIC_READ | GENERIC_WRITE;
-  }
+  if (mode & O_WRONLY) access |= GENERIC_WRITE;
+  else                 access |= GENERIC_READ;
   
+  if (mode & O_RDWR)   access |= GENERIC_READ | GENERIC_WRITE;
+  
+  mbstowcs(wbuf, winPath, MAX_PATH);
+  
   // Quick test to see if file exists, if it does not exist this call fails.
+  HANDLE hEx = CreateFile(wbuf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
   
-  HANDLE hEx = CreateFile(strtowstr(wbuf, winPath, MAX_PATH + 1), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-  if(hEx != INVALID_HANDLE_VALUE){
+  if(hEx != INVALID_HANDLE_VALUE)
+  {
 	  CloseHandle(hEx);
 	  exists = true;
-  }else{
+  }
+  else
+  {
 	  exists = false;
   }
 
-  if(!exists && mode & O_CREAT)
-    create = OPEN_ALWAYS;
-  if(exists && mode & O_TRUNC)
-	create = TRUNCATE_EXISTING;
+  if(!exists && mode & O_CREAT) create = OPEN_ALWAYS;
+  if(exists && mode & O_TRUNC) create = TRUNCATE_EXISTING;
 
-//  if (!(access & GENERIC_WRITE))
-//	share |= FILE_SHARE_WRITE;
-
-//  if (mode & O_BINARY)
-
   HANDLE *result = new HANDLE;
-  *result = CreateFile(strtowstr(wbuf, winPath, MAX_PATH + 1), access, share, NULL, create, FILE_ATTRIBUTE_NORMAL, NULL);
+  (*result) = CreateFile(wbuf, access, share, NULL, create, FILE_ATTRIBUTE_NORMAL, NULL);
 
-
-//  int result=(int)fopen(winPath, cmode);
-
-  if (*result == INVALID_HANDLE_VALUE) {
+  if (*result == INVALID_HANDLE_VALUE)
+  {
 	  WCHAR buf[100];
 	  mbstowcs(buf,"file: ",6);
 	  mbstowcs(&buf[6],winPath,100);
@@ -77,42 +70,45 @@
 	  delete result;
 	  result = (HANDLE *)-1;
   }
-  if (((int)result > -1) && (mode & O_APPEND)) {
+  
+  if (((int)result > -1) && (mode & O_APPEND))
+  {
 	  SetFilePointer(*result, 0, 0, FILE_END);
   }
 
   return (int)result;
 }
 
-
-int open(const char *path, int access, unsigned mode) {
+int open(const char *path, int access, unsigned mode)
+{
 	return open(path, access | mode);
 }
 
+int read(int fd, void *buf, size_t count)
+{
+	DWORD readCount;
 
-int read(int fd, void *buf, size_t count) {
-	DWORD readCount;
-__try {
-	ReadFile(*(HANDLE *)fd, buf, (DWORD)count, &readCount, NULL);
-} __except (EXCEPTION_EXECUTE_HANDLER) {
-	return 0;
-}
+	__try
+	{
+		ReadFile(*(HANDLE *)fd, buf, (DWORD)count, &readCount, NULL);
+	}
+	__except (EXCEPTION_EXECUTE_HANDLER)
+	{
+		return 0;
+	}
+
 	return (int)readCount;
-
 }
 
-
-int write(int fd, const void *buf, size_t count) {
+int write(int fd, const void *buf, size_t count)
+{
 	DWORD writtenCount;
 	WriteFile(*(HANDLE *)fd, buf, (DWORD)count, &writtenCount, NULL);
 	return writtenCount;
 }
 
-//int write(int fd, const char * buf, size_t count)
-
-
-off_t lseek(int fildes, off_t offset, int whence) {
-
+off_t lseek(int fildes, off_t offset, int whence)
+{
 	DWORD wWence = 0;
 	switch (whence) {
 	case SEEK_SET:
@@ -126,7 +122,6 @@
 		break;
 	}
 
-
 	off_t retVal = SetFilePointer(*(HANDLE *)fildes, (LONG)offset, 0, wWence);
 
 	if (retVal == 0xFFFFFFFF)
@@ -135,35 +130,36 @@
 	return retVal;	
 }
 
-int access(const char* path, int mode) {
+int access(const char* path, int mode)
+{
 	int retVal = 0;
-    wchar_t buf[MAX_PATH + 1];
+    TCHAR buf[MAX_PATH];
+	
+	mbstowcs(buf, adaptpath(path), MAX_PATH);
 
-	DWORD attribs = GetFileAttributes(strtowstr(buf, windizePath(path), MAX_PATH + 1));
+	DWORD attribs = GetFileAttributes(buf);
 
 	if (attribs == 0xFFFFFFFF)
 		retVal = 1;
 	else if (((mode & O_RDWR) || (mode & O_WRONLY)) && (attribs & FILE_ATTRIBUTE_READONLY))
 		retVal = 1;
-/*
-	int fd = open(path, mode);
-	if (fd > 0)
-		close(fd);
-	retVal = (fd < 1);
-*/
+
 	return retVal;
 }
 
-
-int stat(const char *path, struct stat *s) {
+int stat(const char *path, struct stat *s)
+{
 	int retVal = 0;
-    wchar_t buf[MAX_PATH + 1];
-	DWORD attribs = GetFileAttributes(strtowstr(buf,windizePath(path),MAX_PATH + 1));
+    wchar_t buf[MAX_PATH];
+	mbstowcs(buf, adaptpath(path), MAX_PATH);
+	DWORD attribs = GetFileAttributes(buf);
 
-	if (attribs == 0xFFFFFFFF) {
+	if (attribs == 0xFFFFFFFF)
+	{
 		retVal = 1;
 	}
-	else {
+	else
+	{
 		s->st_mode = attribs;
 	}
 
@@ -172,11 +168,62 @@
 
 
 // TODO: create a directory
-int mkdir(const char *) {
+int mkdir(const char *)
+{
+	ASSERT(0);
 	return 0;
 }
 
 // TODO: delete a file
-int remove(const char *) {
+int remove(const char *)
+{
+	ASSERT(0);
 	return 0;
 }
+
+const char* adaptpath(const char *path)
+{
+	static SWBuf retVal;
+	retVal = "";
+
+	if ((*path != '/') && (*path != '\\'))
+	{
+		static char buf[MAX_PATH] = "\\";
+
+		if (!strcmp(buf,"\\"))
+		{
+			TCHAR tbuf[MAX_PATH];
+
+			GetModuleFileName(NULL, tbuf, MAX_PATH);
+
+			for (int i=_tcslen(tbuf); i>=0; i--)
+			{
+				if (tbuf[i]==L'\\')
+				{
+					wcstombs(buf, tbuf, i);
+					break;
+				}
+				ASSERT(i!=0);
+			}
+		}
+		retVal = buf;
+	}
+
+	retVal += "/";
+	SWBuf tmp = path;
+	while ((tmp[0] == '/') || (tmp[0] == '\\') || (tmp[0] == '.'))
+		tmp << 1;
+	retVal += tmp;
+
+	for (int pos = 0; retVal[pos]; pos++)
+	{
+		switch (retVal[pos])
+		{
+		case '/':
+			retVal[pos] = '\\';
+			break;
+		}
+	}
+
+	return retVal.c_str();
+}

Added: trunk/src/SlideBible/SlideBible.vcproj
===================================================================
--- trunk/src/SlideBible/SlideBible.vcproj	                        (rev 0)
+++ trunk/src/SlideBible/SlideBible.vcproj	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,1797 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="SlideBible"
+	ProjectGUID="{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+		/>
+		<Platform
+			Name="Pocket PC 2003 (ARMV4)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalOptions="/D &quot;KOTIK&quot; /D &quot;NO_VSNPRINTF&quot;"
+				Optimization="3"
+				AdditionalIncludeDirectories="..\Dll1\winceSword\include\;..\..\..\..\sword\trunk\include\"
+				PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
+				IgnoreStandardIncludePath="false"
+				StringPooling="true"
+				MinimalRebuild="false"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				BrowseInformation="0"
+				WarningLevel="3"
+				DebugInformationFormat="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/subsystem:windowsce,5.01"
+				AdditionalDependencies="aygshell.lib"
+				OutputFile="$(OutDir)/SlideBible.exe"
+				LinkIncremental="2"
+				DelayLoadDLLs="$(NOINHERIT)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/SlideBible.pdb"
+				SubSystem="0"
+				StackReserveSize="65536"
+				StackCommitSize="4096"
+				EntryPointSymbol="WinMainCRTStartup"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Pocket PC 2003 (ARMV4)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);STANDARDSHELL_UI_MODEL;_DEBUG;DEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);STANDARDSHELL_UI_MODEL;_DEBUG;DEBUG"
+				MinimalRebuild="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);STANDARDSHELL_UI_MODEL;_DEBUG;DEBUG"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/subsystem:windowsce,$(CEVER) /machine:$(ARCHFAM)"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				StackReserveSize="65536"
+				StackCommitSize="4096"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="2"
+				FavorSizeOrSpeed="2"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" /subsystem:windowsce,5.01"
+				OutputFile="$(OutDir)/SlideBible.exe"
+				LinkIncremental="1"
+				DelayLoadDLLs="$(NOINHERIT)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/SlideBible.pdb"
+				SubSystem="0"
+				StackReserveSize="65536"
+				StackCommitSize="4096"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Pocket PC 2003 (ARMV4)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);STANDARDSHELL_UI_MODELNDEBUG"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="2"
+				FavorSizeOrSpeed="2"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);STANDARDSHELL_UI_MODELNDEBUG"
+				MinimalRebuild="false"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);STANDARDSHELL_UI_MODELNDEBUG"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/subsystem:windowsce,$(CEVER) /machine:$(ARCHFAM)"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				StackReserveSize="65536"
+				StackCommitSize="4096"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="header"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath=".\sbCollection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sbControl.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sbCore.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sbCross.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sbItem.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sbList.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sbObject.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sbTheme.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="sword"
+			>
+			<Filter
+				Name="source"
+				>
+				<Filter
+					Name="utilfuns"
+					>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\regex.c"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\roman.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\swbuf.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\swobject.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\swunicod.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\swversion.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\url.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\utilstr.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\utilfuns\utilxml.cpp"
+						>
+					</File>
+					<Filter
+						Name="zlib"
+						>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\adler32.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\compress.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\crc32.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\deflate.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\deflate.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infblock.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infblock.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infcodes.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infcodes.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inffast.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inffast.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inffixed.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inflate.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inftrees.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\inftrees.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infutil.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\infutil.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\maketree.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\trees.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\trees.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\uncompr.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\zutil.c"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\utilfuns\zlib\zutil.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="modules"
+					>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\modules\swmodule.cpp"
+						>
+					</File>
+					<Filter
+						Name="comments"
+						>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\comments\swcom.cpp"
+							>
+						</File>
+						<Filter
+							Name="hrefcom"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\hrefcom\hrefcom.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="rawcom"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\rawcom\rawcom.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="rawfiles"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\rawfiles\rawfiles.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="zcom"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\zcom\zcom.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="rawcom4"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\comments\rawcom4\rawcom4.cpp"
+								>
+							</File>
+						</Filter>
+					</Filter>
+					<Filter
+						Name="common"
+						>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\entriesblk.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\lzsscomprs.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\rawstr.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\rawstr4.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\rawverse.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\rawverse4.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\sapphire.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\swcipher.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\swcomprs.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\zipcomprs.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\zstr.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\common\zverse.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="filters"
+						>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\cipherfil.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbffootnotes.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfheadings.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfhtml.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfhtmlhref.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfmorph.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfosis.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfplain.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfredletterwords.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfrtf.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfstrongs.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfthml.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\gbfwebif.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\greeklexattribs.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\latin1utf16.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\latin1utf8.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisfootnotes.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisheadings.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osishtmlhref.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osislemma.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osismorph.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osismorphsegmentation.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisosis.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisplain.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisredletterwords.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisrtf.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisruby.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisscripref.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osisstrongs.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\osiswebif.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\papyriplain.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\plainfootnotes.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\plainhtml.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\rtfhtml.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\swbasicfilter.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\swoptfilter.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\teihtmlhref.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\teiplain.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\teirtf.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlfootnotes.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlgbf.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlheadings.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlhtml.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlhtmlhref.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmllemma.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlmorph.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlosis.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlplain.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlrtf.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlscripref.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlstrongs.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlvariants.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\thmlwebif.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\unicodertf.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf16utf8.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8arabicpoints.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8arshaping.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8bidireorder.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8cantillation.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8greekaccents.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8hebrewpoints.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8html.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8latin1.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8nfc.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8nfkd.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8transliterator.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\filters\utf8utf16.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="genbook"
+						>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\genbook\swgenbook.cpp"
+							>
+						</File>
+						<Filter
+							Name="rawgenbook"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\genbook\rawgenbook\rawgenbook.cpp"
+								>
+							</File>
+						</Filter>
+					</Filter>
+					<Filter
+						Name="lexdict"
+						>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\lexdict\swld.cpp"
+							>
+						</File>
+						<Filter
+							Name="rawld"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\lexdict\rawld\rawld.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="rawld4"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\lexdict\rawld4\rawld4.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="zld"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\lexdict\zld\zld.cpp"
+								>
+							</File>
+						</Filter>
+					</Filter>
+					<Filter
+						Name="texts"
+						>
+						<File
+							RelativePath="..\..\..\..\sword\trunk\src\modules\texts\swtext.cpp"
+							>
+						</File>
+						<Filter
+							Name="rawtext"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\texts\rawtext\rawtext.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="ztext"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\texts\ztext\ztext.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="rawtext4"
+							>
+							<File
+								RelativePath="..\..\..\..\sword\trunk\src\modules\texts\rawtext4\rawtext4.cpp"
+								>
+							</File>
+						</Filter>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="mgr"
+					>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\encfiltmgr.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\filemgr.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\localemgr.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\markupfiltmgr.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\stringmgr.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swcacher.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swconfig.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swfiltermgr.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swlocale.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swmgr.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\swsearchable.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\mgr\versemgr.cpp"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="keys"
+					>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\keys\listkey.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\keys\strkey.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\keys\swkey.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\keys\treekey.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\keys\treekeyidx.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\keys\versekey.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\keys\versetreekey.cpp"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="frontend"
+					>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\frontend\swdisp.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\..\sword\trunk\src\frontend\swlog.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="header"
+				>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\apocrypha.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\canon.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\cdsourcemgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\cipherfil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\defs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\echomod.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\encfiltmgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\entriesblk.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\femain.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\filemgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\flatapi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\ftpparse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbffootnotes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfheadings.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfhtml.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfhtmlhref.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfmorph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfosis.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfplain.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfredletterwords.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfrtf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfstrongs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfthml.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\gbfwebif.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\Greek2Greek.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\GreekChars.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\greeklexattribs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\hebrewmcim.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\hrefcom.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\installmgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\latin1utf16.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\latin1utf8.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\listkey.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\localemgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\lzsscomprs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\markupfiltmgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\multimapwdef.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\nullim.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osisfootnotes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osisheadings.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osishtmlhref.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osislemma.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osismorph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osisosis.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osisplain.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osisredletterwords.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osisrtf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osisscripref.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osisstrongs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\osiswebif.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\plainfootnotes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\plainhtml.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawcom.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawfiles.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawgbf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawgenbook.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawld.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawld4.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawstr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawstr4.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawtext.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rawverse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\regex.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\remotesourcemgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\roman.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\rtfhtml.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\sapphire.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\stringmgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\strkey.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swbasicfilter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swbuf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swcacher.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swcipher.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swcom.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swcomprs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swconfig.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swdisp.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swdisprtf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swdisprtfchap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swfilter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swfiltermgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swgenbook.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swinputmeth.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swinstallmgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swkey.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swld.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swlocale.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swlog.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swmacs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swmgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swmodule.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swobject.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swoptfilter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swremotemgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swsearchable.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swsourcemgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swtext.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swunicod.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\swversion.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\sysdata.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\tbdisp.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\teihtmlhref.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlfootnotes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlgbf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlheadings.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlhtml.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlhtmlhref.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmllemma.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlmorph.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlosis.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlplain.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlrtf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlscripref.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlstrongs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlvariants.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\thmlwebif.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\treekey.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\treekeyidx.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\unicodertf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\unixstr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\untgz.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\url.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf16utf8.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8arshaping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8bidireorder.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8cantillation.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8greekaccents.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8hebrewpoints.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8html.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8latin1.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8nfc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8nfkd.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8transliterator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utf8utf16.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utilconf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utilfuns.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utilstr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utilweb.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\utilxml.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\versekey.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\versemgr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\zcom.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\zconf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\zipcomprs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\zld.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\zlib.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\zstr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\ztext.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\..\sword\trunk\include\zverse.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="wince"
+				>
+				<Filter
+					Name="source"
+					>
+					<File
+						RelativePath="..\Dll1\winceSword\src\dirent.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Dll1\winceSword\src\fcntl.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\Dll1\winceSword\src\unistd.cpp"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="header"
+					>
+					<File
+						RelativePath="..\Dll1\winceSword\include\dirent.h"
+						>
+					</File>
+					<File
+						RelativePath="..\Dll1\winceSword\include\errno.h"
+						>
+					</File>
+					<File
+						RelativePath="..\Dll1\winceSword\include\fcntl.h"
+						>
+					</File>
+					<File
+						RelativePath="..\Dll1\winceSword\include\unistd.h"
+						>
+					</File>
+					<Filter
+						Name="sys"
+						>
+						<File
+							RelativePath="..\Dll1\winceSword\include\sys\errno.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Dll1\winceSword\include\sys\stat.h"
+							>
+						</File>
+						<File
+							RelativePath="..\Dll1\winceSword\include\sys\types.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="source"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath=".\main.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\sbCollection.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\sbControl.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\sbCore.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\sbItem.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\sbList.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\sbTheme.cpp"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\ui\scheme.txt"
+			>
+		</File>
+		<File
+			RelativePath=".\todo.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: trunk/src/SlideBible/main.cpp
===================================================================
--- trunk/src/SlideBible/main.cpp	                        (rev 0)
+++ trunk/src/SlideBible/main.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,155 @@
+/*************************************************************************
+ * main.cpp - SlideBible main program entry
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#include "sbCore.h"
+
+#define SR_NON_INSTANCE 0
+
+class sbApp
+{
+public:
+    sbApp(HINSTANCE hInstance) : m_hAccelTable(0)
+	{
+		s_hInstance = hInstance;
+
+		memset(&s_sai, 0, sizeof(s_sai));
+		s_sai.cbSize = sizeof(s_sai);
+		m_hAccelTable = LoadAccelerators(hInstance, NULL);
+
+		WNDCLASS wc;
+
+		wc.style         = 0;
+		wc.lpfnWndProc   = wndProc;
+		wc.cbClsExtra    = 0;
+		wc.cbWndExtra    = 0;
+		wc.hInstance     = 0;
+		wc.hIcon         = 0;
+		wc.hCursor       = 0;
+		wc.hbrBackground = (HBRUSH) GetStockObject(BLACK_BRUSH);
+		wc.lpszMenuName  = 0;
+		wc.lpszClassName = L"SlideBible";
+
+		if (!RegisterClass(&wc))
+		{
+			PostQuitMessage(1);
+			return;
+		}
+
+		core = new sbCore();
+	}
+
+   	~sbApp()
+	{
+		if (core != NULL) delete core;
+	}
+
+	WPARAM Run()
+	{
+		MSG msg;
+
+		while (GetMessage(&msg, NULL, 0, 0)) 
+		{
+			if (!m_hAccelTable || !TranslateAccelerator(msg.hwnd, m_hAccelTable, &msg)) 
+			{
+				TranslateMessage(&msg);
+				DispatchMessage(&msg);
+			}
+		}
+		return msg.wParam;
+	}
+
+	static LRESULT CALLBACK wndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+	{
+		switch(message)
+		{
+		case WM_HIBERNATE:
+			printf("Message : WM_HIBERNATE\n");
+			return 0;
+
+		case WM_ERASEBKGND:
+			return 1;
+
+		case WM_KILLFOCUS: // loose focus
+			core->setSipState(false);
+			core->switchList(sbList::TYPE_NONE);
+			break;
+
+		case WM_SETFOCUS: // receive focus
+			core->switchList(sbList::TYPE_CURRENT);
+			break;
+
+		case WM_ACTIVATE:
+			SHFullScreen(hwnd, SHFS_HIDESIPBUTTON | SHFS_HIDETASKBAR | SHFS_HIDESTARTICON);
+			break;
+
+		case WM_PAINT:
+			return core->onPaint();
+			break;
+
+		case WM_LBUTTONDOWN:
+		case WM_LBUTTONUP:
+		case WM_MOUSEMOVE:
+			return core->onMouse(LOWORD(lParam), HIWORD(lParam), message);
+			break;
+
+		case WM_KEYDOWN:
+			break;
+
+		case WM_KEYUP:
+			break;
+
+		case WM_CHAR:
+			core->onChar((TCHAR)wParam);
+			break;
+
+		case WM_TIMER:
+			return core->onTimer(wParam);
+			break;
+		}
+		return DefWindowProc(hwnd, message, wParam, lParam);
+	}
+
+private:
+    static HINSTANCE        s_hInstance;
+    HACCEL                  m_hAccelTable;
+    static SHACTIVATEINFO   s_sai;
+    static sbCore          *core;
+};
+
+HINSTANCE sbApp::s_hInstance = SR_NON_INSTANCE;
+SHACTIVATEINFO sbApp::s_sai;
+sbCore* sbApp::core          = NULL;
+
+int WINAPI WinMain(	HINSTANCE hInstance,
+					HINSTANCE hPrevInstance,
+					LPTSTR    lpCmdLine,
+					int       nCmdShow)
+{
+	HWND hwnd = FindWindow(L"SlideBible", L"SlideBible");
+
+	if (hwnd)
+	{
+		SetForegroundWindow(hwnd);
+		return -1;
+	}
+
+	//HCURSOR hOldCursor = SetCursor(LoadCursor(NULL, IDC_WAIT));
+
+	sbApp app(hInstance);
+
+	//SetCursor(hOldCursor);
+
+	return app.Run();
+}

Added: trunk/src/SlideBible/sbCollection.cpp
===================================================================
--- trunk/src/SlideBible/sbCollection.cpp	                        (rev 0)
+++ trunk/src/SlideBible/sbCollection.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,107 @@
+/*************************************************************************
+ * sbVerses.cpp - collection verses contain information
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#include "sbCollection.h"
+#include <swconfig.h>
+#include <utilxml.h>
+#include "sbCore.h"
+
+sbCollection::sbCollection()
+{
+	allocated = 0;
+	data = NULL;
+	size = 0;
+	v11n = "KJV";
+}
+
+sbCollection::~sbCollection()
+{
+	if (data != NULL) delete [] data;
+}
+
+sbCollection::ITEM& sbCollection::add (sword::VerseKey set)
+{
+	if (data == NULL)
+	{
+		allocated = 8;
+		data = new ITEM [allocated];
+	}
+
+	data[size].verse = set;
+	size++;
+
+	if (size == allocated) // realloc
+	{
+		allocated += 8;
+		ITEM* _data = new ITEM [allocated];
+		for (int i=0; i<size; i++)
+			_data[i] = data[i];
+		delete [] data;
+		data = _data;
+	}
+	return data[size-1];
+}
+
+void sbCollection::save (const char* filename, const char* section)
+{
+	sword::SWConfig  conf(filename);
+	conf.Load();
+
+	char s_size[5];
+	_itoa(size,s_size,10);
+	conf[section]["Size"] = s_size;
+	
+	for (int i=0; i<size; i++)
+	{
+		char line[4];
+		sprintf(line,"%02i",i);
+
+		char buf[256];
+		
+		_snprintf(buf,256,"<item key=\"%s\" dynamic=\"%i\">",data[i].verse.getText(), data[i].dynamic);
+
+		conf[section][line] = buf;
+	}
+
+	conf.Save();
+}
+
+void sbCollection::load (const char* filename, const char* section)
+{
+	sword::SWConfig  conf(filename);
+	conf.Load();
+
+	const int t_size = atoi(conf[section].getWithDefault("Size","0"));
+	v11n = conf[section].getWithDefault("v11n","KJV");
+
+	for (int i=0; i<t_size; i++)
+	{
+		char line[4];
+		sprintf(line,"%02i",i);
+
+		const char* buf = conf[section][line];
+
+		sword::XMLTag tag(buf);
+
+		sword::VerseKey key = tag.getAttribute("key");
+
+		if (strcmp(key.getVersificationSystem(),v11n))
+			sbAssert(true);
+
+		ITEM* item = &add(key);
+		
+		item->dynamic = atoi(tag.getAttribute("dynamic"));
+	}
+}

Added: trunk/src/SlideBible/sbCollection.h
===================================================================
--- trunk/src/SlideBible/sbCollection.h	                        (rev 0)
+++ trunk/src/SlideBible/sbCollection.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,66 @@
+/*************************************************************************
+ * sbCollection.h - collection of verses contain different information
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+// TODO rename to sbVellection
+// TODO does Verse Collections need versification?
+
+#ifndef SBCOLLECTION_H
+#define SBCOLLECTION_H
+
+#include <versekey.h>
+
+class sbCollection
+{
+public:
+	sbCollection();
+	~sbCollection();
+
+	struct ITEM
+	{
+		bool                 dynamic:1;
+		
+		unsigned int         created;
+		unsigned int         visited;
+		
+		unsigned short       rating;
+		unsigned char        visit;
+
+		sword::VerseKey      verse;
+	};
+
+	sbCollection::ITEM&      add                (sword::VerseKey key);
+
+	void                     remove              (int id);
+	void                     remove              (sword::VerseKey key);
+	int                      count               () const {return size;}
+	int                      find                (sword::VerseKey key);
+
+	const TCHAR*             name                () const {return title;}
+	void                     name                (TCHAR* title);
+
+	ITEM&                    operator[]          (const int pos) {return data[pos];}
+
+	void                     load                (const char* filename, const char* section);
+	void                     save                (const char* filename, const char* section);
+
+private:
+	ITEM*                    data;
+	const char*              v11n;
+	int                      size;
+	int                      allocated;
+	TCHAR*                   title;
+};
+
+#endif

Added: trunk/src/SlideBible/sbControl.cpp
===================================================================
--- trunk/src/SlideBible/sbControl.cpp	                        (rev 0)
+++ trunk/src/SlideBible/sbControl.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,299 @@
+/*************************************************************************
+ * sbControl.cpp - items on screen
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#include "sbCore.h"
+#include "sbControl.h"
+
+sbRect layout (int index, int num, int scheme)
+{
+	const int themeSize = Core->getTheme()->size;
+	const sbRect* screenRect = &Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->rect;
+
+	sbRect rect;
+
+	if (scheme == 1) // bottom bar
+	{
+		rect.left   (screenRect->right()*(index-1)/num);
+		rect.top    (screenRect->bottom()-(themeSize*20/100));
+		rect.right  (screenRect->right()*index/num);
+		rect.bottom (screenRect->bottom());
+	}
+	else if (scheme == 2) // can switch
+	{
+		rect.left   (screenRect->right()*(index-1)/num);
+		rect.top    (screenRect->bottom()-(themeSize*40/100));
+		rect.right  (screenRect->right()*index/num);
+		rect.bottom (screenRect->bottom()-(themeSize*20/100));
+	}
+	else if (scheme == 0) // screen matrix
+	{
+		int rows, columns, pv, ph, sep=themeSize/((num+2)*4), indent=max(themeSize*8/100,sep*4/3);
+
+		columns = (int)sqrt(num+2);
+		rows = (int)ceil(num/(float)columns);
+
+		pv = index%columns == 0 ? columns : index%columns;
+		ph = ((index-pv)/columns)+1;
+
+		rect.left (indent+((screenRect->right()-(indent*2)+sep)*(pv-1)/columns));
+		rect.top ((themeSize*10/100)+indent+((screenRect->bottom()-(themeSize*30/100)-(indent*2)+sep)*(ph-1)/rows));
+		rect.right (indent+((screenRect->right()-(indent*2)+sep)*pv/columns)-sep);
+		rect.bottom ((themeSize*10/100)+indent+((screenRect->bottom()-(themeSize*30/100)-(indent*2)+sep)*ph/rows)-sep);
+
+		int w = rect.width();
+		int h = rect.height();
+
+		if ( h > w )
+		{
+			rect.top ( rect.top() + ((h-w)/2) );
+			rect.bottom ( rect.top() + w );
+		}
+	}
+	else
+		sbAssert ( true );
+
+	return rect;
+}
+
+sbControl::sbControl ( TYPE _type_ )
+: type ( _type_ )
+, text ( L"" )
+, sbObject ( "sbControl" )
+{
+	const int themeSize = Core->getTheme()->size;
+	const sbRect* screenRect = &Core->getSurface( sbCore::SURFACE::TYPE_WHOLE )->rect;
+
+	switch (type)
+	{
+	case TYPE_CLOSE:                 rect = layout(4,4,1);   setText(L"(X)"); break;
+	case TYPE_BUTTON_CLOSE:          rect = layout(4,4,1);   setText(L"X"); break;
+	case TYPE_OPEN_BOOK_SELECTION:   rect = layout(1,4,1);   setText(L"B"); break;
+	case TYPE_OPEN_MODULE_SELECTION: rect = layout(2,4,1);   setText(L"M"); break;
+	case TYPE_OPEN_NAVIGATION:       rect = layout(1,4,1);   setText(L"N"); break;
+	case TYPE_MODE_ADD_STAR:         rect = layout(3,4,1);   setText(L"*"); break;
+	case TYPE_OPEN_SEARCH:           rect = layout(3,4,1);   setText(L"S"); break;
+	case TYPE_BUTTON_OPEN_FILE:      rect = layout(1,4,1);   setText(L"O"); break;
+	case TYPE_OPEN_TEXT:             rect = layout(2,4,1);   setText(L"|^|"); break;
+	case TYPE_OPEN_HOME:             rect = layout(2,4,1);   setText(L"|v|"); break;
+	case TYPE_WIDE_CLOSE:            rect = layout(1,1,1);   setText(L"Close"); break;
+	case TYPE_CAN_SWITCH_LEFT:       rect = layout(1,12,2);  setText(L"<"); break;
+	case TYPE_CAN_SWITCH_RIGHT:      rect = layout(12,12,2); setText(L">"); break;
+	case TYPE_MENU_EXIT:
+		rect = *screenRect;
+		
+		childrens.push_back(sbControl (sbControl::TYPE_MENU_EXIT_YES, layout(1,2,0), L"Yes"));
+		childrens.push_back(sbControl (sbControl::TYPE_MENU_EXIT_NO,  layout(2,2,0), L"No"));
+
+		setText(L"Exit?");
+		break;
+
+	case TYPE_MENU_VERSE:
+		rect = *screenRect;
+
+		// get verse state
+
+		childrens.push_back(sbControl (sbControl::TYPE_MENU_VERSE_ADD_DYNAMIC_BOOKMARK, layout(1,4,0), L"DB"));
+		childrens.push_back(sbControl (sbControl::TYPE_MENU_VERSE_ADD_STATIC_BOOKMARK,  layout(2,4,0), L"SB"));
+		childrens.push_back(sbControl (sbControl::TYPE_MENU_VERSE_REMOVE_BOOKMARK,      layout(3,4,0), L"-B"));
+		childrens.push_back(sbControl (sbControl::TYPE_MENU_VERSE_START_EDITING,        layout(4,4,0), L"Edit"));
+		childrens.push_back(sbControl (sbControl::TYPE_MENU_CANCEL,                     layout(1,1,1), L"Cancel"));
+
+		setText(L"Verse");
+		break;
+
+	default:
+		if (type >= TYPE_MENU_SET_VERSE && type < TYPE_MENU_SET_VERSE_MAX)
+		{
+			int count = type - TYPE_MENU_SET_VERSE;
+
+			static int max = 0;
+			if ( max == 0 ) max = atoi((*Core->getOptions())["Ui"].getWithDefault( "MaxVerses" , "50" ));
+
+			int step = count / max + 1;
+			count = count / step;
+
+			rect = *screenRect;
+
+			for ( int i = 1; i <= count; i++ )
+			{
+				TCHAR* text = new TCHAR [5];
+				text = _itot ( i*step , text , 10 );
+				
+				childrens.push_back(sbControl ((TYPE)(TYPE_SET_VERSE+(i*step)), layout(i,count+1,0), text));
+			}
+
+			childrens.push_back(sbControl (sbControl::TYPE_MENU_CANCEL, layout(1,1,1), L"Cancel"));
+
+			setText ( L"Select Verse:" );
+		}
+		else
+			sbAssert(true);
+
+		break;
+	}
+}
+
+sbControl::sbControl ( TYPE _type_ , const sbRect _rect_ , const TCHAR* _text_ )
+: type ( _type_ )
+, rect ( _rect_ )
+, sbObject ( "sbControl" )
+{
+	setText ( _text_ );
+}
+
+sbControl::~sbControl()
+{
+	if (isMenu())
+	{
+		sbMessage("Delete Menu.\n");
+	}
+
+	// some menus own children text
+	if (type >= TYPE_MENU_SET_VERSE && type < TYPE_MENU_SET_VERSE_MAX)
+	{
+		for (int i=0; i < childrens.size(); i++)
+			if (childrens[i].type != TYPE_MENU_CANCEL)
+				delete [] childrens[i].text;
+	}
+}
+
+void sbControl::onPaint (HDC hdc) const
+{
+	HFONT font = (HFONT)SelectObject(hdc, Core->getTheme()->styles[style].font);
+	sbColor color = SetTextColor(hdc, Core->getTheme()->ItemTextColor);
+	
+	switch (type)
+	{
+	case TYPE_CAN_SWITCH_LEFT:
+	case TYPE_CAN_SWITCH_RIGHT:
+		ExtTextOut ( hdc, textPos.x, textPos.y, ETO_OPAQUE, NULL, text, _tcslen(text), 0);
+		break;
+	default:
+		if (isMenu())
+		{
+			sbAssert(Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade != true);
+
+			Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade = false;
+			
+			for (int i=0; i < childrens.size(); i++) childrens[i].onPaint( hdc );
+
+			SetTextColor(hdc, Core->getTheme()->ItemMenuTextColor);
+			ExtTextOut(hdc, textPos.x, textPos.y, ETO_OPAQUE, NULL, text, _tcslen(text), 0);
+
+			Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade = true;
+		}
+		else
+		{
+			Core->getTheme()->drawElement(hdc, &rect, sbTheme::ELEMENT::CONTROL);
+			ExtTextOut(hdc, textPos.x, textPos.y, ETO_OPAQUE, NULL, text, _tcslen(text), 0);
+		}
+	}
+
+	SelectObject(hdc, font);
+	SetTextColor(hdc, color);
+}
+
+void sbControl::pressed()
+{
+	switch (type)
+	{
+	case TYPE_OPEN_HOME:
+		Core->switchList(sbList::TYPE_HOME);
+		break;
+	case TYPE_OPEN_TEXT:
+		Core->switchList(sbList::TYPE_MODULE_VIEW);
+		break;
+	case TYPE_OPEN_SEARCH:
+		Core->switchList(sbList::TYPE_SEARCH);
+		break;
+	case TYPE_OPEN_BOOK_SELECTION:
+		Core->switchList(sbList::TYPE_SELECT_BOOK);
+		break;
+	case TYPE_OPEN_MODULE_SELECTION:
+		Core->switchList(sbList::TYPE_SELECT_MODULE);
+		break;
+	case TYPE_MENU_EXIT_YES:
+		PostQuitMessage(1);
+		break;
+	case TYPE_OPEN_NAVIGATION:
+		Core->switchList(sbList::TYPE_NAVIGATION);
+		break;
+	case TYPE_WIDE_CLOSE:
+	case TYPE_CLOSE:
+		Core->switchList(sbList::PIN_PARENT);
+		break;
+	case TYPE_CAN_SWITCH_LEFT:
+	case TYPE_CAN_SWITCH_RIGHT:
+		break;
+	default:
+		{
+			if (isMenu())
+			{
+				for (int i=0; i < childrens.size(); i++)
+				{
+					if (childrens[i].hit(Core->getInput()->lastx, Core->getInput()->lasty))
+					{
+						childrens[i].pressed();
+					}
+				}
+			}
+			else
+			{
+				Core->controlPressed(type);
+			}
+		}
+	}
+}
+
+void sbControl::setText ( const TCHAR* _text_ )
+{
+	SIZE sz;
+	HDC hdc;
+
+	text = (TCHAR*) _text_;
+
+	if (text[0]==0) return;
+
+	hdc = CreateCompatibleDC(NULL);
+
+	const int h = (rect.height())/2;
+
+	if (h < Core->getTheme()->styles[sbTheme::STYLE::BUTTON_SMALL].size)
+		style = sbTheme::STYLE::BUTTON_SMALL;
+	else if (h < Core->getTheme()->styles[sbTheme::STYLE::TEXT].size)
+		style = sbTheme::STYLE::TEXT;
+	else if (h < Core->getTheme()->styles[sbTheme::STYLE::BUTTON].size)
+		style = sbTheme::STYLE::BUTTON;
+	else
+		style = sbTheme::STYLE::CAPTION;
+
+	SelectObject (hdc, Core->getTheme()->styles[style].font);
+	GetTextExtentPoint32(hdc, text, _tcslen(text), &sz);
+
+	textPos.x = (rect.width() - sz.cx) / 2 + rect.left();
+	textPos.y = (rect.height() - sz.cy) / 2 + rect.top();
+
+	DeleteDC(hdc);
+
+	if (isMenu())
+	{
+		int bottom = rect.bottom();
+
+		for (int i=0; i<childrens.size(); i++)
+			bottom = min(childrens[i].rect.top(),bottom);
+
+		textPos.y = rect.top()+((bottom-rect.top()-sz.cy)/2);
+	}
+}

Added: trunk/src/SlideBible/sbControl.h
===================================================================
--- trunk/src/SlideBible/sbControl.h	                        (rev 0)
+++ trunk/src/SlideBible/sbControl.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,99 @@
+/*************************************************************************
+ * sbControl.h - items on screen
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#ifndef SBCONTROL_H
+#define SBCONTROL_H
+
+#include "sbTheme.h"
+#include "sbObject.h"
+
+#include <vector>
+
+//using std::vector;
+
+// Screen Layout Generator
+sbRect layout ( int index , int num , int scheme );
+
+class sbControl : public sbObject
+{
+public:
+	enum TYPE
+	{
+		TYPE_NONE = 0,
+		TYPE_BUTTON_CLOSE,
+		TYPE_WIDE_CLOSE,
+		TYPE_CLOSE,
+		TYPE_BUTTON_OPEN_FILE,
+		TYPE_OPEN_NAVIGATION,
+		TYPE_OPEN_MODULE_SELECTION,
+		TYPE_OPEN_BOOK_SELECTION,
+		TYPE_OPEN_SEARCH,
+		TYPE_OPEN_HOME,
+		TYPE_OPEN_TEXT,
+		TYPE_MODE_ADD_STAR,
+		TYPE_CAN_SWITCH_LEFT,
+		TYPE_CAN_SWITCH_RIGHT,                                  // 10
+		TYPE_MENU_CURRENT,                                      // virtual, to delete current sbList menu
+		TYPE_MENU_CANCEL,
+		TYPE_MENU_VERSE,
+		TYPE_MENU_VERSE_ADD_STATIC_BOOKMARK,
+		TYPE_MENU_VERSE_ADD_DYNAMIC_BOOKMARK,
+		TYPE_MENU_VERSE_REMOVE_BOOKMARK,
+		TYPE_MENU_VERSE_START_EDITING,
+		TYPE_MENU_VERSE_SEND_TO_LIST,
+		TYPE_MENU_EXIT,
+		TYPE_MENU_EXIT_YES,
+		TYPE_MENU_EXIT_NO,
+		TYPE_MENU_EXIT_MINIMIZE,
+		TYPE_MENU_SET_VERSE,                                    // num verses
+		TYPE_MENU_SET_VERSE_MAX = TYPE_MENU_SET_VERSE + 200,
+		TYPE_SET_VERSE,                                         // activate verse
+		TYPE_SET_VERSE_MAX = TYPE_SET_VERSE + 200
+	};
+
+public:
+	                             sbControl         ( TYPE type );
+	                            ~sbControl         ( );
+
+private:
+								sbControl         ( TYPE type , sbRect rect , const TCHAR * text );
+
+public:
+
+	void                         operator =        ( const sbControl & control ) {;}
+
+	void                         pressed           ( );
+	void                         onPaint           ( HDC hdc ) const;
+
+	inline bool                  hit               ( int x , int y ) const {return (rect.pointInRect(x,y));}
+
+	const TYPE                   type;
+
+	void                         setText           ( const TCHAR * text );
+
+	inline bool                  isMenu            ( ) const {return (childrens.size()>0);}
+	
+private:
+	sbRect                       rect;
+
+	TCHAR                       *text;
+
+	sbTheme::STYLE::TYPE         style;
+	POINT                        textPos;
+
+	std::vector<sbControl>       childrens;
+};
+
+#endif
\ No newline at end of file

Added: trunk/src/SlideBible/sbCore.cpp
===================================================================
--- trunk/src/SlideBible/sbCore.cpp	                        (rev 0)
+++ trunk/src/SlideBible/sbCore.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,810 @@
+/*************************************************************************
+ * sbCore.cpp - application core
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#include "sbCore.h"
+#include <markupfiltmgr.h>
+#include <localemgr.h>
+#include <SWBuf.h>
+#include <SWLog.h>
+#include "sbObject.h"
+
+#pragma warning(disable : 4018)
+
+sbCore* Core;
+
+std::map<const char *, int> sbObject::tracker;
+
+void sbMessage(const char *format, ...)
+{
+	va_list args;
+
+	static FILE * file = NULL;
+	
+	file = fopen("log.txt", file == NULL ? "w" : "a");
+
+	if (file == NULL) return;
+
+	va_start(args, format);
+	vfprintf(file, format, args);
+	vprintf(format, args);
+	va_end(args);
+
+	fclose(file);
+}
+
+LRESULT CALLBACK sbCoreWndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
+
+sbCore::sbCore()
+{
+	// init data
+	Core            = this;
+	
+	currentList     = NULL;
+	listModule      = NULL;
+	listNavigation  = NULL;
+	listSearch      = NULL;
+	listHome        = NULL;
+
+	requestedRedraw = false;
+
+	listShift       = 0;
+
+	memset(&threadData, 0, sizeof(THREAD_DATA));
+
+	// init windows
+	hContainer = CreateWindow(L"SlideBible", L"SlideBible", WS_VISIBLE,
+		0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
+		NULL, NULL, NULL, NULL);
+
+	if (hContainer == NULL)
+	{
+		PostQuitMessage(1);
+		return;
+	}
+
+	// init surface
+	HDC hdc = BeginPaint( hContainer, &ps );
+
+	GetClientRect(hContainer, &rClient);
+
+	surfaces[SURFACE::TYPE_WHOLE].rect = rClient;
+
+	theme.init(); // this must be after init SURFACE::TYPE_WHOLE, but before SURFACE::TYPE_LIST
+
+	surfaces[SURFACE::TYPE_LIST].rect = rClient;
+	surfaces[SURFACE::TYPE_LIST].rect.bottom (surfaces[SURFACE::TYPE_LIST].rect.bottom() - theme.size/5);
+
+	surfaces[SURFACE::TYPE_BUFFER].rect = surfaces[SURFACE::TYPE_LIST].rect;
+
+	for (int i=0; i<SURFACE::COUNT; i++)
+	{
+		surfaces[i].hdc = CreateCompatibleDC(hdc);
+		surfaces[i].bitmap = CreateCompatibleBitmap(hdc, rClient.width(), rClient.height());
+		SelectObject(surfaces[i].hdc, surfaces[i].bitmap);
+		SetBkMode(surfaces[i].hdc, TRANSPARENT);
+		surfaces[i].needRedraw = true;
+	}
+	
+	Core->getTheme()->drawElement(hdc, &rClient, sbTheme::ELEMENT::BACKGROUND);
+	
+	EndPaint(hContainer, &ps);
+	DeleteDC(hdc);
+
+	//sword::SWLog::getSystemLog()->setLogLevel(5);
+
+	// load options
+	mpOptions = new sword::SWConfig(".\\options.conf");
+	
+	sbAssert(mpOptions == NULL);
+	mpOptions->Load();
+	
+	cineticDamping = (float)atof((*mpOptions)["Ui"].getWithDefault("CineticDamping", "0.95"));
+	cineticFactor  = (float)atof((*mpOptions)["Ui"].getWithDefault("CineticFactor", "0.5"));
+	refreshRate    = 1000/atoi((*mpOptions)["Ui"].getWithDefault("RefreshRate", "30"));
+	scrollStep     = atoi((*mpOptions)["Ui"].getWithDefault("scrollStep", "1"));
+	versesMax      = atoi((*mpOptions)["Ui"].getWithDefault("versesMax", "500"));
+	versesOptimal  = atoi((*mpOptions)["Ui"].getWithDefault("versesOptimal", "50"));
+
+	// user locale
+	char *defLocale = "en_US";
+
+	TCHAR userLocale [6];
+	GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVLANGNAME, userLocale, 6);
+	
+	if (_tcscmp(userLocale, L"RUS")==0)          defLocale = "ru_RU-cp1251";
+	else if (_tcscmp(userLocale, L"AFK")==0)     defLocale = "af";
+	else if (_tcscmp(userLocale, L"BGR")==0)     defLocale = "bg_BG-cp1251";
+	else if (_tcscmp(userLocale, L"CSY")==0)     defLocale = "cs";
+	else if (_tcscmp(userLocale, L"DAN")==0)     defLocale = "da";
+	else if (_tcscmp(userLocale, L"ETI")==0)     defLocale = "et";
+	else if (_tcscmp(userLocale, L"FIN")==0)     defLocale = "fi";
+	else if (_tcscmp(userLocale, L"IND")==0)     defLocale = "id";
+	else if (_tcscmp(userLocale, L"KOR")==0)     defLocale = "ko";
+	else if (_tcscmp(userLocale, L"PLK")==0)     defLocale = "pl";
+	else if (_tcscmp(userLocale, L"ROM")==0)     defLocale = "ro";
+	else if (_tcscmp(userLocale, L"SKY")==0)     defLocale = "sk";
+	else if (_tcscmp(userLocale, L"SLV")==0)     defLocale = "sl";
+	else if (_tcscmp(userLocale, L"UKR")==0)     defLocale = "uk_UA-cp1251";
+	else if (_tcsnccmp(userLocale, L"AR", 2)==0) defLocale = "ar_EG-cp1256";
+	else if (_tcsnccmp(userLocale, L"EN", 2)==0) defLocale = "en_GB";
+	else if (_tcsnccmp(userLocale, L"DE", 2)==0) defLocale = "de";
+	else if (_tcsnccmp(userLocale, L"ES", 2)==0) defLocale = "es";
+	else if (_tcsnccmp(userLocale, L"FR", 2)==0) defLocale = "fr";
+	else if (_tcsnccmp(userLocale, L"IT", 2)==0) defLocale = "it";
+	else if (_tcsnccmp(userLocale, L"NL", 2)==0) defLocale = "nl";
+	else if (_tcsnccmp(userLocale, L"NO", 2)==0) defLocale = "no";
+	else if (_tcsnccmp(userLocale, L"PT", 2)==0) defLocale = "pt";
+	else if (_tcscmp(userLocale, L"USA")!=0)
+		sbMessage("Unsupported user locale: %s\n", userLocale);
+
+	sword::LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName((*mpOptions)["General"].getWithDefault("Locale", defLocale));
+
+	// init sword
+	mpSwordMgr = new sword::SWMgr(new sword::MarkupFilterMgr(sword::FMT_OSIS, sword::ENC_UTF16));
+	
+	sbAssert(mpSwordMgr == NULL);
+
+	bookmarks.load(".\\verselists.conf","Bookmarks");
+
+	// create ui
+	switchList(sbList::TYPE_HOME);
+}
+
+sbCore::~sbCore()
+{
+	threadDestroy();
+	
+	if (currentList != NULL && currentList->hasModule())
+		(*mpOptions)["Bookmarks"]["LastPlace"] = currentList->getKey()->getText();
+
+	bookmarks.save(".\\verselists.conf","Bookmarks");
+
+	sbList* lists[] = {listModule, listModuleSelection, listBookSelection, listSearch, listHome};
+
+	for (int i=0; i<sizeof(lists)/sizeof(sbList*); i++)
+	{
+		if (lists[i] != NULL)
+		{
+			while (lists[i]->getPrev() != NULL)
+				delete lists[i]->getPrev();
+			while (lists[i]->getNext() != NULL)
+				delete lists[i]->getNext();
+			delete lists[i];
+		}
+	}
+
+	mpOptions->Save();
+
+	// clear sword
+	if (mpSwordMgr != NULL)
+		delete mpSwordMgr;
+	if (mpOptions != NULL)
+		delete mpOptions;
+
+	for (int i=0; i<SURFACE::COUNT; i++)
+	{
+		DeleteObject(surfaces[i].bitmap);
+		DeleteDC(surfaces[i].hdc);
+	}
+
+	DestroyWindow(hContainer);
+
+	for (std::map<const char *, int>::iterator it = sbObject::tracker.begin(); it != sbObject::tracker.end(); it++)
+		if (it->second != 0)
+			sbMessage ("new/delete misalignment for %s (%i)\n", it->first, it->second);
+}
+
+bool sbCore::onPaint()
+{
+	HDC hdc = BeginPaint(hContainer, &ps);
+
+	if (currentList != NULL)
+	{
+		if (listShift == 0)
+		{
+			currentList->render(surfaces[SURFACE::TYPE_WHOLE].hdc);
+		}
+		else
+		{
+			if (surfaces[SURFACE::TYPE_LIST].needRedraw)
+			{
+				currentList->render(surfaces[SURFACE::TYPE_LIST].hdc);
+				surfaces[SURFACE::TYPE_LIST].needRedraw = false;
+			}
+
+			if (listShift > 0)
+			{
+				if (surfaces[SURFACE::TYPE_BUFFER].needRedraw)
+				{
+					if (currentList->getNext() != NULL)
+						currentList->getNext()->render(surfaces[SURFACE::TYPE_BUFFER].hdc);
+					else
+						Core->getTheme()->drawElement(surfaces[SURFACE::TYPE_BUFFER].hdc, &surfaces[SURFACE::TYPE_BUFFER].rect, sbTheme::ELEMENT::BACKGROUND);
+
+					surfaces[SURFACE::TYPE_BUFFER].needRedraw = false;
+				}
+
+				BitBlt(surfaces[SURFACE::TYPE_WHOLE].hdc, rClient.left(), rClient.top(), rClient.width()-listShift, rClient.height(), surfaces[SURFACE::TYPE_LIST].hdc, listShift, 0, SRCCOPY);
+				BitBlt(surfaces[SURFACE::TYPE_WHOLE].hdc, rClient.right()-listShift, rClient.top(), listShift, rClient.height(), surfaces[SURFACE::TYPE_BUFFER].hdc, 0, 0, SRCCOPY);
+			}
+			else
+			{
+				if (surfaces[SURFACE::TYPE_BUFFER].needRedraw)
+				{
+					if (currentList->getPrev() != NULL)
+						currentList->getPrev()->render(surfaces[SURFACE::TYPE_BUFFER].hdc);
+					else
+						Core->getTheme()->drawElement(surfaces[SURFACE::TYPE_BUFFER].hdc, &surfaces[SURFACE::TYPE_BUFFER].rect, sbTheme::ELEMENT::BACKGROUND);
+
+					surfaces[SURFACE::TYPE_BUFFER].needRedraw = false;
+				}
+
+				BitBlt(surfaces[SURFACE::TYPE_WHOLE].hdc, surfaces[SURFACE::TYPE_LIST].rect.left()-listShift,  surfaces[SURFACE::TYPE_LIST].rect.top(), surfaces[SURFACE::TYPE_LIST].rect.width()+listShift, surfaces[SURFACE::TYPE_LIST].rect.height(), surfaces[SURFACE::TYPE_LIST].hdc, 0, 0, SRCCOPY);
+				BitBlt(surfaces[SURFACE::TYPE_WHOLE].hdc, surfaces[SURFACE::TYPE_LIST].rect.left(), surfaces[SURFACE::TYPE_LIST].rect.top(), surfaces[SURFACE::TYPE_LIST].rect.left()-listShift, surfaces[SURFACE::TYPE_LIST].rect.height(), surfaces[SURFACE::TYPE_BUFFER].hdc, surfaces[SURFACE::TYPE_BUFFER].rect.right()+listShift, 0, SRCCOPY);
+			}
+		}
+
+		for (std::vector<sbControl*>::const_iterator it=currentList->getControls()->begin(); it != currentList->getControls()->end(); it++)
+			(*it)->onPaint(surfaces[SURFACE::TYPE_WHOLE].hdc);
+
+		if (currentList->needScroll != 0)
+		{
+			if (!bScrollTimer)
+			{
+				bScrollTimer = true;
+				SetTimer(hContainer, TIMER_SCROLL, refreshRate, (TIMERPROC) NULL);
+			}
+			
+			if (currentList->needScroll < 0)
+			{
+				cineticPower--;
+
+				if (cineticPower < 0.11f && cineticPower > -0.11f) //fix timer stopping
+					cineticPower = -0.11f;
+
+				cineticPower = max(cineticPower, currentList->needScroll*0.11f);
+			}
+			else
+			{
+				cineticPower++;
+
+				if (cineticPower < 0.11f && cineticPower > -0.11f) //fix timer stopping
+					cineticPower = 0.11f;
+
+				cineticPower = min(cineticPower, currentList->needScroll*0.11f);
+			}
+		}
+	}
+	else
+	{
+		Core->getTheme()->drawElement(surfaces[SURFACE::TYPE_WHOLE].hdc, &surfaces[SURFACE::TYPE_WHOLE].rect, sbTheme::ELEMENT::BACKGROUND);
+	}
+
+	if (input.tapCounter > 0)
+	{
+		sbRect rect (input.startx-(input.tapCounter*4), input.starty-(input.tapCounter*4), input.startx+(input.tapCounter*4), input.starty+(input.tapCounter*4));
+		Core->getTheme()->drawElement(surfaces[SURFACE::TYPE_WHOLE].hdc, &rect, sbTheme::ELEMENT::TAPPED, input.tapCounter);
+	}
+	
+	BitBlt(hdc, surfaces[SURFACE::TYPE_WHOLE].rect.left(), surfaces[SURFACE::TYPE_WHOLE].rect.top(), surfaces[SURFACE::TYPE_WHOLE].rect.width(), surfaces[SURFACE::TYPE_WHOLE].rect.height(), surfaces[SURFACE::TYPE_WHOLE].hdc, 0, 0, SRCCOPY);
+	
+	EndPaint(hContainer, &ps);
+	DeleteDC(hdc);
+
+	return true;
+}
+
+bool sbCore::onMouse (int x, int y, const int state)
+{
+	if (state == WM_LBUTTONDOWN)
+	{
+		sbAssert(input.mousePressed == true);
+
+		if (listShift != 0) return false;
+
+		input.lastx = input.startx = x;
+		input.lasty = input.starty = y;
+
+		input.leaveZone = false;
+		input.mousePressed = true;
+
+		if (currentList != NULL)
+			currentList->onPressed(x,y);
+		
+		input.tapCounter = 0;
+		SetTimer(hContainer, TIMER_TAP, 1000/10, (TIMERPROC) NULL);
+	}
+	else if (state == WM_MOUSEMOVE)
+	{
+		if (!input.mousePressed) return false;
+
+		const int max = theme.size/20;
+
+		int dx = x - input.lastx;
+		int dy = y - input.lasty;
+
+		//if (input.block) {dx = 0; dy = 0;}
+
+		if (abs(input.startx-x) > max || abs(input.starty-y) > max)
+		{
+			input.leaveZone = true;
+			KillTimer(hContainer, TIMER_TAP);
+			input.tapCounter = 0;
+		}
+
+		// update cinetic power
+		if (GetTickCount()-cineticTicks > 500)
+		{
+			if (fabsf(cineticPower) > (float)abs(dy))
+				cineticPower = (float)dy;
+		}
+		else
+		{
+			if (fabsf(cineticPower) < (float)abs(dy))
+				cineticPower = (float)dy;
+		}
+
+		cineticTicks = GetTickCount();
+
+		if ((dy > 0 && cineticPower < 0) || (dy < 0 && cineticPower > 0))
+			cineticPower = 0.0f;
+
+		if (currentList != NULL)
+		{
+			if (!input.block)
+			{
+				if (abs(input.startx-x) > (rClient.right()/6)+(abs(input.starty-y)/2))
+					listShift = input.startx-x;
+				else
+					listShift = 0;
+			
+				if (listShift < 0 && currentList->getPrev() == NULL) listShift = 0;
+				if (listShift > 0 && currentList->getNext() == NULL) listShift = 0;
+			}
+
+			if (dy != 0 && listShift == 0)
+				currentList->scroll((float)dy);
+
+			redraw();
+		}
+		
+		input.lasty = y;
+		input.lastx = x;
+	}
+	else if (state == WM_LBUTTONUP)
+	{
+		if (!input.mousePressed) return false;
+
+		// update cinetic power
+		float factor;
+		float t = (float)GetTickCount()-cineticTicks;
+		if (t > 500)
+		{
+			t = 1-((t-500)/1500);
+			if (t<0) t = 0;
+			cineticPower *= t;
+		}
+
+		factor = (abs(input.starty-y)/(rClient.bottom()*cineticFactor));
+
+		cineticPower *= factor;
+
+		if (currentList != NULL)
+		{
+			currentList->onReleased(x,y);
+
+			if (!input.leaveZone)
+				input.tapCounter >= 8 ? currentList->onTapped(x,y) : currentList->onClicked(x,y);
+		}
+
+		if (listShift != 0)
+		{
+			SetTimer(hContainer, TIMER_SLIDE, refreshRate, (TIMERPROC) NULL);
+			cineticPower = 0.0f;
+		}
+		
+		if (fabsf(cineticPower) > 0.0f)
+		{
+			bScrollTimer = true;
+			SetTimer(hContainer, TIMER_SCROLL, refreshRate, (TIMERPROC) NULL);
+		}
+
+		input.mousePressed = false;
+		input.tapCounter = 0;
+
+		KillTimer(hContainer, TIMER_TAP);
+		
+		redraw();
+	}
+	return true;
+}
+
+bool sbCore::onTimer (const int timer)
+{
+	if (currentList != NULL) currentList->onTimer(timer);
+
+	switch (timer)
+	{
+	case TIMER_REDRAW:
+		{
+			if (requestedRedraw)
+			{
+				requestedRedraw = false;
+		
+				InvalidateRect(hContainer, &rClient, false);
+				return UpdateWindow(hContainer) != FALSE;
+			}
+		}
+		break;
+
+	case TIMER_SCROLL:
+		{
+			if (fabsf(cineticPower) > 0.1f)
+			{
+				cineticPower *= cineticDamping;
+
+				if (!input.mousePressed && currentList != NULL)
+				{
+					if (currentList->scroll(cineticPower) || currentList->needFill)
+						redraw();
+				}
+			}
+			else
+			{
+				bScrollTimer = false;
+				KillTimer(hContainer, TIMER_SCROLL);
+			}
+		}
+		break;
+
+	case TIMER_TAP:
+		{
+			if (input.tapCounter < 8)
+			{
+				input.tapCounter++;
+				redraw();
+			}
+			else
+				KillTimer(hContainer, TIMER_TAP);
+		}
+		break;
+
+	case TIMER_SLIDE:
+		{
+			if (abs(listShift) >= rClient.width())
+			{
+				switchList(listShift > 0 ? sbList::PIN_NEXT : sbList::PIN_PREV);
+
+				// reset information for slide
+				listShift = 0;
+				surfaces[SURFACE::TYPE_LIST  ].needRedraw = true;
+				surfaces[SURFACE::TYPE_BUFFER].needRedraw = true;
+
+				KillTimer(hContainer, TIMER_SLIDE);
+			}
+			else
+			{
+				if (listShift > 0)
+					listShift += (int)ceil((rClient.width()-listShift)*0.44f);
+				else
+					listShift -= (int)ceil((rClient.width()+listShift)*0.44f);
+
+				if (listShift > rClient.width())
+					listShift = rClient.width();
+
+				if (listShift < -rClient.width())
+					listShift = -rClient.width();
+
+				redraw();
+			}
+		}
+		break;
+	}
+	return true;
+}
+
+void sbCore::redraw()
+{
+	// TODO: receive item to update
+	// TODO: receive displace to shift and redraw
+
+	if (!redrawTimerOn)
+	{
+		redrawTimerOn = true;
+		SetTimer(hContainer, TIMER_REDRAW, refreshRate, (TIMERPROC) NULL);
+
+		requestedRedraw = false;
+		
+		InvalidateRect(hContainer, &rClient, FALSE);
+		UpdateWindow(hContainer);
+	}
+	else
+	{
+		requestedRedraw = true;
+	}
+}
+
+void sbCore::switchList (sbList::TYPE to)
+{
+	sbList* oldList = currentList;
+
+	sbMessage("switch list %i\n", to);
+
+	switch (to)
+	{
+	case sbList::PIN_NEXT:
+		if (currentList->getNext() != NULL)
+		{
+			currentList = currentList->getNext();
+
+			if (currentList->type == sbList::TYPE_SELECT_BOOK || currentList->type == sbList::TYPE_SELECT_MODULE)
+			{
+				listNavigation = currentList;
+			}
+			if (currentList->type == sbList::TYPE_MODULE_VIEW)
+			{
+				listModule = currentList;
+			}
+		}
+		else if (currentList->type == sbList::TYPE_MODULE_VIEW)
+		{
+			if (currentList->getNext() == NULL)
+				currentList->attach (new sbList(sbList::TYPE_MODULE_VIEW), sbList::PIN_NEXT);
+		
+			listModule = currentList = currentList->getNext();
+		}
+		break;
+
+	case sbList::PIN_PREV:
+		if (currentList->getPrev() != NULL)
+		{
+			currentList = currentList->getPrev();
+
+			if (currentList->type == sbList::TYPE_SELECT_BOOK || currentList->type == sbList::TYPE_SELECT_MODULE)
+			{
+				listNavigation = currentList;
+			}
+			if (currentList->type == sbList::TYPE_MODULE_VIEW)
+			{
+				listModule = currentList;
+			}
+		}
+		else if (currentList->type == sbList::TYPE_MODULE_VIEW)
+		{
+			if (currentList->getPrev() == NULL)
+				currentList->attach (new sbList(sbList::TYPE_MODULE_VIEW), sbList::PIN_PREV);
+		
+			currentList = currentList->getPrev();
+		}
+		break;
+
+	case sbList::PIN_PARENT:
+		{
+			sbAssert(currentList->getParent() == NULL);
+
+			currentList = currentList->getParent();
+		}
+		break;
+
+	case sbList::TYPE_SELECT_BOOK:
+		sbAssert(listNavigation == NULL);
+		currentList = listNavigation = listBookSelection;
+		break;
+
+	case sbList::TYPE_SELECT_MODULE:
+		sbAssert(listNavigation == NULL);
+		currentList = listNavigation = listModuleSelection;
+		break;
+		
+	case sbList::TYPE_SEARCH:
+		sbAssert(listNavigation == NULL);
+		currentList = listNavigation = listSearch;
+		break;
+
+	case sbList::TYPE_NAVIGATION:
+		if (listNavigation == NULL)
+		{
+			listBookSelection   = new sbList(sbList::TYPE_SELECT_BOOK);
+			listModuleSelection = new sbList(sbList::TYPE_SELECT_MODULE);
+			listSearch          = new sbList (sbList::TYPE_SEARCH);
+			listNavigation      = listBookSelection;
+		}
+		currentList = listNavigation;
+		break;
+
+	case sbList::TYPE_HOME:
+		if (listHome == NULL)
+		{
+			listHome = new sbList (sbList::TYPE_HOME);
+			listHome->attach (new sbList(sbList::TYPE_OPTIONS), sbList::PIN_NEXT);
+
+			if (listModule == NULL)
+			{
+				listModule = new sbList(sbList::TYPE_MODULE_VIEW);
+				listModule->attach(new sbList(sbList::TYPE_MODULE_VIEW), sbList::PIN_NEXT);
+				listModule->attach(new sbList(sbList::TYPE_MODULE_VIEW), sbList::PIN_PREV);
+			}
+			else
+			{
+				sbAssert(true);
+			}
+		}
+
+		listHome->attach(listModule, sbList::PIN_PARENT);
+		
+		currentList = listHome;
+		break;
+
+	case sbList::TYPE_MODULE_VIEW:
+		sbAssert(listModule == NULL);
+		
+		currentList = listModule;
+		break;
+
+	case sbList::TYPE_CURRENT:
+		break;
+
+	case sbList::TYPE_NONE:
+		threadDestroy();
+		return;
+
+	default:
+		sbAssert(true);
+	}
+	
+	if (oldList != currentList)
+	{
+		if (currentList == listNavigation)
+			currentList->attach(listModule, sbList::PIN_PARENT);
+
+		cineticPower = 0.0f;
+
+		threadDestroy();
+
+		if (currentList->type == sbList::TYPE_MODULE_VIEW && currentList->hasModule())
+			threadCreate(currentList);
+	}
+
+	currentList->onActivate();
+
+	redraw();
+}
+
+DWORD WINAPI sbCore::threadMain (LPVOID pData)
+{
+	sbCore::THREAD_DATA* data = reinterpret_cast<sbCore::THREAD_DATA*>(pData);
+
+	sbMessage ("Thread Launched.\n");
+
+	while (!data->abort)
+	{
+		data->list->updateVerses(&data->abort);
+		Sleep(10);
+	}
+
+	sbMessage ("Thread Stoped.\n");
+
+	data->running = false;
+	return 0;
+}
+
+void sbCore::threadCreate (sbList *list)
+{
+	if(threadData.running)
+	{
+		if (threadData.list == list)
+			return;
+		else
+			threadDestroy();
+	}
+
+	threadData.abort = false;
+	threadData.list = list;
+	threadData.handle = CreateThread(NULL, 0, sbCore::threadMain, (LPVOID)&threadData, 0, &threadData.id);
+
+    if(threadData.handle)
+	{
+		threadData.running = true;
+        SetThreadPriority(threadData.handle, THREAD_PRIORITY_BELOW_NORMAL);
+	}
+}
+
+void sbCore::threadDestroy()
+{
+	const int timeout = 2000;
+	int time = timeout;
+	
+	if (!threadData.running) return;
+	
+	threadData.abort = true;
+
+	SetThreadPriority(threadData.handle, THREAD_PRIORITY_ABOVE_NORMAL);
+
+	while (threadData.running && timeout > 0)
+	{
+		Sleep(1);
+		time--;
+	}
+
+	if (timeout <= 0)
+	{
+		sbMessage ("Thread terminated.\n");
+
+        TerminateThread(threadData.handle, -1);
+		threadData.running = false;
+	}
+	else if (timeout-time > 16)
+		sbMessage ("Thread termination takes %i msec.\n", timeout-time);
+	
+	threadData.abort = false;
+}
+
+void sbCore::controlPressed (sbControl::TYPE type)
+{
+	switch (type)
+	{
+	default:
+		if (!currentList->onControl(type))
+			sbAssert(true);
+	}
+}
+
+void sbCore::setSipState (bool on)
+{
+	SIPINFO si;
+	
+	if (SipStatus() == SIP_STATUS_UNAVAILABLE)
+	{
+		sbMessage("Sip is unavailable.\n");
+		return;
+	}
+
+	memset(&si, 0, sizeof(SIPINFO));
+	si.cbSize = sizeof(SIPINFO);
+
+	SHSipInfo(SPI_GETSIPINFO,0,&si,0);
+
+	if (on)
+	{
+		if (si.fdwFlags & SIPF_ON) return;
+
+		//printf("%i %i %i %i %i\n",si.fdwFlags, si.fdwFlags | SIPF_ON, si.fdwFlags & SIPF_ON, si.fdwFlags & ~SIPF_ON, si.fdwFlags ^ SIPF_ON);
+
+		si.fdwFlags |= SIPF_ON;
+
+		HWND sipWnd = FindWindow(L"SipWndClass",L"");
+
+		si.rcSipRect.top    += si.rcVisibleDesktop.bottom-si.rcSipRect.bottom;
+		si.rcSipRect.bottom += si.rcVisibleDesktop.bottom-si.rcSipRect.bottom;
+
+		SHSipInfo(SPI_SETSIPINFO,0,&si,0);
+
+		MoveWindow(sipWnd,si.rcSipRect.left,si.rcSipRect.top,si.rcSipRect.right-si.rcSipRect.left,si.rcSipRect.bottom-si.rcSipRect.top,false);
+	}
+	else
+	{
+		if (!(si.fdwFlags & SIPF_ON)) return;
+
+		si.fdwFlags ^= SIPF_ON;
+		
+		SHSipInfo(SPI_SETSIPINFO,0,&si,0);
+	}
+}
+
+void sbCore::onChar(TCHAR character)
+{
+	if (currentList != NULL)
+		currentList->onChar(character);
+}
\ No newline at end of file

Added: trunk/src/SlideBible/sbCore.h
===================================================================
--- trunk/src/SlideBible/sbCore.h	                        (rev 0)
+++ trunk/src/SlideBible/sbCore.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,172 @@
+/*************************************************************************
+ * sbCore.h - application core
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#ifndef SBCORE_H
+#define SBCORE_H
+
+#include <windows.h>
+#include <aygshell.h>
+#include "sbTheme.h"
+#include "sbControl.h"
+#include "sbList.h"
+#include "sbCollection.h"
+#include "sbCross.h"
+
+void sbMessage(const char *format, ...);
+
+#ifdef DEBUG
+#define sbAssert(condition) ((condition)?(sbMessage("sbAssert : " #condition ". at %s : %d\n", __FILE__, __LINE__), __debugbreak()) : 0)
+#elif
+#define sbAssert(condition)
+#endif
+
+class sbCore
+{
+public:
+	struct SURFACE
+	{
+		enum TYPE
+		{
+			TYPE_LIST = 0,
+			TYPE_BUFFER,
+			TYPE_WHOLE,
+			TYPE_ZERO,           // for text size calculation
+			COUNT
+		};
+		
+		HDC                      hdc;
+		HBITMAP                  bitmap;
+		sbRect                   rect;
+		
+		bool                     needRedraw;
+		mutable bool             fade;
+	};
+	
+	struct INPUT
+	{
+		bool                     mousePressed;
+		
+		int                      startx;
+		int                      starty;
+		int                      lastx;
+		int                      lasty;
+
+		bool                     leaveZone;
+		int                      tapCounter;
+
+		mutable bool             block;
+	};
+
+	enum TIMER
+	{
+		TIMER_SCROLL = 10010,
+		TIMER_TAP,
+		TIMER_BANNER,
+		TIMER_REDRAW,
+		TIMER_SLIDE
+	};
+
+	sbCore();
+	~sbCore();
+	
+	bool                         onMouse        (int x, int y, const int state);
+	bool                         onPaint        ();
+	bool                         onTimer        (const int timer);
+	void                         onChar         (TCHAR c);
+	bool                         onKeyDown      (int key);
+	bool                         onKeyUp        (int key);
+
+	void                         redraw         ();
+
+	const sbTheme*               getTheme       ()                   {return &theme;}
+	sword::SWMgr*                getSword       ()                   {return mpSwordMgr;}
+	sword::SWConfig*             getOptions     ()                   {return mpOptions;}
+	const SURFACE*               getSurface     (SURFACE::TYPE type) {return &surfaces[type];}
+	const INPUT*                 getInput       ()                   {return &input;}
+	sbCollection*                getBookmarks   ()                   {return &bookmarks;}
+
+	void                         setSipState    (bool on);
+
+
+	
+	void                         switchList     (sbList::TYPE to);
+
+	void                         threadCreate   (sbList *list);
+	void                         threadDestroy  ();
+	
+	void                         controlPressed (sbControl::TYPE type);
+
+private:
+	struct THREAD_DATA
+	{
+		sbList                  *list;
+		bool                     running;
+		bool                     abort;
+		DWORD                    id;
+		HANDLE                   handle;
+	};
+
+	static DWORD WINAPI          threadMain (LPVOID pData);
+
+	THREAD_DATA                  threadData;
+
+	sbList                      *currentList;
+
+	sbList                      *listModule;
+	sbList                      *listNavigation;
+	sbList                      *listModuleSelection;
+	sbList                      *listBookSelection;
+	sbList                      *listSearch;
+	sbList                      *listHome;
+
+	int                          listShift;
+
+	float                        cineticPower;
+	int                          cineticTicks;
+
+	INPUT                        input;
+
+	bool                         requestedRedraw;
+	bool                         redrawTimerOn;
+	
+	bool                         bScrollTimer;
+	
+	sbTheme                      theme;
+
+	sbRect                       rClient;
+	HWND                         hContainer;
+	
+	PAINTSTRUCT                  ps;
+	
+	SURFACE                      surfaces[SURFACE::COUNT];
+
+	sword::SWMgr                *mpSwordMgr;
+	sword::SWConfig             *mpOptions;
+
+	sbCollection                 bookmarks;
+
+	float                        cineticDamping;
+	float                        cineticFactor;
+	int                          refreshRate;
+
+public:
+	unsigned int                 scrollStep;
+	unsigned int                 versesMax;
+	unsigned int                 versesOptimal;
+};
+
+extern sbCore* Core;
+
+#endif
\ No newline at end of file

Added: trunk/src/SlideBible/sbCross.h
===================================================================
--- trunk/src/SlideBible/sbCross.h	                        (rev 0)
+++ trunk/src/SlideBible/sbCross.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,54 @@
+/*************************************************************************
+* sbCross.h - platform dependent types and functions
+*
+* author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+*
+* This program is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License as published by the
+* Free Software Foundation version 2.
+*
+* This program is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+************************************************************************/
+
+#ifndef SBCROSS_H
+#define SBCROSS_H
+
+#include <windows.h>
+
+typedef LONG sbLong;
+
+typedef COLORREF sbColor;
+
+class sbRect : public RECT
+{
+public:
+	sbRect(sbLong _left=0, sbLong _top=0, sbLong _right=0, sbLong _bottom=0)
+	{
+		RECT::left   = _left;
+		RECT::top    = _top;
+		RECT::right  = _right;
+		RECT::bottom = _bottom;
+
+		ASSERT(RECT::top <= RECT::bottom);
+		ASSERT(RECT::left <= RECT::right);
+	}
+
+	inline sbLong top    () const {return RECT::top;}
+	inline void   top    (sbLong v) {RECT::top = v;}
+	inline sbLong bottom () const {return RECT::bottom;}
+	inline void   bottom (sbLong v) {RECT::bottom = v;}
+	inline sbLong left   () const {return RECT::left;}
+	inline void   left   (sbLong v) {RECT::left = v;}
+	inline sbLong right  () const {return RECT::right;}
+	inline void   right  (sbLong v) {RECT::right = v;}
+
+	inline sbLong width  () const {return RECT::right - RECT::left;}
+	inline sbLong height () const {return RECT::bottom - RECT::top;}
+
+	inline bool pointInRect (sbLong x, sbLong y) const {return (x >= RECT::left && x < RECT::right && y >= RECT::top && y < RECT::bottom);}
+};
+
+#endif

Added: trunk/src/SlideBible/sbItem.cpp
===================================================================
--- trunk/src/SlideBible/sbItem.cpp	                        (rev 0)
+++ trunk/src/SlideBible/sbItem.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,269 @@
+/*************************************************************************
+ * sbItem.cpp - common item
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#include "sbCore.h"
+#include "sbItem.h"
+
+sbItem::sbItem (sbItem::TYPE _type_, const TCHAR *_text_, int _width_, long _index_, int _number_)
+: type  ( _type_ )
+, width ( _width_ )
+, index ( _index_ )
+, sbObject ( "sbItem" )
+{
+	if (_number_ != -1)
+	{
+		_itot(_number_, number, 10);
+		numberLength = _tcslen(number);
+	}
+	else
+	{
+		numberLength = 0;
+	}
+	
+	center      = false;
+	highlighted = false;
+	height      = max(Core->getTheme()->defaultItemHeight,Core->getTheme()->styles[sbTheme::STYLE::BUTTON].size*4/3);
+	expanding   = 0;
+	
+	switch (type)
+	{
+	case TYPE_DESCRIPTION:
+	case TYPE_BUTTON_CHAPTER_NEXT:
+	case TYPE_BUTTON_CHAPTER_PREV:
+		style = sbTheme::STYLE::DESCRIPTION;
+		break;
+
+	case TYPE_BUTTON_BOOKMARK:
+	case TYPE_BUTTON_SELECTION_BOOK:
+	case TYPE_BUTTON_SELECTION_CHAPTER:
+	case TYPE_BUTTON_SELECTION_MODULE:
+		style = sbTheme::STYLE::BUTTON;
+		break;
+
+	case TYPE_HEADER:
+		style = sbTheme::STYLE::CAPTION;
+		center = true;
+		break;
+
+	default:
+		style = sbTheme::STYLE::TEXT;
+	}
+
+	next  = NULL;
+	prev  = NULL;
+	left  = NULL;
+	right = NULL;
+
+	if (_text_ != NULL) setText(_text_);
+}
+
+sbItem::~sbItem()
+{
+	if (next  != NULL) next->prev = prev;
+	if (prev  != NULL) prev->next = next;
+	if (right != NULL) delete right;
+}
+
+void sbItem::attach (sbItem *item, PIN to)
+{
+	if (to == NEXT)
+	{
+		// check space
+
+		if (next != NULL)
+		{
+			item->prev = this;
+			item->next = this->next;
+
+			next->prev = item;
+			next = item;
+		}
+		else
+		{
+			next = item;
+			item->prev = this;
+		}
+	}
+	else if (to == PREV)
+	{
+		if (prev != NULL)
+		{
+			item->next = this;
+			item->prev = this->prev;
+
+			prev->next = item;
+			prev = item;
+		}
+		else
+		{
+			prev = item;
+			item->next = this;
+		}
+	}
+	else if (to == LEFT)
+	{
+		sbAssert(left != NULL);
+
+		left = item;
+		item->right = this;
+	}
+	else if (to == RIGHT)
+	{
+		sbAssert(right != NULL);
+
+		// place next if line filled
+
+		right = item;
+		item->left = this;
+
+		if (height < item->height)
+		{
+			sbItem *parse = this;
+			while(parse != NULL)
+			{
+				parse->height = item->height;
+				parse = parse->left;
+			}
+		}
+
+		if (height > item->height)
+		{
+			item->height = height;
+		}
+	}
+	else
+	{
+		sbAssert(true);
+	}
+}
+
+void sbItem::setText (const TCHAR* _text)
+{
+	SIZE sz;
+
+	int lineWidth = 0;
+	bool skip     = false;
+	bool italic   = false;
+	int length    = _tcslen(_text);
+
+	sbAssert(_text == NULL);
+	
+	SelectObject (Core->getSurface(sbCore::SURFACE::TYPE_ZERO)->hdc, Core->getTheme()->styles[style].font);
+
+	if (!lines.empty())
+		lines.erase(lines.begin(),lines.end());
+
+	LINE nl;
+	nl.width = nl.count = nl.pos = 0;
+	nl.newLine = false;
+	nl.style = style;
+	
+	lines.push_back(nl);
+
+	for(int i=0; i<length; i++)
+	{
+		TCHAR c = *(_text+i);
+
+		if (c == L'<')
+		{
+			skip = true;
+
+			if (_tcsncmp(_text+i+1,L"transChange type=\"added\"",24) == 0)
+			{
+				italic = true;
+			}
+			else if (_tcsncmp(_text+i+1,L"/transChange", 12) == 0)
+			{
+				italic = false;
+			}
+			/*if (_tcsncmp(_text+i+1,L"styleChange ",12) == 0){}
+			else if (_tcsncmp(_text+i+1,L"/styleChange", 12) == 0){}
+			else if (_tcsncmp(text+i+1,L"verse",5) == 0){}
+			else if (_tcsncmp(text+i+1,L"/verse",6) == 0){}
+			else if (_tcsncmp(text+i+1,L"w ",2) == 0){}
+			else if (_tcsncmp(text+i+1,L"w>",2) == 0){}
+			else if (_tcsncmp(text+i+1,L"/w",2) == 0){}
+			else {sbMessage("Unknown tag at %S\n",text+i+1);}*/
+		}
+		else if (skip && c == L'>')
+		{
+			skip = false;
+			
+			lines.push_back(lines.back());
+			lines.back().width = 0;
+			lines.back().count = 0;
+			lines.back().pos = i+1;
+			lines.back().newLine = false;
+
+			if (italic)
+				lines.back().style = sbTheme::STYLE::TEXT_ITALIC;
+			else
+				lines.back().style = style;
+
+			SelectObject (Core->getSurface(sbCore::SURFACE::TYPE_ZERO)->hdc, Core->getTheme()->styles[lines.back().style].font);
+		}
+		else if (c == L'\t')
+		{
+			;
+		}
+		else if (c == L'\n')
+		{
+			lines.back().newLine = true;
+			lineWidth = 0;
+
+			lines.push_back(lines.back());
+			lines.back().width = 0;
+			lines.back().count = 0;
+			lines.back().pos = i+1;
+			lines.back().newLine = false;
+		}
+		else if (!skip)
+		{
+			// add character
+			GetTextExtentPoint32(Core->getSurface(sbCore::SURFACE::TYPE_ZERO)->hdc,&c,1,&sz);
+			
+			// begin new line
+			if ((lineWidth + sz.cx > width - (Core->getTheme()->ListItemIndent*1.8f) \
+				&& c != L'.' && c != L',' && c != L' '))
+			{
+				lines.back().newLine = true;
+				lineWidth = 0;
+
+				lines.push_back(lines.back());
+				lines.back().width = 0;
+				lines.back().count = 0;
+				lines.back().pos = i;
+				lines.back().newLine = false;
+			}
+
+			if (lines.back().count == 0) lines.back().pos = i;
+
+			lines.back().width += (unsigned short)sz.cx;
+			lines.back().count++;
+
+			lineWidth += (unsigned short)sz.cx;
+		}
+	}
+
+	lines.back().newLine = true;
+
+	int lineCount = 0;
+
+	for (int i=0; i<lines.size(); i++) if (lines[i].newLine) lineCount++;
+
+	height = Core->getTheme()->defaultItemHeight + (Core->getTheme()->styles[style].size*lineCount);
+
+	text = _text;    // need to be set last
+}

Added: trunk/src/SlideBible/sbItem.h
===================================================================
--- trunk/src/SlideBible/sbItem.h	                        (rev 0)
+++ trunk/src/SlideBible/sbItem.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,114 @@
+/*************************************************************************
+ * sbItem.h - common item
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#ifndef SBITEM_H
+#define SBITEM_H
+
+#include <vector>
+#include <string>
+#include "sbObject.h"
+
+class sbItem : public sbObject
+{
+public:
+	enum TYPE
+	{
+		TYPE_NONE = 0,
+		TYPE_HEADER,
+		TYPE_SPACE,
+		TYPE_ICON,
+		TYPE_TEXT,
+		TYPE_DESCRIPTION,                   // small text
+		TYPE_VERSE,                         // linked to verse, versification?
+		TYPE_TEXT_WITH_DESCRIPTION,
+		TYPE_TEXT_FIELD,                    // this will require SIP, i think we will controll input panel, default input panel will be selected in options
+		TYPE_CHECKBOX,
+		TYPE_BUTTON_CHAPTER_NEXT,           // 10
+		TYPE_BUTTON_CHAPTER_PREV,
+		TYPE_BUTTON_SELECTION_MODULE,
+		TYPE_BUTTON_SELECTION_BOOK,
+		TYPE_BUTTON_SELECTION_CHAPTER,
+		TYPE_BUTTON_SELECTION_VERSE,
+		TYPE_BUTTON_OPEN_SELECT_MODULE,
+		TYPE_BUTTON_OPEN_SELECT_BOOK,
+		TYPE_BUTTON_OPEN_SELECT_CHAPTER,
+		TYPE_BUTTON_OPEN_SELECT_VERSE,
+		TYPE_BUTTON_BOOKMARK,               // 20
+		TYPE_BUTTON_BOOKMARK_GO,
+		TYPE_BUTTON_BOOKMARK_DELETE,
+		TYPE_BUTTON_BOOKMARK_POSITION,
+		TYPE_BUTTON_ADD_BOOKMARK,
+		TYPE_BUTTON_ADD_FAVORITE
+	};
+	
+	sbItem(sbItem::TYPE type, const TCHAR *text, int width, long index = -1, int number = -1);
+	~sbItem();
+
+public:
+
+	const TYPE                    type;
+	char                          style;
+	std::wstring                  text;
+
+	bool                          center;
+	bool                          highlighted;
+	bool                          hidden;
+	bool                          button;
+	
+	unsigned short                height;
+	unsigned short                width;
+	
+	TCHAR                         number[5];
+	unsigned char                 numberLength;
+
+	unsigned short                expanding;
+	
+	struct LINE
+	{
+		unsigned short            pos;
+		unsigned short            width;
+		char                      style;
+		unsigned short            count;
+
+		bool                      newLine:1;
+	};
+
+	std::vector<LINE>             lines;
+
+public:
+	void                          setText       ( const TCHAR* text );
+
+	int                           getCharLeft   ( const int from );
+	int                           getCharUp     ( const int from );
+	int                           getCharDown   ( const int from );
+
+	int                           getLastLineWidth ();
+
+	long                          index;
+
+	enum PIN
+	{
+		NEXT, PREV, LEFT, RIGHT
+	};
+
+	void                          attach        ( sbItem *item, PIN to );
+
+	sbItem                       *next;
+	sbItem                       *prev;
+	sbItem                       *left;
+	sbItem                       *right;
+};
+
+#endif

Added: trunk/src/SlideBible/sbList.cpp
===================================================================
--- trunk/src/SlideBible/sbList.cpp	                        (rev 0)
+++ trunk/src/SlideBible/sbList.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,1406 @@
+/*************************************************************************
+ * sbList.cpp - items scrolling container
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#include "sbCore.h"
+#include "sbList.h"
+
+#pragma warning ( disable : 4018 )
+
+sbList::sbList ( sbList::TYPE _type_ )
+: type ( _type_ )
+, sbObject ( "sbList" )
+{
+	sbMessage("sbList of type %i initialized\n", _type_);
+
+	itemCurrent      = NULL;
+	itemHover        = NULL;
+	itemEdit         = NULL;
+
+	displaceHeight   = 0;
+	displacePart     = 0.0f;
+	
+	module           = NULL;
+	
+	next             = NULL;
+	prev             = NULL;
+	parent           = NULL;
+
+	rect = &Core->getSurface(sbCore::SURFACE::TYPE_LIST)->rect;
+
+	verseFirst       = NULL;
+	verseLast        = NULL;
+
+	versesForward    = 0;
+	versesBackward   = 0;
+
+	listEndConstructed = listStartConstructed = true;
+
+	switch(type)
+	{
+	case TYPE_SEARCH:
+	case TYPE_SELECT_BOOK:
+	case TYPE_SELECT_MODULE:
+		addControl(sbControl::TYPE_OPEN_MODULE_SELECTION);
+		addControl(sbControl::TYPE_OPEN_BOOK_SELECTION);
+		addControl(sbControl::TYPE_OPEN_SEARCH);
+		addControl(sbControl::TYPE_CLOSE);
+		break;
+
+	case TYPE_MODULE_VIEW:
+		{
+			addControl(sbControl::TYPE_OPEN_NAVIGATION);
+			addControl(sbControl::TYPE_OPEN_HOME);
+			addControl(sbControl::TYPE_MODE_ADD_STAR);
+			addControl(sbControl::TYPE_BUTTON_CLOSE);
+
+			if (module != NULL)
+			{
+				addControl(sbControl::TYPE_CAN_SWITCH_LEFT);
+				addControl(sbControl::TYPE_CAN_SWITCH_RIGHT);
+
+				setKey(module->getKey());
+			}
+
+			listEndConstructed = listStartConstructed = false;
+		}
+		break;
+
+	case TYPE_OPTIONS:
+		{
+			itemCurrent = new sbItem (sbItem::TYPE_CHECKBOX, L"v", Core->getTheme()->size/5);
+			itemCurrent->attach(new sbItem (sbItem::TYPE_DESCRIPTION, L"Background text loading", rect->width()-(Core->getTheme()->size/5)), sbItem::RIGHT);
+		}
+		break;
+
+	case TYPE_HOME:
+		{
+			itemCurrent = new sbItem (sbItem::TYPE_HEADER, L"Welcome to\nSlideBible!", rect->width());
+			
+			if ((*Core->getOptions())["Bookmarks"]["LastPlace"]!="")
+			{
+				itemCurrent->attach(new sbItem (sbItem::TYPE_DESCRIPTION, L"Your Last Place :", rect->width()), sbItem::NEXT);
+				itemCurrent->center = true;
+				itemCurrent = itemCurrent->next;
+
+				const char* b = (*Core->getOptions())["Bookmarks"]["LastPlace"];
+
+				sword::VerseKey tmpKey(b);
+
+				TCHAR *text = new TCHAR [strlen(b)+1];
+				mbstowcs(text, b, strlen(b)+1);
+
+				itemCurrent->attach(new sbItem (sbItem::TYPE_BUTTON_BOOKMARK, text, rect->width(), tmpKey.Index()), sbItem::NEXT);
+				itemCurrent = itemCurrent->next;
+				itemCurrent->center = true;
+
+				delete [] text;
+			}
+
+			for (int i=0; i<Core->getBookmarks()->count(); i++)
+			{
+				if (i == 0)
+				{
+					itemCurrent->attach(new sbItem (sbItem::TYPE_DESCRIPTION, L"Your Bookmarks :", rect->width()), sbItem::NEXT);
+					itemCurrent->center = true;
+					itemCurrent = itemCurrent->next;
+				}
+
+				const char* bm = (*Core->getBookmarks())[i].verse.getText();
+			
+				TCHAR *text = new TCHAR [strlen(bm)+1];
+				mbstowcs(text, bm, strlen(bm)+1);
+
+				itemCurrent->attach(new sbItem (sbItem::TYPE_BUTTON_BOOKMARK, text, rect->width(), (*Core->getBookmarks())[i].verse.Index()), sbItem::NEXT);
+				itemCurrent = itemCurrent->next;
+				itemCurrent->center = true;
+
+				delete [] text;
+			}
+
+			while (itemCurrent->prev != NULL)
+				itemCurrent = itemCurrent->prev;
+
+			addControl(sbControl::TYPE_BUTTON_OPEN_FILE);
+			addControl(sbControl::TYPE_OPEN_SEARCH);
+			addControl(sbControl::TYPE_OPEN_TEXT);
+			addControl(sbControl::TYPE_BUTTON_CLOSE);
+		}
+		break;
+
+
+	default:
+		sbAssert(true);
+	}
+}
+
+void sbList::attach (sbList * list, sbList::TYPE to)
+{
+	switch (to)
+	{
+	case PIN_PREV:
+		if (prev != NULL)
+		{
+			list->prev = prev;
+			prev->next = list;
+		}
+		
+		list->next = this;
+		prev = list;
+
+		addControl(sbControl::TYPE_CAN_SWITCH_LEFT);
+		list->addControl(sbControl::TYPE_CAN_SWITCH_RIGHT);
+		
+		break;
+
+	case PIN_NEXT:
+		if (next != NULL)
+		{
+			list->next = next;
+			next->prev = list;
+		}
+		
+		list->prev = this;
+		next = list;
+
+		addControl(sbControl::TYPE_CAN_SWITCH_RIGHT);
+		list->addControl(sbControl::TYPE_CAN_SWITCH_LEFT);
+		
+		break;
+
+	case PIN_PARENT:
+		if (type == TYPE_SELECT_BOOK || type == TYPE_SELECT_MODULE)
+		{
+			parent = list;
+			module = list->module;
+			setKey(list->key);
+		}
+		else if (type == TYPE_HOME || type == TYPE_SEARCH)
+		{
+			parent = list;
+		}
+		else
+		{
+			sbAssert(true);
+		}
+		break;
+
+	default:
+		sbAssert(true);
+	}
+}
+
+sbList::~sbList()
+{
+	sbMessage("sbList of type %i deleted\n",type);
+
+	clear();
+
+	if (next != NULL)
+		next->prev = prev;
+	else
+	{
+		//if (type != TYPE_MODULE_VIEW)
+		//	addControl(sbControl::TYPE_CAN_SWITCH_RIGHT, false);
+	}
+	
+	if (prev != NULL)
+		prev->next = next;
+	else
+	{
+		//if (type != TYPE_MODULE_VIEW)
+		//	addControl(sbControl::TYPE_CAN_SWITCH_LEFT, false);
+	}
+
+	for (int i=0; i < controls.size(); i++)
+		delete controls[i];
+}
+
+/*   sbList::setKey
+ *   set current position of list module
+ */
+void sbList::setKey (sword::VerseKey verse)
+{
+	sbMessage("sbList setKey: type:%i module:%s : %s %i:%i\n", type, (module == NULL ? "null" : module->Name()), verse.getBookName(), verse.getChapter(), verse.getVerse());
+
+	switch (type)
+	{
+	case TYPE_SELECT_MODULE:
+		{
+			int id = 0;
+
+			clear();
+
+			for (sword::ModMap::iterator it = Core->getSword()->Modules.begin(); it != Core->getSword()->Modules.end(); it++)
+			{
+				sword::SWModule *mod = (*it).second;
+
+				if (!strcmp(mod->Type(), "Biblical Texts"))
+				{
+					TCHAR *text = new TCHAR[strlen(mod->Description())+1];
+					for(int i=0; i<=strlen(mod->Description()); i++)
+						text[i] = mod->Description()[i];
+
+					sbItem *item = new sbItem (sbItem::TYPE_BUTTON_SELECTION_MODULE, text, rect->width(), (long)mod);
+					item->center = true;
+
+					delete [] text;
+
+					if (parent != NULL && parent->module == mod) item->highlighted = true;
+
+					if (itemCurrent == NULL)
+					{
+						itemCurrent = item;
+					}
+					else
+					{
+						itemCurrent->attach (item, sbItem::NEXT);
+						itemCurrent = itemCurrent->next;
+					}
+				}
+
+				id++;
+			}
+
+			id = 0;
+
+			for (sword::ModMap::iterator it = Core->getSword()->Modules.begin(); it != Core->getSword()->Modules.end(); it++)
+			{
+				sword::SWModule *mod = (*it).second;
+
+				if (!strcmp(mod->Type(), "Commentaries"))
+				{
+					TCHAR *text = new TCHAR[strlen(mod->Description())+1];
+					for(int i=0;i<=strlen(mod->Description()); i++)
+						text[i] = mod->Description()[i];
+
+					sbItem *item = new sbItem (sbItem::TYPE_BUTTON_SELECTION_MODULE, text, rect->width(), (long)mod);
+					item->center = true;
+
+					delete [] text;
+
+					if (parent != NULL && parent->module == mod) item->highlighted = true;
+
+					if (itemCurrent == NULL)
+					{
+						itemCurrent = item;
+					}
+					else
+					{
+						itemCurrent->attach (item, sbItem::NEXT);
+						itemCurrent = itemCurrent->next;
+					}
+				}
+
+				id++;
+			}
+
+			while (itemCurrent->prev != NULL)
+				itemCurrent = itemCurrent->prev;
+		}
+		break;
+
+	case TYPE_SELECT_BOOK:
+		{
+			sbItem* setItem = NULL;
+
+			clear();
+
+			sword::VerseKey tmpKey (verse);
+
+			tmpKey.setPosition(sword::TOP);
+
+			while (true)
+			{
+				const char *book = tmpKey.getBookName();
+
+				TCHAR *text = new TCHAR [strlen(book)+1];
+				
+				mbstowcs(text,book,strlen(book)+1);
+
+				sbItem *item = new sbItem (sbItem::TYPE_BUTTON_SELECTION_BOOK, text, rect->width(), tmpKey.Index());
+				item->center = true;
+
+				delete [] text;
+
+				if (parent->module != NULL &&
+					parent->key.getTestament() == tmpKey.getTestament() &&
+					parent->key.getBook() == tmpKey.getBook())
+				{
+					setItem = item;
+				}
+				
+				if (itemCurrent == NULL)
+				{
+					itemCurrent = item;
+				}
+				else
+				{
+					itemCurrent->attach (item, sbItem::NEXT);
+					itemCurrent = itemCurrent->next;
+				}
+
+				// next book
+				int b = tmpKey.getBook();
+
+				tmpKey.setBook(b+1);
+
+				if (b == tmpKey.getBook())
+					break;
+			}
+
+			if (setItem != NULL)
+			{
+				itemCurrent = setItem;
+			}
+			else
+			{
+				while (itemCurrent->prev != NULL)
+					itemCurrent = itemCurrent->prev;
+			}
+		}
+		break;
+
+	case TYPE_MODULE_VIEW:
+		{
+			int curIndex = verse.Index();
+
+			if (module == NULL)
+			{
+				module = Core->getSword()->getModule((*Core->getOptions())["General"].getWithDefault("DefaultModule", "KJV"));
+
+				if (module == NULL && Core->getSword()->Modules.size() != 0)
+					module = Core->getSword()->Modules.begin()->second;
+			}
+			
+			sbAssert(module == NULL);
+
+			if (next == NULL) attach(new sbList(sbList::TYPE_MODULE_VIEW), sbList::PIN_NEXT);
+			if (prev == NULL) attach(new sbList(sbList::TYPE_MODULE_VIEW), sbList::PIN_PREV);
+
+			addControl(sbControl::TYPE_CAN_SWITCH_LEFT);
+			if (prev != NULL) prev->addControl(sbControl::TYPE_CAN_SWITCH_RIGHT);
+
+			addControl(sbControl::TYPE_CAN_SWITCH_RIGHT);
+			if (next != NULL) next->addControl(sbControl::TYPE_CAN_SWITCH_LEFT);
+
+			clear();
+		
+			key = verse;
+
+			addBlankVerses();
+
+			displaceHeight = (rect->height()-itemCurrent->height)/2;
+
+			Core->redraw();
+		}
+		break;
+	default:
+		sbAssert(true);
+	}
+}
+
+/*   sbList::clear
+ *   empty list from items
+ */
+void sbList::clear()
+{
+	if (itemCurrent != NULL)
+	{
+		while (itemCurrent->prev != NULL)
+			delete itemCurrent->prev;
+
+		while (itemCurrent->next != NULL)
+			delete itemCurrent->next;
+
+		delete itemCurrent;
+
+		itemCurrent = NULL;
+
+		verseFirst = NULL;
+		verseLast = NULL;
+		versesForward = 0;
+		versesBackward = 0;
+
+		if (type ==TYPE_MODULE_VIEW)
+			listStartConstructed = listEndConstructed = false;
+
+		displaceHeight = 0;
+	}
+}
+
+/*   sbList::render
+ *   draw list
+ */
+void sbList::render (HDC hdc)
+{
+	sbItem *oldItem,*dItem;
+	sbRect rItem (0,0,0,0);
+	int screenHeight;
+
+	addBlankVerses();
+
+	// itemCurrent may be not first on screen, so do correction
+	if (itemCurrent != NULL)
+	{
+		while (displaceHeight > -Core->getTheme()->ListSeparatorHeight && itemCurrent->prev != NULL)
+		{
+			if (itemCurrent->type == sbItem::TYPE_VERSE)
+			{
+				versesBackward--;
+				versesForward++;
+			}
+
+			itemCurrent = itemCurrent->prev;
+			displaceHeight -= itemCurrent->height + Core->getTheme()->ListSeparatorHeight;
+		}
+
+		while (displaceHeight < 0 && abs(displaceHeight) > itemCurrent->height + Core->getTheme()->ListSeparatorHeight)
+		{
+			if (itemCurrent->next == NULL) break;
+
+			displaceHeight += itemCurrent->height + Core->getTheme()->ListSeparatorHeight;
+
+			if (itemCurrent->type == sbItem::TYPE_VERSE)
+			{
+				versesBackward++;
+				versesForward--;
+			}
+
+			itemCurrent = itemCurrent->next;
+		}
+	}
+
+	dItem = itemCurrent;
+	screenHeight = displaceHeight;
+
+	Core->getTheme()->drawElement(hdc, rect, sbTheme::ELEMENT::BACKGROUND);
+	
+	while(true)
+	{
+		if (dItem == NULL)
+			break;
+
+		if (screenHeight > rect->bottom())
+			break;
+
+		oldItem = dItem;
+
+		if (Core->getTheme()->ListSeparatorHeight > 0 && dItem->prev == NULL)
+		{
+			rItem        = *rect;
+			rItem.bottom (screenHeight);
+			rItem.top    (rItem.bottom()-Core->getTheme()->ListSeparatorHeight);
+			Core->getTheme()->drawElement(hdc, &rItem, sbTheme::ELEMENT::SEPARATOR);
+		}
+
+		rItem = *rect;
+		rItem.right (0);
+
+		// horizontal parse
+		while (dItem != NULL)
+		{
+			rItem.top    (screenHeight);
+			rItem.bottom (rItem.top() + dItem->height);
+			rItem.left   (rItem.right());
+			rItem.right  (rItem.left() + dItem->width);
+
+			if(dItem == itemHover)
+				Core->getTheme()->drawElement(hdc, &rItem, sbTheme::ELEMENT::ITEM_HOVER);
+			else if (dItem==itemSelected)
+				Core->getTheme()->drawElement(hdc, &rItem, sbTheme::ELEMENT::ITEM_SELECTED);
+			else if (dItem->highlighted)
+				Core->getTheme()->drawElement(hdc, &rItem, sbTheme::ELEMENT::ITEM_HIGHLIGHTED);
+			else
+				Core->getTheme()->drawElement(hdc, &rItem, sbTheme::ELEMENT::ITEM);
+
+			if (dItem->text.size() > 0)
+			{
+				if (dItem->numberLength > 0)
+				{
+					SelectObject(hdc, Core->getTheme()->styles[sbTheme::STYLE::STANZA].font);
+					SetTextColor(hdc, Core->getTheme()->ItemSubTextColor);
+
+					SIZE sz;
+					GetTextExtentPoint32(hdc, dItem->number, dItem->numberLength, &sz);
+
+					ExtTextOut(hdc, rItem.left()+((Core->getTheme()->ListItemIndent-sz.cx)/2), rItem.top(), ETO_OPAQUE, NULL, dItem->number, dItem->numberLength, 0);
+				}
+			
+				SetTextColor(hdc, Core->getTheme()->ItemTextColor);
+
+				int lineWidth = 0;
+				int lineCount = 0;
+				
+				for (int i=0; i < dItem->lines.size(); i++)
+				{
+					int x = lineWidth + Core->getTheme()->ListItemIndent + rItem.left() + (dItem->center ? (rItem.width()-(Core->getTheme()->ListItemIndent*2)-dItem->lines[i].width)/2 : 0);
+					int y = rItem.top() + (Core->getTheme()->defaultItemHeight/2) + (lineCount * Core->getTheme()->styles[dItem->style].size);
+
+					if (dItem->lines[i].newLine)
+					{
+						lineWidth = 0;
+						lineCount++;
+					}
+					else
+					{
+						lineWidth += dItem->lines[i].width;
+					}
+
+					if (y + Core->getTheme()->styles[dItem->style].size >= rItem.bottom())
+						break;
+
+					SelectObject (hdc, Core->getTheme()->styles[dItem->lines[i].style].font);
+
+					if (y < rect->bottom() && y > rect->top() - Core->getTheme()->styles[dItem->style].size)
+						ExtTextOut(hdc, x, y, ETO_OPAQUE, NULL,
+						i == 0 ? dItem->text.c_str() : dItem->text.c_str() + dItem->lines[i].pos, dItem->lines[i].count, 0);
+				}
+			}
+			else
+			{
+				if (dItem->numberLength > 0)
+				{
+					SelectObject(hdc, Core->getTheme()->styles[sbTheme::STYLE::BUTTON].font);
+					SetTextColor(hdc, Core->getTheme()->ItemSubTextColor);
+
+					SIZE sz;
+					GetTextExtentPoint32(hdc, dItem->number, dItem->numberLength, &sz);
+
+					ExtTextOut(hdc, rItem.left()+((rItem.width()-sz.cx)/2), rItem.top()+((rItem.height()-sz.cy)/2), ETO_OPAQUE, NULL, dItem->number, dItem->numberLength, 0);
+				}
+				else if (dItem->type != sbItem::TYPE_SPACE)
+					sbAssert(true);
+			}
+
+			if (Core->getTheme()->ListSeparatorHeight > 0)
+			{
+				rItem.top (rItem.bottom());
+				rItem.bottom (rItem.top() + Core->getTheme()->ListSeparatorHeight);
+				Core->getTheme()->drawElement(hdc, &rItem, sbTheme::ELEMENT::SEPARATOR);
+			}
+
+			// TODO vertical separator
+
+			dItem = dItem->right;
+		}
+
+		dItem = oldItem;
+
+		if (Core->getTheme()->ListSeparatorHeight > 0)
+			screenHeight += Core->getTheme()->ListSeparatorHeight;
+
+		screenHeight += dItem->height;
+
+		dItem = dItem->next;
+	}
+
+	//if (true)
+	//{
+	//	// debug redraw
+	//	static char frame = 0;
+	//	static int time = GetTickCount();
+
+	//	/*rItem.top = 16+(frame*32);
+	//	rItem.bottom = 48+(frame*32);
+	//	rItem.left = 0;
+	//	rItem.right = 32;
+	//	FillRect(hdc, &rItem, Core->getTheme()->ListBackgroundBrush);
+
+	//	if (++frame > 6) frame = 0;*/
+
+	//	printf ("Redraw:%03.03f\n", (GetTickCount()-time));
+
+	//	frame++;
+	//	time = GetTickCount();
+	//}
+
+	//if (drawBanner)
+	//{
+	//	TCHAR *place = new TCHAR [strlen(key.getText())+1];
+	//	
+	//	mbstowcs(place, key.getText(), strlen(key.getText())+1);
+
+	//	SIZE sz;
+
+	//	SelectObject (hdc, Core->getTheme()->styles[sbTheme::STYLE::CAPTION].font);
+	//	GetTextExtentPoint32(hdc,place,_tcsclen(place),&sz);
+	//	
+	//	rItem.bottom = rect->bottom/2+(sz.cy/2);
+	//	rItem.top = rect->bottom/2-(sz.cy/2);
+	//	rItem.right = rect->right/2+(sz.cx/2);
+	//	rItem.left = rect->right/2-(sz.cx/2);
+
+	//	//FillRect(hdc, &rItem, CreateSolidBrush(Core->getTheme()->SeparatorColor));
+	//	ExtTextOut(hdc, rItem.left, rItem.top, ETO_OPAQUE, NULL, place, _tcsclen(place), 0);
+	//}
+
+	if (displaceHeight >= 0)
+	{
+		needScroll = -displaceHeight;
+		needFill = displaceHeight != 0 || screenHeight < rect->height();
+	}
+	else if (screenHeight < rect->height())
+	{
+		needScroll = rect->height() - screenHeight;
+		needFill = true;
+	}
+	else
+	{
+		needScroll = 0;
+		needFill = false;
+	}
+
+	if ((needScroll > 0 && !listEndConstructed) || (needScroll < 0 && !listStartConstructed))
+		needScroll = 0;
+}
+
+/*   sbList::scroll
+ *   vertical list scrolling
+ *   return value indicates done work and necessity of redraw
+ */
+bool sbList::scroll (float amount)
+{
+	if (itemCurrent == NULL) return false;
+
+	if (abs((int)(amount+displacePart)) < Core->scrollStep)
+	{
+		displacePart += amount;
+		return false;
+	}
+
+	amount += displacePart;
+	displacePart = amount - (int)amount;
+
+	// don't allow scroll further then list is
+	if (amount < 0 && itemCurrent->next == NULL)
+	{
+		float oldAmount = amount;
+		int otherValue = -(itemCurrent->height-displaceHeight-Core->getTheme()->ListSeparatorHeight);
+		amount = max(amount, -(itemCurrent->height-displaceHeight-Core->getTheme()->ListSeparatorHeight));
+		//sbAssert(amount > 0);
+	}
+	if (amount > 0 && itemCurrent->prev == NULL)
+	{
+		amount = min(amount, rect->height()-displaceHeight);
+		sbAssert(amount < 0);
+	}
+
+	if ((int)amount == 0) return false;
+
+	displaceHeight += (int)amount;
+
+	return true;
+}
+
+/*   sbList::getItem
+ *   get item by coordinates on screen
+ */
+sbItem * sbList::getItem (int x, int y) const
+{
+	if (itemCurrent == NULL)
+		return NULL;
+
+	sbItem *i = itemCurrent;
+	int top = displaceHeight;
+
+	while (i != NULL && top < rect->height())
+	{
+		if (y > top && y < top + i->height)
+		{
+			int left = 0;
+			
+			while (i != NULL)
+			{
+				if (x > left && x < left + i->width)
+					return i;
+
+				left += i->width;
+				i = i->right;
+			}
+
+			return NULL;
+		}
+
+		top += i->height;
+		top += Core->getTheme()->ListSeparatorHeight;
+
+		i = i->next;
+	}
+
+	return NULL;
+}
+
+/*   sbList::onPressed
+ *   input
+ */
+void sbList::onPressed (int x, int y)
+{
+	if (Core->getInput()->block) return;
+
+	itemHover = getItem(x,y);
+
+	if (itemHover != NULL)
+	{
+		if (itemHover->type == sbItem::TYPE_VERSE)
+			key.Index(itemHover->index);
+
+		Core->redraw();
+	}
+}
+
+/*   sbList::onReleased
+ *   input
+ */
+void sbList::onReleased (int x, int y)
+{
+	if (Core->getInput()->block) return;
+
+	if (itemHover != NULL)
+	{
+		itemHover = NULL;
+		Core->redraw();
+	}
+}
+
+/*   sbList::clicked
+ *   item clicked, process action by item type
+ */
+void sbList::onClicked (int x, int y)
+{
+	for(int i=controls.size()-1; i>=0; i--)
+	{
+		if (controls[i]->hit(x,y))
+		{
+			controls[i]->pressed();
+			return;
+		}
+	}
+
+	if (Core->getInput()->block) return;
+
+	sbItem *item = getItem(x,y);
+
+	if (item == NULL)
+		return;
+
+	switch (item->type)
+	{
+	case sbItem::TYPE_BUTTON_BOOKMARK:
+		{
+			sbAssert(parent == NULL);
+			sbAssert(parent->type != sbList::TYPE_MODULE_VIEW);
+
+			parent->key.Index(item->index);
+			parent->setKey(parent->key);
+
+			Core->switchList(sbList::TYPE_MODULE_VIEW);
+		}
+		break;
+
+	case sbItem::TYPE_BUTTON_CHAPTER_NEXT:
+		{
+			sword::VerseKey key(module->getKey());
+			key.setChapter(key.getChapter()+1);
+			key.setVerse(1);
+			setKey(key);
+		}
+		break;
+
+	case sbItem::TYPE_BUTTON_CHAPTER_PREV:
+		{
+			sword::VerseKey key(module->getKey());
+			key.setChapter(key.getChapter()-1);
+			key.setVerse(1);
+			setKey(key);
+		}
+		break;
+
+	case sbItem::TYPE_BUTTON_SELECTION_BOOK:
+		{
+			if (parent == NULL)
+			{
+				sbAssert(parent != NULL);
+			}
+			else
+			{
+				if (item->next != NULL && item->next->type == sbItem::TYPE_BUTTON_SELECTION_CHAPTER)
+				{
+					// remove chapters
+					while (item->next != NULL && item->next->type == sbItem::TYPE_BUTTON_SELECTION_CHAPTER)
+						delete item->next;
+				}
+				else
+				{
+					// add chapters
+					sbItem *tmpItem = item;
+					sword::VerseKey key;
+					key.Index(item->index);
+
+					for (int i=0;i<key.getChapterMax();i++)
+					{
+						key.setChapter(i+1);
+						TCHAR text[8];
+						_itot(key.getChapter(), text, 10);
+						
+						sbItem *item = new sbItem (sbItem::TYPE_BUTTON_SELECTION_CHAPTER, text, rect->width()/3, key.Index());
+
+						item->center = true;
+
+						if (tmpItem->type == sbItem::TYPE_BUTTON_SELECTION_CHAPTER &&
+							(tmpItem->right == NULL || tmpItem->right->right == NULL))
+						{
+							sbItem *last = tmpItem;
+							while(last->right != NULL)
+								last = last->right;
+							last->attach(item, sbItem::RIGHT);
+						}
+						else
+						{
+							tmpItem->attach (item, sbItem::NEXT);
+							tmpItem = tmpItem->next;
+						}
+					}
+
+					// add space
+					if  (tmpItem->type == sbItem::TYPE_BUTTON_SELECTION_CHAPTER)
+					{
+						if (tmpItem->right == NULL)
+							tmpItem->attach(new sbItem (sbItem::TYPE_SPACE, L"", rect->width()/3*2), sbItem::RIGHT);
+						else if (tmpItem->right->right == NULL)
+							tmpItem->right->attach(new sbItem (sbItem::TYPE_SPACE, L"", rect->width()/3), sbItem::RIGHT);
+					}
+				}
+			}
+		}
+		break;
+	case sbItem::TYPE_BUTTON_SELECTION_CHAPTER:
+		{
+			sbAssert(parent == NULL);
+
+			key.Index(item->index);
+
+			addControl((sbControl::TYPE)(sbControl::TYPE_MENU_SET_VERSE+key.getVerseMax()));
+		}
+		break;
+
+	case sbItem::TYPE_BUTTON_SELECTION_MODULE:
+		{
+			sword::SWModule *m = (sword::SWModule*)item->index;
+
+			sbAssert(m == NULL);
+			
+			if (parent == NULL)
+			{
+				module = m;
+				setKey(getKey());
+			}
+			else
+			{
+				if (parent->module == NULL)
+					m->SetKey("John 1:1");
+				else
+					m->SetKey(parent->getKey());
+	
+				parent->module = m;
+				parent->setKey(parent->getKey());
+			}
+		}
+		break;
+	}
+}
+
+/*   sbList::onTapped
+ *   input
+ */
+void sbList::onTapped (int x, int y)
+{
+	if (Core->getInput()->block) return;
+
+	sbItem *item = getItem(x,y);
+
+	if (item == NULL) return;
+
+	if (item->type == sbItem::TYPE_VERSE)
+	{
+		key.Index(item->index);
+		addControl(sbControl::TYPE_MENU_VERSE);
+	}
+}
+
+/*   sbList::getKey
+ *   get current module position
+ */
+sword::VerseKey* sbList::getKey ()
+{
+	sbAssert(module == NULL);
+	return &key;
+}
+
+/*   sbList::addBlankVerses
+ *   add verses templates, for futher processing in thread
+ */
+void sbList::addBlankVerses()
+{
+	if (type == sbList::TYPE_MODULE_VIEW && module != NULL)
+	{
+		sword::VerseKey tmpKey = key;
+		int added = 0;
+
+		if (itemCurrent == NULL)
+		{
+			itemCurrent = new sbItem (sbItem::TYPE_VERSE, NULL, rect->width(), tmpKey.Index(), tmpKey.getVerse());
+			
+			verseFirst = itemCurrent;
+			verseLast = itemCurrent;
+
+			if (tmpKey.getVerse() == 1)
+			{
+				TCHAR headerText [16];
+			
+				const char* book = tmpKey.getBookName();
+				int s = strlen(book);
+				mbstowcs(headerText,book,s);
+
+				char chap[8];
+				_itoa(tmpKey.getChapter(),chap,10);
+
+				headerText[s++] = s > 9 ? L'\n' : L' ';
+
+				for(int i=0;i<strlen(chap)+1;i++)
+					headerText[s++] = chap[i];
+
+				itemCurrent->attach(new sbItem (sbItem::TYPE_HEADER, headerText, rect->width(), tmpKey.Index()), sbItem::PREV);
+			}
+
+			added++;
+			needFill = true;
+		}
+
+		while (true)
+		{
+			bool atEnd;
+
+			if (versesForward+versesBackward > Core->versesMax)
+			{
+				Sleep(25);
+				break; // need for memory reason
+			}
+
+			if (versesForward+versesBackward > Core->versesOptimal*2)
+				Sleep(5);
+			
+			if (versesForward < 15 && !listEndConstructed)
+				atEnd = true;
+			else if (versesBackward < 5 && !listStartConstructed)
+				atEnd = false;
+			else if (added > 4)
+				break;
+			else
+			{
+				if (versesForward+versesBackward > Core->versesOptimal/2) break;
+			
+				atEnd = added%2==0;
+				if ((listEndConstructed && atEnd) || (listStartConstructed && !atEnd))
+				{
+					added++;
+					continue;
+				}
+			}
+
+			sbItem* item = atEnd ? verseLast : verseFirst;
+			int index = 0;
+
+			while (true)
+			{
+				if (item->type == sbItem::TYPE_VERSE) index = item->index;
+				if (atEnd ? item->next == NULL : item->prev == NULL) break;
+
+				item = atEnd ? item->next : item->prev;
+			}
+
+			tmpKey.Index(index);
+			atEnd ? tmpKey.increment() : tmpKey.decrement();
+			
+			if (tmpKey.Index() != index)
+			{
+				item->attach(new sbItem (sbItem::TYPE_VERSE, NULL, rect->width(), tmpKey.Index(), tmpKey.getVerse()), atEnd ? sbItem::NEXT : sbItem::PREV);
+
+				if (atEnd)
+				{
+					verseLast = item->next;
+					versesForward++;
+				}
+				else
+				{
+					verseFirst = item->prev;
+					versesBackward++;
+				}
+
+				if (tmpKey.getVerse() == 1)
+				{
+					TCHAR headerText [16];
+				
+					const char* book = tmpKey.getBookName();
+					int s = strlen(book);
+					mbstowcs(headerText,book,s);
+
+					char chap[8];
+					_itoa(tmpKey.getChapter(),chap,10);
+
+					headerText[s++] = s > 9 ? L'\n' : L' ';
+
+					for(int i=0;i<strlen(chap)+1;i++)
+						headerText[s++] = chap[i];
+
+					if (atEnd)
+						verseLast->attach(new sbItem (sbItem::TYPE_HEADER, headerText, rect->width(), tmpKey.Index()), sbItem::PREV);
+					else
+						verseFirst->attach(new sbItem (sbItem::TYPE_HEADER, headerText, rect->width(), tmpKey.Index()), sbItem::PREV);
+				}
+				added++;
+			}
+			else
+			{
+				atEnd ? listEndConstructed = true : listStartConstructed = true;
+			}
+		}
+	}
+}
+
+/*   sbList::updateVerses
+ *   fill verses with text from module
+ *   also delete unnecessary items
+ */
+void sbList::updateVerses (bool *abort)
+{
+	sbAssert(module == NULL);
+
+	while (!*abort)
+	{
+		if (itemCurrent == NULL) return;
+		
+		int     displace  = displaceHeight;
+		sbItem* item      = itemCurrent;
+		bool    atEnd     = false;
+		
+		// delete unnecessary items
+		if (versesForward+versesBackward > Core->versesOptimal)
+		{
+			int countDeleted = 0;
+			int needDelete = (versesForward+versesBackward)/Core->versesOptimal*10;
+
+			if (versesForward>versesBackward)
+			{
+				while (countDeleted<needDelete)
+				{
+					verseLast = verseLast->prev;
+					while (verseLast->type != sbItem::TYPE_VERSE) verseLast = verseLast->prev;
+					while (verseLast->next != NULL)               delete verseLast->next;
+					countDeleted++;
+				}
+				if (listEndConstructed) listEndConstructed = false;
+				versesForward-=countDeleted;
+			}
+			else
+			{
+				while (countDeleted<needDelete)
+				{
+					verseFirst = verseFirst->next;
+					while (verseFirst->type != sbItem::TYPE_VERSE) verseFirst = verseFirst->next;
+					while (verseFirst->prev != NULL)               delete verseFirst->prev;
+					countDeleted++;
+				}
+				if (listStartConstructed) listStartConstructed = false;
+				versesBackward -= countDeleted;
+			}
+		}
+
+		// find center screen item
+		while (item->next != NULL && displace+item->height < (rect->height())/2)
+		{
+			displace += item->height;
+			item = item->next;
+		}
+		
+		sbItem* last      = item;
+		sbItem* first     = item;
+
+		while (!*abort)
+		{
+			// process item text
+			if (item->type == sbItem::TYPE_VERSE && item->text.size() == 0)
+			{
+				static sword::VerseKey workKey;
+
+				workKey = key;
+				workKey.Index(item->index);
+
+				module->SetKey(workKey);
+				TCHAR *text = (TCHAR*)module->RenderText();
+
+				int len = _tcslen(text);
+
+				TCHAR *add = new TCHAR[len+1];
+				for (int i=0; i<=len; i++)
+					add[i] = text[i];
+
+				int oldHeight = item->height;
+
+				item->setText(add);
+
+				item->expanding = item->height;
+				item->height    = oldHeight;
+
+				break;
+			}
+
+			if (atEnd && last->next != NULL)
+			{
+				last      = last->next;
+				item      = last;
+				displace += item->height;
+			}
+			else if (first->prev != NULL)
+			{
+				first     = first->prev;
+				item      = first;
+				displace -= item->height;
+			}
+			else
+				return;
+
+			atEnd = !atEnd;
+		}
+	}
+}
+
+/*   sbList::controlPressed
+ *   process action for pressed control
+ */
+bool sbList::onControl (sbControl::TYPE type)
+{
+	switch (type)
+	{
+	case sbControl::TYPE_MENU_VERSE_ADD_STATIC_BOOKMARK:
+		(Core->getBookmarks()->add(key)).dynamic = false;
+		removeControl(sbControl::TYPE_MENU_CURRENT);
+		break;
+
+	case sbControl::TYPE_MENU_VERSE_ADD_DYNAMIC_BOOKMARK:
+		(Core->getBookmarks()->add(key)).dynamic = true;
+		removeControl(sbControl::TYPE_MENU_CURRENT);
+		break;
+
+	case sbControl::TYPE_MENU_VERSE_START_EDITING:
+		{
+			sbItem* item = itemCurrent;
+
+			while (item->next != NULL)
+				if (item->index == key.Index() && item->type == sbItem::TYPE_VERSE)
+					break;
+				else
+					item = item->next;
+
+			sbAssert(item == NULL);
+			setEditMode(item);
+			removeControl(sbControl::TYPE_MENU_CURRENT);
+		}
+		break;
+
+	case sbControl::TYPE_MENU_EXIT_NO:
+	case sbControl::TYPE_MENU_CANCEL:
+
+		removeControl(sbControl::TYPE_MENU_CURRENT);
+		break;
+
+	case sbControl::TYPE_BUTTON_CLOSE:
+		addControl(sbControl::TYPE_MENU_EXIT);
+		break;
+
+	default:
+		if (type >= sbControl::TYPE_SET_VERSE && type < sbControl::TYPE_SET_VERSE_MAX)
+		{
+			sbAssert(this->type != sbList::TYPE_SELECT_BOOK);
+			
+			key.setVerse(type-sbControl::TYPE_SET_VERSE);
+			parent->setKey(key);
+			Core->switchList(sbList::PIN_PARENT);
+
+			removeControl(sbControl::TYPE_MENU_CURRENT);
+		}
+		else
+			return false;
+	}
+	return true;
+}
+
+void sbList::addControl ( sbControl::TYPE type )
+{
+	for (int i=0; i<controls.size(); i++) if (controls[i]->type == type) return;
+
+	controls.push_back (new sbControl (type));
+
+	if (controls.back()->isMenu())
+	{
+		sbAssert(Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade || Core->getInput()->block);
+
+		Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade = true;
+		Core->getInput()->block = true;
+	}
+}
+
+void sbList::removeControl ( sbControl::TYPE type )
+{
+	for (std::vector<sbControl*>::iterator it=controls.begin(); it != controls.end(); it++)
+	{
+		if ((*it)->type == type || ((*it)->isMenu() && type == sbControl::TYPE_MENU_CURRENT))
+		{
+			if ((*it)->isMenu())
+			{
+				sbAssert(!Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade || !Core->getInput()->block);
+
+				Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade = false;
+				Core->getInput()->block = false;
+			}
+
+			controls.erase(it);
+			return;
+		}
+	}
+}
+
+void sbList::onTimer (const int timer)
+{
+	switch (timer)
+	{
+	case sbCore::TIMER_REDRAW:
+		{
+			// Expand items heights
+			if (itemCurrent != NULL && type == sbList::TYPE_MODULE_VIEW)
+			{
+				const int halfscreen = rect->height()/2;
+
+				for ( int dir=0; dir<2; dir++ )
+				{
+					sbItem* item = itemCurrent;
+					int displace = displaceHeight;
+
+					while ( item != NULL )
+					{
+						if (item->expanding != 0 && !( dir == 1 && item == itemCurrent ) )
+						{
+							if (displace < -item->height || displace > rect->height())
+							{
+								item->height = item->expanding;
+								item->expanding = 0;
+							}
+							else
+							{
+								const int add = min((int)ceil((item->expanding-item->height)*0.3f)+(Core->getTheme()->size/100),item->expanding-item->height);
+
+								item->height += add;
+
+								Core->redraw();
+
+								if (item->height >= item->expanding)
+								{
+									item->height = item->expanding;
+									item->expanding = 0;
+								}
+
+								if (displace < halfscreen)
+								{
+									const float cadd = add*((halfscreen-displace)/(float)halfscreen);
+									scroll(-cadd);
+									displace -= (int)cadd;
+								}
+							}
+						}
+
+						if (dir > 0)
+						{
+							displace += item->height;
+							item = item->next;
+						}
+						else
+						{
+							item = item->prev;
+							if (item != NULL) displace -= item->height;
+						}
+					}
+				}
+			}
+		}
+		break;
+	}
+}
+
+/*  sbList::onActivate
+ *  called before first redraw
+ */
+void sbList::onActivate()
+{
+	Core->setSipState(itemEdit != NULL);
+}
+
+/*  sbList::setEditMode
+ *  controls list edit mode
+ */
+void sbList::setEditMode (sbItem* item)
+{
+	if (item == NULL && itemEdit != NULL)
+	{
+		// finish edit
+		// reallocate text
+		itemEdit = NULL;
+		Core->setSipState(false);
+	}
+	else if (item != NULL)
+	{
+		// start edit
+		itemEdit = item;
+		itemEditCursor = itemEdit->text.size();
+
+		Core->setSipState(true);
+	}
+	else
+		sbAssert(true);
+}
+
+bool sbList::onChar ( TCHAR character )
+{
+	if (itemEdit != NULL)
+	{
+		static std::wstring text;
+
+		if (character == 0x08)
+		{
+			text = itemEdit->text;
+			text.erase(--itemEditCursor);
+		}
+		else
+		{
+			TCHAR str [2] = {character,L'\0'};
+			text = itemEdit->text;
+			text.insert(itemEditCursor++, str);
+		}
+		
+		itemEdit->setText(text.c_str());
+		Core->redraw();
+
+		return true;
+	}	
+	return false;
+}
\ No newline at end of file

Added: trunk/src/SlideBible/sbList.h
===================================================================
--- trunk/src/SlideBible/sbList.h	                        (rev 0)
+++ trunk/src/SlideBible/sbList.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,137 @@
+/*************************************************************************
+ * sbList.cpp - items scrolling container
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#ifndef SBLIST_H
+#define SBLIST_H
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+#include "sbItem.h"
+#include "sbControl.h"
+#include "sbObject.h"
+
+#include <vector>
+
+using std::vector;
+
+class sbList : public sbObject
+{
+public:
+	enum TYPE
+	{
+		TYPE_NONE = 0,
+		TYPE_CURRENT,                 // virtual, to update current list
+		PIN_NEXT,                     // pin
+		PIN_PREV,                     // pin
+		PIN_PARENT,                   // pin
+		TYPE_MODULE_VIEW,
+		TYPE_SELECT_MODULE,
+		TYPE_SELECT_BOOK,
+		TYPE_FOLDER_VIEW,
+		TYPE_FILE_VIEW,               // html / txt / rtf / doc
+		TYPE_HOME,
+		TYPE_BOOKMARKS,
+		TYPE_OPTIONS,
+		TYPE_SEARCH,                  // virtual
+		TYPE_SEARCH_OPTIONS,
+		TYPE_SEARCH_RESULTS,
+		TYPE_NAVIGATION,              // virtual
+		TYPES_COUNT
+	};
+	
+	sbList(sbList::TYPE type);
+	~sbList();
+
+	void                      attach   (sbList * list, sbList::TYPE pin);
+
+	bool                      scroll   (float amount);
+
+	// input methods
+	void                      onPressed  (int x, int y);
+	void                      onReleased (int x, int y);
+	void                      onClicked  (int x, int y);
+	void                      onTapped   (int x, int y);
+
+	bool                      onChar     (TCHAR character);
+	
+	void                      render (HDC hdc);
+	void                      renderControls (HDC hdc);
+
+	void                      onTimer (const int timer);
+	void                      onActivate (void);
+
+
+	int                       displaceHeight;
+	float                     displacePart;
+	int                       screenHeight;
+
+	int                       needScroll;
+	bool                      needFill;
+	
+	const TYPE                type;
+
+	sbList*                   getNext () const {return next;}
+	sbList*                   getPrev () const {return prev;}
+	sbList*                   getParent () const {return parent;}
+
+	bool                      hasModule () const {return module != NULL;}
+	sword::VerseKey*          getKey ();
+	void                      updateVerses (bool *abort);
+
+	bool                      onControl (sbControl::TYPE type);
+
+	const std::vector<sbControl*>* getControls () const { return &controls; }
+	
+private:
+	void                      addBlankVerses();
+	void                      setKey(sword::VerseKey verse);
+	void                      clear ();
+	sbItem*                   getItem (int x, int y) const;
+
+	sbItem                   *itemCurrent;
+	sbItem                   *itemHover;
+	sbItem                   *itemSelected;
+
+	void                      setEditMode (sbItem* item);
+	sbItem                   *itemEdit;
+	int                       itemEditCursor;
+
+	sbItem                   *verseFirst;
+	sbItem                   *verseLast;
+
+	int                       versesForward;
+	int                       versesBackward;
+
+	bool                      listStartConstructed;
+	bool                      listEndConstructed;
+	
+	sbList                   *next;
+	sbList                   *prev;
+	sbList                   *parent;
+	sbList                   *child;
+
+	void                      addControl (sbControl::TYPE type);
+	void                      removeControl (sbControl::TYPE type);
+
+	std::vector<sbControl*>   controls;
+
+	sword::SWModule          *module;
+	sword::VerseKey           key;
+
+	const sbRect             *rect;
+};
+
+#endif
\ No newline at end of file

Added: trunk/src/SlideBible/sbObject.h
===================================================================
--- trunk/src/SlideBible/sbObject.h	                        (rev 0)
+++ trunk/src/SlideBible/sbObject.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,41 @@
+/*************************************************************************
+* sbObject.cpp - memory tracker
+*
+* author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+*
+* This program is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License as published by the
+* Free Software Foundation version 2.
+*
+* This program is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+************************************************************************/
+
+#ifndef SBOBJECT_H
+#define SBOBJECT_H
+
+#include <map>
+
+class sbObject
+{
+public:
+	sbObject ( const char * _name_ )
+	{
+		name = _name_;
+		tracker[name] += 1;
+	}
+
+	~sbObject ()
+	{
+		tracker[name] -= 1;
+	}
+
+	static std::map<const char *, int> tracker;
+
+private:
+	const char * name;
+};
+
+#endif

Added: trunk/src/SlideBible/sbTheme.cpp
===================================================================
--- trunk/src/SlideBible/sbTheme.cpp	                        (rev 0)
+++ trunk/src/SlideBible/sbTheme.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,465 @@
+/*************************************************************************
+ * sbTheme.cpp - visual style
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#include "sbTheme.h"
+#include "sbCore.h"
+#include <unistd.h>
+
+#pragma warning(disable : 4018)
+#pragma warning(disable : 4244)
+
+sbColor getColor (const char *color) // RRGGBBAA
+{
+	static const char hex[] = "0123456789ABCDEF";
+	const int len = strlen(color);
+
+	unsigned int result = 0;
+
+	for (int c=0; c<8; c++)
+	{
+		char byte = 0x0;
+
+		if (c >= len)
+		{
+			byte = 0xF;
+		}
+		else
+		{
+			for (; byte<=0xF; byte++)
+				if (color[c] == hex[byte]) break;
+		}
+
+		result |= byte << 4*(c%2==1?c-1:c+1);
+	}
+
+	return (sbColor)result;
+}
+
+void sbTheme::init()
+{
+	sword::SWConfig  themeConf(".\\theme.conf");
+	themeConf.Load();
+
+	const sbRect* screenRect = &Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->rect;
+	size = min(screenRect->height(), screenRect->width());
+
+	// colors
+	ItemTextColor        = getColor(themeConf["Color"].getWithDefault("ItemText", "14141400"));
+	ItemMenuTextColor    = getColor(themeConf["Color"].getWithDefault("MenuText", "E0E0E000"));
+	ItemSubTextColor     = getColor(themeConf["Color"].getWithDefault("ItemSubText", "AAAAAA00"));
+
+	defaultItemHeight    = size/atof(themeConf["Size"].getWithDefault("ItemHeightDiv", "50.0"));
+	ListItemIndent       = size/atof(themeConf["Size"].getWithDefault("IndentDiv", "9.0"));
+	
+	// elements
+	for (int i=0; i<ELEMENT::COUNT; i++)
+	{
+		const char* name;
+		const char* type;
+		const char* color;
+		const char* color2;
+
+		switch (i)
+		{
+		case ELEMENT::ITEM:
+			name   = "Element.Item";
+			type   = themeConf[name].getWithDefault("Type", "SOLID");
+			color  = themeConf[name].getWithDefault("Color", "FFFFFF00");
+			color2 = themeConf[name].getWithDefault("Color2", "");
+			break;
+		case ELEMENT::ITEM_SELECTED:
+			name   = "Element.ItemSelected";
+			type   = themeConf[name].getWithDefault("Type", "SOLID");
+			color  = themeConf[name].getWithDefault("Color", "AAFFFF00");
+			color2 = themeConf[name].getWithDefault("Color2", "");
+			break;
+		case ELEMENT::ITEM_HIGHLIGHTED:
+			name   = "Element.ItemHighlighted";
+			type   = themeConf[name].getWithDefault("Type", "SOLID");
+			color  = themeConf[name].getWithDefault("Color", "AAAAFF00");
+			color2 = themeConf[name].getWithDefault("Color2", "");
+			break;
+		case ELEMENT::ITEM_HOVER:
+			name   = "Element.ItemHover";
+			type   = themeConf[name].getWithDefault("Type", "VGRAD");
+			color  = themeConf[name].getWithDefault("Color", "CBDADD");
+			color2 = themeConf[name].getWithDefault("Color2", "FFFFFF");
+			break;
+		case ELEMENT::SEPARATOR:
+			name   = "Element.Separator";
+			type   = themeConf[name].getWithDefault("Type", "SOLID");
+			color  = themeConf[name].getWithDefault("Color", "CDCDCD00");
+			color2 = themeConf[name].getWithDefault("Color2", "");
+			ListSeparatorHeight = size/atof(themeConf[name].getWithDefault("SizeDiv", "0.0"));
+			break;
+		case ELEMENT::BACKGROUND:
+			name   = "Element.Background";
+			type   = themeConf[name].getWithDefault("Type", "SOLID");
+			color  = themeConf[name].getWithDefault("Color", "7C8A9700");
+			color2 = themeConf[name].getWithDefault("Color2", "");
+			break;
+		case ELEMENT::CONTROL:
+			name   = "Element.Control";
+			type   = themeConf[name].getWithDefault("Type", "VGRAD");
+			color  = themeConf[name].getWithDefault("Color", "FFFFFF00");
+			color2 = themeConf[name].getWithDefault("Color2", "CBDADD00");
+			break;
+		case ELEMENT::CONTROL_PRESSED:
+			name   = "Element.ControlPressed";
+			type   = themeConf[name].getWithDefault("Type", "VGRAD");
+			color  = themeConf[name].getWithDefault("Color", "CBDADD00");
+			color2 = themeConf[name].getWithDefault("Color2", "FFFFFF00");
+			break;
+		case ELEMENT::TAPPED:
+			name   = "Element.Tap";
+			type   = themeConf[name].getWithDefault("Type", "SOLID");
+			color  = themeConf[name].getWithDefault("Color", "FF660000");
+			color2 = themeConf[name].getWithDefault("Color2", "");
+			break;
+		default:
+			sbAssert(true);
+		}
+
+		//themeConf[name].getWithDefault("FrameNum", "0");
+
+		if (!strcmp(type,"SOLID"))
+		{
+			elements[i].type      = ELEMENT::SOLID;
+			elements[i].color     = getColor(color);
+		}
+		else if (!strcmp(type,"VGRAD"))
+		{
+			elements[i].type      = ELEMENT::VGRAD;
+			elements[i].color     = getColor(color);
+			elements[i].color2    = getColor(color2);
+		}
+		else if (!strcmp(type,"HGRAD"))
+		{
+			elements[i].type      = ELEMENT::HGRAD;
+			elements[i].color     = getColor(color);
+			elements[i].color2    = getColor(color2);
+		}
+		else if (!strcmp(type,"HGRAD3"))
+		{
+			elements[i].type      = ELEMENT::HGRAD3;
+			elements[i].color     = getColor(color);
+			elements[i].color2    = getColor(color2);
+			elements[i].color3    = getColor(themeConf[name].getWithDefault("Color3", ""));
+			elements[i].pos1      = atoi(themeConf[name].getWithDefault("Separation1", "500"));
+		}
+		else if (!strcmp(type,"VGRAD3"))
+		{
+			elements[i].type      = ELEMENT::VGRAD3;
+			elements[i].color     = getColor(color);
+			elements[i].color2    = getColor(color2);
+			elements[i].color3    = getColor(themeConf[name].getWithDefault("Color3", ""));
+			elements[i].pos1      = atoi(themeConf[name].getWithDefault("Separation1", "500"));
+		}
+		else if (!strcmp(type,"HOLLOW"))
+		{
+			elements[i].type      = ELEMENT::HOLLOW;
+		}
+		else if (!strcmp(type,"BMP"))
+		{
+			elements[i].type      = ELEMENT::BMP;
+			elements[i].color     = getColor(themeConf[name].getWithDefault("Color", "FFFFFF00"));
+
+			elements[i].tiling    = atoi(themeConf[name].getWithDefault("Tiling",  "0"));
+			elements[i].stretch   = atoi(themeConf[name].getWithDefault("Stretch", "0"));
+			elements[i].rop       = atoi(themeConf[name].getWithDefault("Rop",     "13369376")); // by default SRCCOPY
+
+			const char* filename  = themeConf[name]["Bitmap"];
+
+			if (*filename != NULL)
+			{
+				filename = adaptpath(filename);
+				TCHAR* t_filename = new TCHAR [strlen(filename)+1];
+				mbstowcs(t_filename, filename, strlen(filename)+1);
+				elements[i].bitmap = SHLoadImageFile(t_filename);
+
+				int error = GetLastError();
+				sbAssert(error != 0);
+
+				delete [] t_filename;
+			}
+			else
+				elements[i].bitmap = NULL;
+		}
+		else
+			sbAssert(true);
+	}
+
+	// fonts
+	const char *fontName = themeConf["Font"].getWithDefault("Item", "Tahoma");
+
+	TCHAR *fontNameT = new TCHAR [strlen(fontName)+1];
+	for (int i=0; i<=strlen(fontName); i++)
+		fontNameT[i] = fontName[i];
+
+	styles[STYLE::TEXT].size          = size/(atof(themeConf["Size"].getWithDefault("TextDiv", "12.0")));
+	styles[STYLE::TEXT].font          = buildFont(styles[STYLE::TEXT].size,         fontNameT, false, false);
+	
+	styles[STYLE::TEXT_ITALIC].size   = styles[STYLE::TEXT].size;
+	styles[STYLE::TEXT_ITALIC].font   = buildFont(styles[STYLE::TEXT_ITALIC].size,  fontNameT, false, true);
+	
+	styles[STYLE::BUTTON].size        = size/(atof(themeConf["Size"].getWithDefault("ButtonTextDiv", "10.0")));
+	styles[STYLE::BUTTON].font        = buildFont(styles[STYLE::BUTTON].size,       fontNameT, false, false);
+	
+	styles[STYLE::BUTTON_SMALL].size  = size/(atof(themeConf["Size"].getWithDefault("ButtonSmallTextDiv", "15.0")));
+	styles[STYLE::BUTTON_SMALL].font  = buildFont(styles[STYLE::BUTTON_SMALL].size, fontNameT, false, false);
+	
+	styles[STYLE::STANZA].size        = size/(atof(themeConf["Size"].getWithDefault("SubTextDiv",     "16.0")));
+	styles[STYLE::STANZA].font        = buildFont(styles[STYLE::STANZA].size,       fontNameT, true, false);
+	
+	styles[STYLE::DESCRIPTION].size   = size/(atof(themeConf["Size"].getWithDefault("DescriptionDiv", "14.0")));
+	styles[STYLE::DESCRIPTION].font   = buildFont(styles[STYLE::DESCRIPTION].size,  fontNameT, false, false);
+	
+	styles[STYLE::CAPTION].size       = size/(atof(themeConf["Size"].getWithDefault("HeaderDiv",      "8.0")));
+	styles[STYLE::CAPTION].font       = buildFont(styles[STYLE::CAPTION].size,      fontNameT, true, false);
+
+	// clear
+	delete [] fontNameT;
+}
+
+sbTheme::~sbTheme()
+{
+	for (int i=0; i<STYLE::COUNT; i++)
+		DeleteObject(styles[i].font);
+
+	for (int i=0; i<ELEMENT::COUNT; i++)
+		if (elements[i].type == ELEMENT::BMP && elements[i].bitmap != NULL)
+			DeleteObject(elements[i].bitmap);
+}
+
+void sbTheme::drawElement (HDC hdc, const sbRect* rect, sbTheme::ELEMENT::TYPE type, const int animFrame) const
+{
+	bool vertical = true;
+	sbColor nc1,nc2,nc3,nc4;
+	
+	switch (elements[type].type)
+	{
+	case sbTheme::ELEMENT::SOLID:
+		{
+			if (Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade)
+			{
+				nc1 = RGB(GetRValue(elements[type].color)*2/3,GetGValue(elements[type].color)*2/3,GetBValue(elements[type].color)*2/3);
+			}
+			else
+			{
+				nc1 = elements[type].color;
+			}
+			checkTransparentColor(nc1,rect->left(),rect->top());
+			HBRUSH brush = CreateSolidBrush(nc1);
+			FillRect(hdc, rect, brush);
+			DeleteObject(brush);
+		}
+		break;
+
+	case sbTheme::ELEMENT::HGRAD:
+		{
+			vertical = false;
+		}
+	case sbTheme::ELEMENT::VGRAD:
+		{
+			if (Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade)
+			{
+				nc1 = RGB(GetRValue(elements[type].color)*2/3, GetGValue(elements[type].color)*2/3, GetBValue(elements[type].color)*2/3);
+				nc2 = RGB(GetRValue(elements[type].color2)*2/3,GetGValue(elements[type].color2)*2/3,GetBValue(elements[type].color2)*2/3);
+			}
+			else
+			{
+				nc1 = elements[type].color;
+				nc2 = elements[type].color2;
+			}
+			checkTransparentColor(nc1,rect->left(),rect->top());
+			checkTransparentColor(nc2,rect->right(),rect->bottom());
+			DrawGradient(hdc, rect, nc1, nc2, vertical);
+		}
+		break;
+
+	case sbTheme::ELEMENT::HGRAD3:
+		{
+			vertical = false;
+		}
+	case sbTheme::ELEMENT::VGRAD3:
+		{
+			if (Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->fade)
+			{
+				nc1 = RGB(GetRValue(elements[type].color)*2/3, GetGValue(elements[type].color)*2/3, GetBValue(elements[type].color)*2/3);
+				nc2 = RGB(GetRValue(elements[type].color2)*2/3,GetGValue(elements[type].color2)*2/3,GetBValue(elements[type].color2)*2/3);
+				nc3 = RGB(GetRValue(elements[type].color3)*2/3,GetGValue(elements[type].color3)*2/3,GetBValue(elements[type].color3)*2/3);
+			}
+			else
+			{
+				nc1 = elements[type].color;
+				nc2 = elements[type].color2;
+				nc3 = elements[type].color3;
+			}
+
+			sbRect temp;
+
+			if (elements[type].pos1 != 0)
+			{
+				if (vertical)
+				{
+					temp        = *rect;
+					temp.bottom ((temp.height())*elements[type].pos1/1000+temp.top());
+				}
+				else
+				{
+					temp        = *rect;
+					temp.right  ((temp.width())*elements[type].pos1/1000+temp.left());
+				}
+				checkTransparentColor(nc1,temp.left(),temp.top());
+				checkTransparentColor(nc2,temp.right(),temp.bottom());
+
+				DrawGradient(hdc, &temp, nc1, nc2, vertical);
+			}
+			if (elements[type].pos1 != 1000)
+			{
+				if (vertical)
+				{
+					temp        = *rect;
+					temp.top    ((temp.height())*elements[type].pos1/1000+temp.top());
+				}
+				else
+				{
+					temp        = *rect;
+					temp.left   ((temp.width())*elements[type].pos1/1000+temp.left());
+				}
+				checkTransparentColor(nc2,temp.left(),temp.top());
+				checkTransparentColor(nc3,temp.right(),temp.bottom());
+
+				DrawGradient(hdc, &temp, nc2, nc3, vertical);
+			}
+		}
+		break;
+
+	case sbTheme::ELEMENT::HOLLOW:
+		break;
+
+	case sbTheme::ELEMENT::BMP:
+		{
+			HDC     thdc = CreateCompatibleDC(hdc);
+			HBITMAP obm  = (HBITMAP)SelectObject(thdc, elements[type].bitmap);
+			BITMAP  bm;
+
+			GetObject(elements[type].bitmap, sizeof(bm), &bm);
+
+			if (elements[type].stretch)
+			{
+				StretchBlt(hdc, rect->left(), rect->top(), rect->width(), rect->height(), thdc, 0, 0, bm.bmWidth, bm.bmHeight, elements[type].rop);
+			}
+			else
+			{
+				if (elements[type].tiling)
+					sbAssert(true);
+				else
+					BitBlt(hdc, rect->left(), rect->top(), min(rect->width(),bm.bmWidth), min(rect->height(),bm.bmHeight), thdc, 0, 0, elements[type].rop);
+			}
+			SelectObject(thdc, obm);
+			DeleteDC(thdc);
+		}
+		break;
+
+	default:
+		sbAssert(true);
+	}
+}
+
+void sbTheme::checkTransparentColor (sbColor& color, int x, int y) const
+{
+	const unsigned char alpha = (BYTE)((color) >> 24);
+
+	if (alpha != 0)
+	{
+		// transparent
+		if (elements[sbTheme::ELEMENT::BACKGROUND].type == sbTheme::ELEMENT::SOLID)
+		{
+			color = elements[sbTheme::ELEMENT::BACKGROUND].color;
+		}
+		else if (elements[sbTheme::ELEMENT::BACKGROUND].type == sbTheme::ELEMENT::VGRAD)
+		{
+			unsigned char r1 = GetRValue(elements[sbTheme::ELEMENT::BACKGROUND].color);
+			unsigned char g1 = GetGValue(elements[sbTheme::ELEMENT::BACKGROUND].color);
+			unsigned char b1 = GetBValue(elements[sbTheme::ELEMENT::BACKGROUND].color);
+			unsigned char r2 = GetRValue(elements[sbTheme::ELEMENT::BACKGROUND].color2);
+			unsigned char g2 = GetGValue(elements[sbTheme::ELEMENT::BACKGROUND].color2);
+			unsigned char b2 = GetBValue(elements[sbTheme::ELEMENT::BACKGROUND].color2);
+			const sbRect& rect = Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->rect;
+			int value = min(1000,((y-rect.top())*1000)/(rect.height()));
+			color = RGB(r1+((r2-r1)*value/1000),g1+((g2-g1)*value/1000),b1+((b2-b1)*value/1000));
+		}
+		else if (elements[sbTheme::ELEMENT::BACKGROUND].type == sbTheme::ELEMENT::BMP)
+		{
+			color = elements[sbTheme::ELEMENT::BACKGROUND].color;
+		}
+		else
+			sbAssert(true);
+	}
+}
+
+HFONT sbTheme::buildFont(int size, const TCHAR *font, BOOL bold, BOOL italic)
+{
+	LOGFONT lf;
+	memset(&lf, 0, sizeof(LOGFONT));
+
+	lf.lfHeight = size;
+	lf.lfWidth = 0;
+	lf.lfEscapement = 0;
+	lf.lfOrientation = 0;
+
+	if (bold)
+		lf.lfWeight = 600;
+	else
+		lf.lfWeight = 500;
+
+	lf.lfItalic = italic;
+	lf.lfUnderline = FALSE;
+	lf.lfStrikeOut = FALSE;
+	lf.lfCharSet = DEFAULT_CHARSET;
+	lf.lfOutPrecision = OUT_RASTER_PRECIS;
+	lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+	lf.lfQuality = CLEARTYPE_QUALITY;
+	lf.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
+
+	/*	Wingdings
+		Tahoma
+		Courier New	*/
+	_tcsncpy (lf.lfFaceName, font, LF_FACESIZE);
+
+	return CreateFontIndirect(&lf);
+}
+
+void DrawGradient (HDC hdc, const RECT* iRect, COLORREF StartRGB, COLORREF EndRGB, bool vertical)
+{
+	TRIVERTEX        vert[2];
+	GRADIENT_RECT    gRect;
+	vert [0] .x      = iRect->left;
+	vert [0] .y      = iRect->top;
+	vert [0] .Red    = GetRValue(StartRGB) << 8;
+	vert [0] .Green  = GetGValue(StartRGB) << 8;
+	vert [0] .Blue   = GetBValue(StartRGB) << 8;
+	vert [0] .Alpha  = 0x0000;
+	vert [1] .x      = iRect->right;
+	vert [1] .y      = iRect->bottom; 
+	vert [1] .Red    = GetRValue(EndRGB) << 8;
+	vert [1] .Green  = GetGValue(EndRGB) << 8;
+	vert [1] .Blue   = GetBValue(EndRGB) << 8;
+	vert [1] .Alpha  = 0x0000;
+	gRect.UpperLeft  = 0;
+	gRect.LowerRight = 1;
+	GradientFill(hdc, vert, 2, &gRect, 1, vertical ? GRADIENT_FILL_RECT_V : GRADIENT_FILL_RECT_H);
+}
\ No newline at end of file

Added: trunk/src/SlideBible/sbTheme.h
===================================================================
--- trunk/src/SlideBible/sbTheme.h	                        (rev 0)
+++ trunk/src/SlideBible/sbTheme.h	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,119 @@
+/*************************************************************************
+ * sbTheme.h - visual style
+ *
+ * author: Konstantin Maslyuk "Kalemas" mailto:kalemas at mail.ru
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ ************************************************************************/
+
+#ifndef SBTHEME_H
+#define SBTHEME_H
+
+#include "sbCross.h"
+
+//#include <imaging.h>
+//#include <initguid.h>
+//#include <imgguids.h>
+
+class sbTheme
+{
+public:
+
+	sbTheme(){};
+	~sbTheme();
+
+	void                  init();
+
+private:
+	HFONT                 buildFont(int size, const TCHAR *font, BOOL bold, BOOL italic);
+	void                  checkTransparentColor (sbColor& color, int x, int y) const;
+
+public:
+	sbColor               ItemTextColor;
+	sbColor               ItemSubTextColor;
+	sbColor               ItemMenuTextColor;
+
+	struct STYLE
+	{
+		enum TYPE
+		{
+			TEXT = 0,
+			TEXT_ITALIC,
+			BUTTON,
+			BUTTON_SMALL,
+			STANZA,
+			CAPTION,
+			DESCRIPTION,
+			COUNT
+		};
+
+		HFONT             font;
+		unsigned short    size;
+	};
+
+	STYLE                 styles [STYLE::COUNT];
+
+	struct ELEMENT
+	{
+		enum TYPE
+		{
+			ITEM = 0,
+			ITEM_SELECTED,
+			ITEM_HOVER,
+			ITEM_HIGHLIGHTED,
+			SEPARATOR,
+			BACKGROUND,
+			TAPPED,
+			CONTROL,
+			CONTROL_PRESSED,
+			COUNT
+		};
+
+		enum DRAW_TYPE
+		{
+			HOLLOW = 0,
+			SOLID,
+			VGRAD, VGRAD3, VGRAD4,
+			HGRAD, HGRAD3, HGRAD4,
+			BMP,
+		};
+
+		char              type;
+		sbColor           color;
+		sbColor           color2;
+		sbColor           color3;
+		sbColor           color4;
+		short             pos1;                      // gradients vertical/horizontal sparation in range 0-1000
+		short             pos2;
+		HBITMAP           bitmap;
+		char              tiling:1, stretch:1, centered:1, transparency:1;
+		DWORD             rop;
+		//IImage           *image;
+	};
+
+	ELEMENT               elements [ELEMENT::COUNT];
+
+	void                  drawElement (HDC hdc, const sbRect *rect, sbTheme::ELEMENT::TYPE type, const int animFrame=0) const;
+
+	int                   ListSeparatorHeight;
+
+	int                   ListItemIndent;
+	
+	int                   size; // screen minimal dimention, determine font and control sizes
+
+	int                   defaultItemHeight;
+
+private:
+	//IImagingFactory      *imageFactory;
+};
+
+void DrawGradient (HDC tdc, const RECT* iRect, COLORREF StartRGB, COLORREF EndRGB, bool vertical=true);
+
+#endif

Added: trunk/src/SlideBible/todo.txt
===================================================================
--- trunk/src/SlideBible/todo.txt	                        (rev 0)
+++ trunk/src/SlideBible/todo.txt	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,44 @@
+alpha
+	* input-text items
+		cursor
+	
+	bookmarks, history, ratings, verselists
+		dialog: verse actions(favorite|send to list...|send to new list)
+		dialog: select verse(s)
+		dialog: menu verse
+
+	draw module view description on sbList activate
+
+	* navigation list from last place
+	* static / dynamic bookmarks
+		on screen item
+
+	text fade
+	2. Ïàðàëèïîìå\níîí\n4
+	daily devotionals
+	make list scrolling more smooth
+	? update theme from psd file
+	cross-references, footnotes
+	controls, pressed/released
+	link neighbor lists: items will be fitted by height, empty verses will be displayed hollow
+	keypad: on key pressed, keyMode activated, every button on displayed as common text, as touchscreen pressed, every button on screen become drawn as button
+	loading all locale takes too long
+	screen rotation
+	slide list and stroke down/up - link list
+	search
+	? create base class for sbItem and sbControl for holding screen text
+	
+	verse features:
+		readings count (forgotten places/chapters)
+		bookmarks static/dynamic
+		attendance history: date, module, key
+		verse lists (remember for...)
+
+beta	
+	toTest
+		other locales, utf encoding
+		russian paths
+		different screens and orientation change
+
+release
+	sliding backgrounds

Added: trunk/src/SlideBible/ui/scheme.txt
===================================================================
--- trunk/src/SlideBible/ui/scheme.txt	                        (rev 0)
+++ trunk/src/SlideBible/ui/scheme.txt	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,58 @@
+ï»¿  SlideBible UI Structure
+  -> scroll list right/left, [button], ... empty list, (containment), [[long-press button]]
+  =======================================
+  home view ->               <- options view ->     <- about
+    greet/hints                 hints
+    last place                  setup buttons
+    bookmarks                   thread text loading
+      [remove]                  default module
+      [static/dynamic]          
+    favorites                   
+      [hide]
+    [open text file]
+    [return]
+    [close app[minimize app]]
+
+  module view ->             <- text view ->        <- ... ->
+    (text)                        (text)
+      [[add bookmark static/dynamic/remove]]
+      [[show cross-references]]
+    [navigation]
+      choose module ->       <- choose book
+        (modules)
+          [select[mix]]
+        [close view[minimize app]]
+    [search]
+      search ->              <- search results
+        (search options)          text + [go]
+        [close view[minimize app]]
+    [home]
+    [add star mode]
+    [add to current verselist]
+    [link left/right]
+    [close view[minimize app]]
+    
+  verselist ->
+    (verse range + text)
+    [move/copy right/lift]
+    [rename list]
+
+  Hints
+    You can minimize application by long-press on close button.
+    Favorite verses will be shown on home screen for a week.
+    Dynamic bookmark will follow you as you read, it can not jump throught chpters.
+    ?Hitting cross-reference buttn under the verse will create new text list right of current and brong you there.
+
+  ÐšÐ°ÐºÐ¸Ðµ Ñ‚Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ðº ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð‘Ð¸Ð±Ð»Ð¸Ð¸ ÑÐµÐ³Ð¾Ð´Ð³Ñ?
+    Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒ Ð¿Ð¾Ð¸ÑÐºÐ°
+    Ñ‚Ð¾Ñ‡Ð½Ð¾ÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð°
+    Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ð¹ Ð¸Ð½Ñ‚ÑƒÐ¸Ñ‚Ð¸Ð²Ð½Ñ‹Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ
+    Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¸
+    ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð»ÑŒÑ†Ð°Ð¼Ð¸
+    Ð¾ÑÑ‚Ð°Ð²Ð»ÑÑ‚ÑŒ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ¸
+
+  Ð¡Ñ„ÐµÑ€Ñ‹ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ
+    ÐµÐ¶ÐµÐ´Ð½ÐµÐ²Ð½Ð¾Ðµ Ñ‡Ñ‚ÐµÐ½Ð¸Ðµ
+    Ð¿Ð¾Ð´Ð³Ð¾Ñ‚Ð¾Ð²ÐºÐ° Ðº Ð¿Ñ€Ð¾Ð¿Ð¾Ð²ÐµÐ´Ð¸
+    Ð¿Ð¾Ð¸ÑÐº Ð¼ÐµÑÑ‚ Ð½Ð° Ð¿Ñ€Ð¾Ð¿Ð¾Ð²ÐµÐ´Ð¸
+    Ð¸Ð·ÑƒÑ‡ÐµÐ½Ð¸Ðµ Ð¡Ð»Ð¾Ð²Ð°
\ No newline at end of file

Added: trunk/src/SlideBible/ui/ui.cdr
===================================================================
(Binary files differ)


Property changes on: trunk/src/SlideBible/ui/ui.cdr
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/src/SlideBible.sln
===================================================================
--- trunk/src/SlideBible.sln	                        (rev 0)
+++ trunk/src/SlideBible.sln	2009-10-16 22:36:27 UTC (rev 215)
@@ -0,0 +1,22 @@
+ï»¿
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SlideBible", "SlideBible\SlideBible.vcproj", "{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: trunk/src/SwRd.sln
===================================================================
--- trunk/src/SwRd.sln	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/SwRd.sln	2009-10-16 22:36:27 UTC (rev 215)
@@ -1,6 +1,6 @@
 ï»¿
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dll1", "Dll1\Dll1.vcproj", "{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -8,13 +8,13 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SwordReader_GUI", "SwordReader_GUI\SwordReader_GUI.vcproj", "{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5} = {D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}
+	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5} = {D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}
-	EndProjectSection
 EndProject
 Project("{B900F1C2-3D47-4FEC-85B3-04AAF18C3634}") = "PocketPC_Cab", "PocketPC_Cab\PocketPC_Cab.vddproj", "{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -31,9 +31,11 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4)
+		Debug|Win32 = Debug|Win32
 		Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC = Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC
 		Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP = Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP
 		Release|Pocket PC 2003 (ARMV4) = Release|Pocket PC 2003 (ARMV4)
+		Release|Win32 = Release|Win32
 		Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC = Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC
 		Release|Windows Mobile 6 Standard SDK (ARMV4I) SP = Release|Windows Mobile 6 Standard SDK (ARMV4I) SP
 	EndGlobalSection
@@ -41,53 +43,50 @@
 		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
 		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)
 		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.Build.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.Deploy.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
+		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Win32.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
+		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
+		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Build.0 = Debug|Pocket PC 2003 (ARMV4)
+		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
 		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)
 		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)
 		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
-		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.Deploy.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
+		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
+		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
+		{D6A4997A-793C-4A4C-B27F-0DAD8FCCC3E5}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
 		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
 		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)
 		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.Build.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.Deploy.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
+		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Win32.ActiveCfg = Debug|Smartphone 2003 (ARMV4)
+		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Win32.Build.0 = Debug|Smartphone 2003 (ARMV4)
+		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
+		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Build.0 = Debug|Pocket PC 2003 (ARMV4)
+		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
 		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)
 		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)
 		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
-		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.Deploy.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
+		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Win32.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
+		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
+		{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Release|Pocket PC 2003 (ARMV4)
 		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug
-		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug
+		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Debug|Win32.ActiveCfg = Debug
+		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Debug|Win32.Build.0 = Debug
 		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Debug
 		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Debug
 		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release
 		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release
+		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Release|Win32.ActiveCfg = Release
+		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Release|Win32.Build.0 = Release
 		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Release
 		{DDE677D8-104D-4F48-997C-A4D6FBC6F3D1}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Release
 		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug
-		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug
+		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Debug|Win32.ActiveCfg = Debug
+		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Debug|Win32.Build.0 = Debug
 		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Debug|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Debug
 		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Debug|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Debug
 		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release
 		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release
+		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Release|Win32.ActiveCfg = Release
+		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Release|Win32.Build.0 = Release
 		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Release|Windows Mobile 6 Professional SDK (ARMV4I) PPC.ActiveCfg = Release
 		{0F95E947-2E35-4483-89E8-44A970DB32CC}.Release|Windows Mobile 6 Standard SDK (ARMV4I) SP.ActiveCfg = Release
 	EndGlobalSection

Modified: trunk/src/SwordReader_GUI/SRMainFrame.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRMainFrame.cpp	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/SwordReader_GUI/SRMainFrame.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -1,5 +1,4 @@
 #include "SRMainFrame.h"
-#include <swordce.h>
 #include <swbuf.h>
 #include <url.h>
 
@@ -48,10 +47,7 @@
 {
     // Create a general options file for storing options 
 	// and navigaiton history
-	const char *cwd = getWorkingDirectory();
-	char confFName[MAX_PATH];
-	_snprintf(confFName, MAX_PATH, "%s\\options.conf", cwd);
-    m_confOptions = new SWConfig(confFName);
+	m_confOptions = new SWConfig(".\\options.conf");
     m_confOptions->Load();
     
     m_wcsClassName = "SRMainFrame";
@@ -145,12 +141,13 @@
     GetClientRect(m_hWnd, &view_rect);
 
     CreateCommandBar();
-    view_rect.bottom -= m_menuBar->Height();
-    
+	view_rect.bottom -= m_menuBar->Height();
 
     m_tabViews = new SRTabbedViews();
+
     if(!m_tabViews || !m_tabViews->Create(this, view_rect))
         return FALSE;
+
     m_tabViews->Init();
     this->SetFocus();
 
@@ -199,6 +196,7 @@
 
     return TRUE;
 }
+
 BOOL SRMainFrame::UpdateWindow()
 {   
     UpdateWindowTitle();
@@ -467,7 +465,7 @@
 }
 
 BOOL SRMainFrame::OnSize(UINT nType, int cx, int cy) 
-{   
+{
     RECT newSize;
     GetClientRect(m_hWnd, &newSize);
     newSize.bottom -= m_menuBar->Height();
@@ -604,7 +602,7 @@
 
 void SRMainFrame::ToggleOption(WORD wID)
 {
-    if (m_bufModOptions) {
+	if (m_bufModOptions) {
         for (int i = 0; i < m_nTotalOpts; i++) {
             SWBuf val = m_swmgr->getGlobalOption(m_bufModOptions[i]);
             if ((i + MENU_OPTS_START) == wID) {
@@ -620,7 +618,7 @@
 
 VOID SRMainFrame::LoadOptions()
 {
-    SWBuf val;    
+	SWBuf val;    
     sword::SWModule* bibleMod = NULL;
     sword::SWModule* commMod = NULL;
     sword::SWModule* dictMod = NULL;
@@ -692,4 +690,4 @@
 void SRMainFrame::SetFocus(){
     SRWnd::SetFocus();
     UpdateWindowTitle();
-}
\ No newline at end of file
+}

Modified: trunk/src/SwordReader_GUI/SRModuleView.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRModuleView.cpp	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/SwordReader_GUI/SRModuleView.cpp	2009-10-16 22:36:27 UTC (rev 215)
@@ -112,7 +112,7 @@
             m_verse.setVerse(1);
         }
     }else{
-        if( m_verse.Testament() != 1 || m_verse.Book != nBook){
+        if( m_verse.Testament() != 1 || m_verse.Book() != nBook){
             m_verse.Testament(SWORD_OLD_TESTAMENT);
             m_verse.Book(nBook);
             m_verse.Chapter(1);

Modified: trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
===================================================================
--- trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj	2009-03-05 04:34:16 UTC (rev 214)
+++ trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj	2009-10-16 22:36:27 UTC (rev 215)
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9,00"
 	Name="SwordReader_GUI"
 	ProjectGUID="{697017EE-0728-4DD1-AFBB-ABDA11CE86D5}"
 	RootNamespace="SwordReader_GUI"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Smartphone 2003 (ARMV4)"
 		/>
 		<Platform
-			Name="Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="Pocket PC 2003 (ARMV4)"
 		/>
 		<Platform
-			Name="Pocket PC 2003 (ARMV4)"
+			Name="Windows Mobile 6 Professional SDK (ARMV4I)"
 		/>
 		<Platform
 			Name="Windows Mobile 6 Standard SDK (ARMV4I)"
@@ -99,6 +100,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -112,6 +115,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -127,7 +133,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="Release|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -162,11 +168,10 @@
 				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
+				AdditionalIncludeDirectories="..\..\..\sword\include;..\dll1\wincesword\include;winceSword\include"
 				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;UNDER_CE=$(CEVER);UNICODE;NDEBUG;SIMPLE"
 				StringPooling="true"
 				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
@@ -177,7 +182,6 @@
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -193,19 +197,20 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem)  "
-				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib"
+				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
+				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib secchk.lib ccrtrtti.lib"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\STL_eVC"
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
-				GenerateDebugInformation="false"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
 				StackReserveSize="65536"
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -219,6 +224,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -226,7 +234,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="\Storage Card\Program Files\Sword\"
+				RemoteDirectory=""
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -234,7 +242,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Pocket PC 2003 (ARMV4)"
+			Name="Debug|Smartphone 2003 (ARMV4)"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -257,7 +265,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
@@ -267,22 +275,18 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\sword\include;..\dll1\wincesword\include;winceSword\include"
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;UNDER_CE=$(CEVER);UNICODE;NDEBUG;SIMPLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\..\sword\trunk\include\"
+				PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
+				ExceptionHandling="2"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
-				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -290,7 +294,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,NDEBUG,$(CePlatform),ARM,_ARM_"
+				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,DEBUG,$(CePlatform),ARM,_ARM_"
 				Culture="1033"
 			/>
 			<Tool
@@ -299,17 +303,20 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib secchk.lib ccrtrtti.lib"
+				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib corelibc.lib"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\STL_eVC"
+				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
 				StackReserveSize="65536"
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -323,6 +330,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -338,9 +348,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
-			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
-			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
+			Name="Debug|Pocket PC 2003 (ARMV4)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -361,7 +371,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
@@ -371,15 +381,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
-				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;UNDER_CE=$(CEVER);UNICODE;NDEBUG;SIMPLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\..\sword\trunk\include"
+				PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="true"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
@@ -387,6 +393,7 @@
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -394,7 +401,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,NDEBUG,$(CePlatform),ARM,_ARM_"
+				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,DEBUG,$(CePlatform),ARM,_ARM_"
 				Culture="1033"
 			/>
 			<Tool
@@ -402,19 +409,23 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem)  "
-				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib"
+				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
+				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib secchk.lib ccrtrtti.lib"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\STL_eVC"
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
+				GenerateMapFile="true"
+				MapExports="true"
 				StackReserveSize="65536"
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
-				TargetMachine="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -428,6 +439,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -435,7 +449,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="\Storage Card\Program Files\Sword\"
+				RemoteDirectory="\Storage Card\Program Files\sword\"
 				RegisterOutput="0"
 				AdditionalFiles="../../sword.dll"
 			/>
@@ -443,7 +457,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Smartphone 2003 (ARMV4)"
+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -466,7 +480,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
@@ -476,18 +490,24 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
-				PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
-				ExceptionHandling="2"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;UNDER_CE=$(CEVER);UNICODE;NDEBUG;SIMPLE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
+				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -495,7 +515,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,DEBUG,$(CePlatform),ARM,_ARM_"
+				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,NDEBUG,$(CePlatform),ARM,_ARM_"
 				Culture="1033"
 			/>
 			<Tool
@@ -503,14 +523,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib corelibc.lib"
+				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem)  "
+				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="..\STL_eVC"
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="false"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
 				StackReserveSize="65536"
 				StackCommitSize="4096"
@@ -536,7 +556,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory=""
+				RemoteDirectory="\Storage Card\Program Files\Sword\"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -544,9 +564,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
+			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -567,7 +587,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
@@ -577,20 +597,22 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="0"
-				FavorSizeOrSpeed="0"
+				Optimization="2"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
-				PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;UNDER_CE=$(CEVER);UNICODE;NDEBUG;SIMPLE"
+				StringPooling="true"
+				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
-				RuntimeTypeInfo="true"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
+				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -598,7 +620,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalOptions="/r "
-				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,DEBUG,$(CePlatform),ARM,_ARM_"
+				PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,NDEBUG,$(CePlatform),ARM,_ARM_"
 				Culture="1033"
 			/>
 			<Tool
@@ -609,17 +631,16 @@
 				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem)  "
 				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="..\STL_eVC"
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
-				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
-				GenerateMapFile="true"
-				StackReserveSize="131072"
-				StackCommitSize="8192"
+				StackReserveSize="65536"
+				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				TargetMachine="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -648,7 +669,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Pocket PC 2003 (ARMV4)"
+			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -682,18 +703,19 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
+				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
 				PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
 				RuntimeLibrary="1"
+				BufferSecurityCheck="false"
 				RuntimeTypeInfo="true"
 				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
-				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="1"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -709,19 +731,18 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
-				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib secchk.lib ccrtrtti.lib"
+				AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem)  "
+				AdditionalDependencies="..\Dll1\&quot;$(PlatformName)\$(ConfigurationName)&quot;\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\STL_eVC"
+				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
 				GenerateMapFile="true"
-				MapExports="true"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
+				StackReserveSize="131072"
+				StackCommitSize="8192"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
 			/>
@@ -744,7 +765,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="\Storage Card\Program Files\sword\"
+				RemoteDirectory="\Storage Card\Program Files\Sword\"
 				RegisterOutput="0"
 				AdditionalFiles="../../sword.dll"
 			/>
@@ -1152,11 +1173,11 @@
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="..\gui\BibleReader.ICO"
+				RelativePath=".\BibleReader.ICO"
 				>
 			</File>
 			<File
-				RelativePath=".\BibleReader.ICO"
+				RelativePath="..\gui\BibleReader.ICO"
 				>
 			</File>
 			<File


