diff --git a/.github/workflows/build_on_push.yml b/.github/workflows/build_on_push.yml
index bccec70..8e7799c 100644
--- a/.github/workflows/build_on_push.yml
+++ b/.github/workflows/build_on_push.yml
@@ -19,14 +19,14 @@ jobs:
       matrix:
         include:
           # faster testing by disabling the others...
-          - os: macos-latest
-            platform: macos
-          #- os: windows-latest
-          #  platform: windows
+          #- os: macos-latest
+          #  platform: macos
+          - os: windows-latest
+            platform: windows
 
     steps:
       - name: Setup actions
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
@@ -47,8 +47,9 @@ jobs:
 
       - name: Get SDK (Windows)
         run: |
-          omnis_sdk=$(curl -s "https://filestore.omnis.net/omnisrestservlet/ws/5975/api/file_browser/browser/file?file=/OmnisStudio/Studio1100_36251/SDK/Windows-SDK-11-x64.zip&browsertype=0&odppid=blank" | awk {'print $1'})
-          curl -O "$omnis_sdk"
+          $response = Invoke-WebRequest -uri "https://filestore.omnis.net/omnisrestservlet/ws/5975/api/file_browser/browser/file?file=/OmnisStudio/Studio1100_36251/SDK/Windows-SDK-11-x64.zip&browsertype=0&odppid=blank"
+          $omnisdk = [System.Text.Encoding]::UTF8.GetString($response.content)
+          Invoke-WebRequest -uri $omnisdk -OutFile Windows-SDK-11-x64.zip
           tar -xf Windows-SDK-11-x64.zip
           xcopy /E /I Windows-SDK-11-x64\* thirdparty\omnis.sdk\win\
         if: matrix.platform == 'windows'
@@ -89,7 +90,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
       - name: Copy files to destination
         run: |
           mkdir oExample
diff --git a/example.vcxproj b/example.vcxproj
index 927126f..54c5683 100644
--- a/example.vcxproj
+++ b/example.vcxproj
@@ -1,283 +1,161 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="UNICODE Debug|Win32">
-      <Configuration>UNICODE Debug</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="UNICODE Debug|x64">
-      <Configuration>UNICODE Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="UNICODE Release|Win32">
-      <Configuration>UNICODE Release</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="UNICODE Release|x64">
-      <Configuration>UNICODE Release</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D377AD87-8C8E-47F3-987D-428CF82E73FF}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <RootNamespace>oExample</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|Win32'" Label="Configuration">
+  <Import Project="windows\omnis_configuration.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
+  <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
+  <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
+  <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
+  <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|Win32'" Label="PropertySheets">
+  <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" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="thirdparty\omnis.sdk\win\master\windows\omnis_environment.props" />
+    <Import Project="windows\xcomp.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|x64'" Label="PropertySheets">
+  <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" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="thirdparty\omnis.sdk\win\master\windows\omnis_environment.props" />
+    <Import Project="windows\xcomp.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|Win32'" Label="PropertySheets">
+  <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" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="thirdparty\omnis.sdk\win\master\windows\omnis_environment.props" />
+    <Import Project="windows\xcomp.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|x64'" Label="PropertySheets">
+  <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" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="thirdparty\omnis.sdk\win\master\windows\omnis_environment.props" />
+    <Import Project="windows\xcomp.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>11.0.60315.1</_ProjectFileVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|Win32'">
-    <OutDir>.\URel\</OutDir>
-    <IntDir>.\URel\</IntDir>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>.\URel64\</OutDir>
-    <IntDir>.\URel64\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|Win32'">
-    <OutDir>.\UDeb\</OutDir>
-    <IntDir>.\UDeb\</IntDir>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>.\UDeb64\</OutDir>
-    <IntDir>.\UDeb64\</IntDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/GENERIC.tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
+      <PreprocessorDefinitions>NDEBUG;isXCOMPLIB;NO_STRICT;WIN32;_WINDOWS;iswin32;isunicode;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <StructMemberAlignment>2Bytes</StructMemberAlignment>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>.\URel/GENERIC.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\URel/</AssemblerListingLocation>
-      <ObjectFileName>.\URel/</ObjectFileName>
-      <ProgramDataBaseFileName>.\URel/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;isunicode;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;omnisu.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\URel/generic.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>.\Generic.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>.\URel/GENERIC.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention />
-      <ImportLibrary>.\URel/GENERIC.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\URel/GENERIC.bsc</OutputFile>
-    </Bscmake>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/GENERIC.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>thirdparty\omnis.sdk\win\complib;thirdparty\omnis.xcomp.framework;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;is64bit;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;OMNISSDK=100;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>.\URel64/example.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\URel64/</AssemblerListingLocation>
-      <ObjectFileName>.\URel64/</ObjectFileName>
-      <ProgramDataBaseFileName>.\URel64/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>$(OM_C_DEBUG_FLAGS);_DEBUG;isXCOMPLIB;NO_STRICT;WIN32;_WINDOWS;iswin32;isunicode;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;isunicode;_UNICODE;UNICODE;is64bit;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;isunicode;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;omnisu64.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\URel64/example.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>.\example.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>.\URel64/example.pdb</ProgramDatabaseFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\URel64/example.lib</ImportLibrary>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <TargetMachine>MachineX86</TargetMachine>
     </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\URel64/GENERIC.bsc</OutputFile>
