diff --git a/win/i.Mage.vcxproj b/win/i.Mage.vcxproj
--- a/win/i.Mage.vcxproj
+++ b/win/i.Mage.vcxproj
@@ -1,302 +1,302 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>i.Mage</ProjectName>
     <ProjectGuid>{87F62254-B25F-44C9-A4B0-6897D359F075}</ProjectGuid>
     <RootNamespace>iMage</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(Platform)$(Configuration)14\</OutDir>
     <IntDir>$(Platform)$(Configuration)14\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src;..\resources;..\..\Lgi\trunk\include;..\..\Lgi\trunk\include\lgi\win;..\..\..\CodeLib\libjpeg-9a;..\..\..\CodeLib\libtiff;..\..\..\CodeLib\libpng;..\..\..\CodeLib\zlib;..\..\CodeLib\libpng\build32;%(AdditionalIncludeDirectories);.\Resources</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;WINDOWS;FILTER_UI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <PrecompiledHeader />
       <WarningLevel>Level2</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <AdditionalLibraryDirectories>..\..\Lgi\trunk\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src;..\resources;..\..\Lgi\trunk\include;..\..\Lgi\trunk\include\lgi\win;..\..\..\CodeLib\libjpeg-9a;..\..\..\CodeLib\libtiff;..\..\..\CodeLib\libpng;..\..\..\CodeLib\libpng\build64;..\..\..\CodeLib\zlib;.\Resources</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_DEBUG;WINDOWS;FILTER_UI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <AdditionalLibraryDirectories>..\..\Lgi\trunk\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\src;..\resources;..\..\Lgi\trunk\include;..\..\Lgi\trunk\include\lgi\win;..\..\..\CodeLib\libjpeg-9a;..\..\..\CodeLib\libtiff;..\..\..\CodeLib\libpng;..\..\..\CodeLib\zlib;..\..\CodeLib\libpng\build32;%(AdditionalIncludeDirectories);.\Resources</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;WINDOWS;FILTER_UI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level2</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <AdditionalLibraryDirectories>..\..\Lgi\trunk\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>..\src;..\resources;..\..\Lgi\trunk\include;..\..\Lgi\trunk\include\lgi\win;..\..\..\CodeLib\libjpeg-9a;..\..\..\CodeLib\libtiff;..\..\..\CodeLib\libpng;..\..\..\CodeLib\libpng\build64;..\..\..\CodeLib\zlib;.\Resources</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;WINDOWS;FILTER_UI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level1</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <AdditionalLibraryDirectories>..\..\Lgi\trunk\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Lgi\trunk\src\common\Coding\LexCpp.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Coding\ScriptCompiler.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Coding\ScriptLibrary.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Coding\ScriptVM.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Gdc2\Filters\Gif.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Gdc2\Filters\TransparentDlg.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Gdc2\Filters\Jpeg.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Gdc2\Filters\Libtiff.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Gdc2\Filters\Lzw.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Gdc2\Filters\Png.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Gdc2\Filters\Tga.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Gdc2\Icc.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Gdc2\Tools\GdcTools.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Images\Compare\ImageComparison.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Lgi\About.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Lgi\DocApp.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Lgi\ProgressStatusPane.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Lgi\LgiMain.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Text\XmlTreeUi.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Widgets\ControlTree.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Widgets\ToolTabBar.cpp" />
     <ClCompile Include="..\..\Lgi\trunk\src\common\Widgets\ZoomView.cpp" />
     <ClCompile Include="..\src\BrightContDlg.cpp" />
     <ClCompile Include="..\src\ColourDlg.cpp" />
     <ClCompile Include="..\src\Compare.cpp" />
     <ClCompile Include="..\src\Filters\GaussianBlur\GaussianBlurDlg.cpp" />
     <ClCompile Include="..\src\Filters\Levels\Levels.cpp" />
-    <ClCompile Include="..\src\GAngle.cpp" />
+    <ClCompile Include="..\src\Angle.cpp" />
     <ClCompile Include="..\src\ColourCtrl.cpp" />