-    </Bscmake>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/GENERIC.tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>2Bytes</StructMemberAlignment>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>.\UDeb/GENERIC.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\UDeb/</AssemblerListingLocation>
-      <ObjectFileName>.\UDeb/</ObjectFileName>
-      <ProgramDataBaseFileName>.\UDeb/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;isXCOMPLIB;NO_STRICT;is64bit;_WINDOWS;iswin32;isunicode;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;isunicode;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;isunicode;_UNICODE;UNICODE;is64bit;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;omnisu.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\UDeb/generic.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>.\Generic.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\UDeb/GENERIC.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention />
-      <ImportLibrary>.\UDeb/GENERIC.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
+      <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\UDeb/GENERIC.bsc</OutputFile>
-    </Bscmake>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UNICODE Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/GENERIC.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>thirdparty\omnis.sdk\win\complib;thirdparty\omnis.xcomp.framework;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;is64bit;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=100;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(OM_C_DEBUG_FLAGS);_DEBUG;isXCOMPLIB;NO_STRICT;is64bit;_WINDOWS;iswin32;isunicode;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=110;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-      <PrecompiledHeaderOutputFile>.\UDeb64/example.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\UDeb64/</AssemblerListingLocation>
-      <ObjectFileName>.\UDeb64/</ObjectFileName>
-      <ProgramDataBaseFileName>.\UDeb64/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;isunicode;_UNICODE;UNICODE;is64bit;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;omnisu64.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\UDeb64/example.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>.\example.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\UDeb64/example.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\UDeb64/example.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\UDeb64/GENERIC.bsc</OutputFile>
-    </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="thirdparty\omnis.xcomp.framework\FrameworkWndProc.cpp" />
@@ -297,10 +175,7 @@
     <None Include="example.DEF" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="en.lproj\oExample.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="en.lproj\oExample.bmp" />
+    <ResourceCompile Include="resource\oExample.rc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="thirdparty\omnis.xcomp.framework\oBaseComponent.h" />
@@ -318,6 +193,9 @@
     <ClInclude Include="Src\oExample.h" />
     <ClInclude Include="Src\oNVExample.h" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="resource\oExample.bmp" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/example.vcxproj.filters b/example.vcxproj.filters
index 1941629..b55e841 100644
--- a/example.vcxproj.filters
+++ b/example.vcxproj.filters
@@ -1,51 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\FrameworkWndProc.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseComponent.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseNVComponent.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseVisComponent.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oDrawingCanvas.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oRGBAImage.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oUTF8.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oXCompLib.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\qString.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\example.cpp" />
-    <ClCompile Include="Src\oExample.cpp" />
-    <ClCompile Include="Src\oNVExample.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="en.lproj\oExample.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="en.lproj\oExample.bmp" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="example.DEF" />
   </ItemGroup>