-    <ClCompile Include="..\src\GImgAlign.cpp" />
-    <ClCompile Include="..\src\GReduceDlg.cpp" />
+    <ClCompile Include="..\src\ImgAlign.cpp" />
+    <ClCompile Include="..\src\ReduceDlg.cpp" />
     <ClCompile Include="..\src\GridDlg.cpp" />
     <ClCompile Include="..\src\HslSplit.cpp" />
     <ClCompile Include="..\src\HueGraph.cpp" />
     <ClCompile Include="..\src\IccUi.cpp" />
     <ClCompile Include="..\src\ImageApp.cpp" />
     <ClCompile Include="..\src\ImageProperties.cpp" />
     <ClCompile Include="..\src\ImageProps.cpp" />
     <ClCompile Include="..\src\ImageRegTypes.cpp" />
     <ClCompile Include="..\src\ImageScript.cpp" />
     <ClCompile Include="..\src\ImageTool.cpp" />
     <ClCompile Include="..\src\OperatorDlg.cpp" />
     <ClCompile Include="..\src\TextDlg.cpp" />
     <ClCompile Include="..\src\ToolBrush.cpp" />
     <ClCompile Include="..\src\ToolEllipse.cpp" />
     <ClCompile Include="..\src\ToolErase.cpp" />
     <ClCompile Include="..\src\ToolEyeDropper.cpp" />
     <ClCompile Include="..\src\ToolFlood.cpp" />
     <ClCompile Include="..\src\ToolFreehand.cpp" />
     <ClCompile Include="..\src\ToolLine.cpp" />
     <ClCompile Include="..\src\ToolPolygon.cpp" />
     <ClCompile Include="..\src\ToolRectangle.cpp" />
     <ClCompile Include="..\src\ToolSelectBrush.cpp" />
     <ClCompile Include="..\src\ToolText.cpp" />
     <ClCompile Include="..\src\ToolZoom.cpp" />
     <ClCompile Include="..\src\UiPaletteCtrl.cpp" />
     <ClCompile Include="..\src\UiPaletteView.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Lgi\trunk\include\lgi\common\ZoomView.h" />
     <ClInclude Include="..\..\Lgi\trunk\src\common\Coding\GScriptingPriv.h" />
     <ClInclude Include="..\..\Lgi\trunk\src\common\Coding\Instructions.h" />
     <ClInclude Include="..\..\Lgi\trunk\src\common\Gdc2\Filters\GTransparentDlg.h" />
     <ClInclude Include="..\src\ColourDlg.h" />
     <ClInclude Include="..\src\ColourCtrl.h" />
     <ClInclude Include="..\src\GReduceDlg.h" />
     <ClInclude Include="..\src\GridDlg.h" />
     <ClInclude Include="..\src\IccUi.h" />
     <ClInclude Include="..\src\Image.h" />
     <ClInclude Include="..\src\ImageProperties.h" />
     <ClInclude Include="..\src\ImageTool.h" />
     <ClInclude Include="..\src\OperatorDlg.h" />
     <ClInclude Include="..\src\TextDlg.h" />
     <ClInclude Include="..\src\UiPaletteCtrl.h" />
     <ClInclude Include="..\src\UiPaletteView.h" />
   </ItemGroup>
   <ItemGroup>
     <MASM Include="..\..\Lgi\trunk\src\common\Coding\ExternCall.asm">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd $(IntDir)
 "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\x86_amd64\ml64.exe" %(FullPath) /c
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename).obj;%(Outputs)</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd $(IntDir)
 "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\x86_amd64\ml64.exe" %(FullPath) /c
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename).obj;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
       <FileType>Document</FileType>
     </MASM>
     <None Include="..\src\Help\help.css" />
     <None Include="..\src\Help\index.html" />
     <None Include="..\src\Help\scripting.html" />
     <None Include="..\src\Help\tools.html" />
     <None Include="..\src\Help\usage.html" />
   </ItemGroup>
   <ItemGroup>
     <Manifest Include="..\src\iMage.manifest" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\Resources\Script1.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Lgi\trunk\Lgi_vs2015.vcxproj">
       <Project>{95df9ca4-6d37-4a85-a648-80c2712e0da1}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
 </Project>
\ No newline at end of file