-  <ItemGroup>
-    <Filter Include="omnis.xcomp.framework">
-      <UniqueIdentifier>{f46b3caa-59da-41fa-aea0-0fc061e6e6e5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="thirdparty\omnis.xcomp.framework\oBaseComponent.h">
       <Filter>omnis.xcomp.framework</Filter>
@@ -80,8 +37,73 @@
     <ClInclude Include="thirdparty\omnis.xcomp.framework\xCompStandardIncludes.h">
       <Filter>omnis.xcomp.framework</Filter>
     </ClInclude>
-    <ClInclude Include="Src\example.h" />
-    <ClInclude Include="Src\oExample.h" />
-    <ClInclude Include="Src\oNVExample.h" />
+    <ClInclude Include="Src\example.h">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClInclude Include="Src\oExample.h">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClInclude Include="Src\oNVExample.h">
+      <Filter>source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="source">
+      <UniqueIdentifier>{042c8f37-28e8-4eac-833d-4d8cd3ba4f61}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="resources">
+      <UniqueIdentifier>{10e9e5b8-e8a7-4a18-a057-3e0006209318}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="omnis.xcomp.framework">
+      <UniqueIdentifier>{f46b3caa-59da-41fa-aea0-0fc061e6e6e5}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\FrameworkWndProc.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseComponent.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseNVComponent.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseVisComponent.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oDrawingCanvas.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oRGBAImage.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oUTF8.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oXCompLib.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\qString.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\example.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\oExample.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\oNVExample.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="resources\oExample.bmp">
+      <Filter>resources</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="resources\oExample.rc">
+      <Filter>resources</Filter>
+    </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/omnis.xcconfig b/mac/omnis.xcconfig
old mode 100755
new mode 100644
similarity index 100%
rename from omnis.xcconfig
rename to mac/omnis.xcconfig
diff --git a/oExample.xcodeproj/project.pbxproj b/oExample.xcodeproj/project.pbxproj
index 76083e9..28d2a59 100755
--- a/oExample.xcodeproj/project.pbxproj
+++ b/oExample.xcodeproj/project.pbxproj
@@ -44,7 +44,7 @@
 /* Begin PBXFileReference section */
 		089C167EFE841241C02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		304CD2D61CB7F5190096035F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
-		62173718279B1A2D008C41A4 /* omnis.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = omnis.xcconfig; sourceTree = "<group>"; };
+		62173718279B1A2D008C41A4 /* omnis.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = mac/omnis.xcconfig; sourceTree = "<group>"; };
 		96CA4E650907EB0700C234AA /* complib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = complib.framework; path = thirdparty/omnis.sdk/mac/complib/complib.framework; sourceTree = SOURCE_ROOT; };
 		DDD258BC092896A5006B6BC3 /* oExample.u_xcomp */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = oExample.u_xcomp; sourceTree = BUILT_PRODUCTS_DIR; };
 		DE1E766F2C1A86770095FAB9 /* oBaseNVComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oBaseNVComponent.h; path = thirdparty/omnis.xcomp.framework/oBaseNVComponent.h; sourceTree = "<group>"; };
diff --git a/windows/omnis_environment.props b/windows/omnis_environment.props
new file mode 100644
index 0000000..65a341e
--- /dev/null
+++ b/windows/omnis_environment.props
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <OMNIS_BUILD_ROOT>build\$(Configuration)_$(PlatformShortName)</OMNIS_BUILD_ROOT>
+    <OMNIS_INTBUILD_DIR>intbuild</OMNIS_INTBUILD_DIR>
+    <DEBUGSYMBOLS_LOCATION>$(OMNIS_INTBUILD_DIR)\debugsymbols_$(PlatformShortName)</DEBUGSYMBOLS_LOCATION>
+    <SDK_LOCATION>thirdparty\omnis.sdk\win</SDK_LOCATION>
+    <CONFIG>$(Configuration)</CONFIG>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutDir>$(OMNIS_BUILD_ROOT)\</OutDir>
+    <IntDir>$(OMNIS_INTBUILD_DIR)\$(ProjectName)\$(Configuration)_$(PlatformShortName)\</IntDir>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <StructMemberAlignment>$(BYTE_PACKING)</StructMemberAlignment>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile Condition="'$(Configuration.Contains(`Release`))' == 'true'">$(DEBUGSYMBOLS_LOCATION)\$(TargetName).pdb</ProgramDatabaseFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="OMNIS_BUILD_ROOT">
+      <Value>$(OMNIS_BUILD_ROOT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="OMNIS_INTBUILD_DIR">
+      <Value>$(OMNIS_INTBUILD_DIR)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="DEBUGSYMBOLS_LOCATION">
+      <Value>$(DEBUGSYMBOLS_LOCATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="SDK_LOCATION">
+      <Value>$(SDK_LOCATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="CONFIG">
+      <Value>$(CONFIG)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/windows/xcomp.props b/windows/xcomp.props
new file mode 100644
index 0000000..77652d9
--- /dev/null
+++ b/windows/xcomp.props
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup>
+    <OutDir>$(OMNIS_BUILD_ROOT)\xcomp\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>source\shared;source;..\source;..\source\shared;$(SDK_LOCATION)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SDK_LOCATION)\libs\$(Configuration)_$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>complib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>$(TargetName).def</ModuleDefinitionFile>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ProgramDatabaseFile Condition="'$(Configuration.Contains(`Release`))' == 'true'">$(DEBUGSYMBOLS_LOCATION)\xcomp\$(TargetName).pdb</ProgramDatabaseFile>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
\ No newline at end of file