diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 04366b2..4c70ad0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,7 +78,7 @@ jobs:
       run: |
         cd build
         cmake --build . --config ${{ matrix.config.build_type }} -- /M
-        windeployqt bin/${{ matrix.config.arch }}-${{ env.MSC_VERSION }}/${{ matrix.config.build_type }}
+        windeployqt ./bin/${{ matrix.config.arch }}-${{ env.MSC_VERSION }}/${{ matrix.config.build_type }}
 
     - uses: actions/upload-artifact@v2
       id: upload_artifact
diff --git a/.gitignore b/.gitignore
index b9d55c6..dcbe624 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
 .vs/
-*.ini
-*.user
+.vscode/
+build*/
 Debug/
 Release/
 x64/
 GeneratedFiles/
-build*
-.vscode/
+
+*.ini
+*.user
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f969b84..88f9e9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.12)
 ##################################################################################################################
 project(QtDirect3D
     LANGUAGES C CXX
-    DESCRIPTION "Qt DirectX Widgets & Demos."
+    DESCRIPTION "Qt Direct3D Widgets & Examples."
 )
 
 include(CMakeOptions.cmake)
@@ -18,7 +18,7 @@ include(CMakeOptions.cmake)
 # Groups CMake pre-defined projects
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set_property (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY 
+set_property (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
     VS_STARTUP_PROJECT Direct3D9Widget
 )
 
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 0ed56bf..3d2d09d 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -56,7 +56,7 @@ if (BUILD_WITH_IMGUI)
         add_subdirectory(Direct3D11Widget_ImGui)
     endif()
 
-    if (INCLUDE_DX12_EXAMPLE AND "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+    if (INCLUDE_DX12_EXAMPLE)
         add_subdirectory(Direct3D12Widget_ImGui)
     endif()
 endif()
diff --git a/examples/Direct3D12Widget_ImGui/CMakeLists.txt b/examples/Direct3D12Widget_ImGui/CMakeLists.txt
index 6a6fc70..5f29998 100644
--- a/examples/Direct3D12Widget_ImGui/CMakeLists.txt
+++ b/examples/Direct3D12Widget_ImGui/CMakeLists.txt
@@ -6,6 +6,12 @@ cmake_minimum_required(VERSION 3.12)
 ##################################################################################################################
 project(Direct3D12Widget_ImGui)
 
+
+add_compile_definitions(
+    # https://github.com/ocornut/imgui/pull/2406
+    ImTextureID=ImU64
+)
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${QTDIRECT3D_WIDGETS_DIR}/QDirect3D12Widget/ImGui
diff --git a/examples/Direct3D12Widget_ImGui/QtDirect3D12_ImGui.vcxproj b/examples/Direct3D12Widget_ImGui/QtDirect3D12_ImGui.vcxproj
index 9949fd8..f3ad299 100644
--- a/examples/Direct3D12Widget_ImGui/QtDirect3D12_ImGui.vcxproj
+++ b/examples/Direct3D12Widget_ImGui/QtDirect3D12_ImGui.vcxproj
@@ -127,21 +127,25 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\source\QDirect3D12Widget\ImGui;..\..\thirdparty\imgui;..\..\thirdparty\imgui\examples;$(Qt_INCLUDEPATH_);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ImTextureID=ImU64;$(Qt_DEFINES_);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\source\QDirect3D12Widget\ImGui;..\..\thirdparty\imgui;..\..\thirdparty\imgui\examples;$(Qt_INCLUDEPATH_);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ImTextureID=ImU64;$(Qt_DEFINES_);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\source\QDirect3D12Widget\ImGui;..\..\thirdparty\imgui;..\..\thirdparty\imgui\examples;$(Qt_INCLUDEPATH_);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ImTextureID=ImU64;$(Qt_DEFINES_);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\source\QDirect3D12Widget\ImGui;..\..\thirdparty\imgui;..\..\thirdparty\imgui\examples;$(Qt_INCLUDEPATH_);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ImTextureID=ImU64;$(Qt_DEFINES_);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/examples/QtDirect3D_All.sln b/examples/QtDirect3D_All.sln
index dd1f202..bfaf4e6 100644
--- a/examples/QtDirect3D_All.sln
+++ b/examples/QtDirect3D_All.sln
@@ -15,7 +15,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D9", "Direct3D9Wid
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D10", "Direct3D10Widget\QtDirect3D10.vcxproj", "{21D450F4-D4EB-4C32-82F6-73E439591B1D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D11", "Direct3D11Widget\QtDirect3D11.vcxproj", "{B9E907AC-964B-415F-8F45-49A7483B285D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D11", "Direct3D11Widget\QtDirect3D11.vcxproj", "{A323E634-7404-4860-B4C8-55FD3443804C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D12_ImGui", "Direct3D12Widget_ImGui\QtDirect3D12_ImGui.vcxproj", "{04520FA2-F602-472C-9BE7-246A7387100B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D12", "Direct3D12Widget\QtDirect3D12.vcxproj", "{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,30 +37,6 @@ Global
 		{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.Build.0 = Release|x64
 		{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.ActiveCfg = Release|Win32
 		{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.Build.0 = Release|Win32
-		{B9E907AC-964B-415F-8F45-49A7483B285D}.Debug|x64.ActiveCfg = Debug|x64
-		{B9E907AC-964B-415F-8F45-49A7483B285D}.Debug|x64.Build.0 = Debug|x64
-		{B9E907AC-964B-415F-8F45-49A7483B285D}.Debug|x86.ActiveCfg = Debug|Win32
-		{B9E907AC-964B-415F-8F45-49A7483B285D}.Debug|x86.Build.0 = Debug|Win32
-		{B9E907AC-964B-415F-8F45-49A7483B285D}.Release|x64.ActiveCfg = Release|x64
-		{B9E907AC-964B-415F-8F45-49A7483B285D}.Release|x64.Build.0 = Release|x64
-		{B9E907AC-964B-415F-8F45-49A7483B285D}.Release|x86.ActiveCfg = Release|Win32
-		{B9E907AC-964B-415F-8F45-49A7483B285D}.Release|x86.Build.0 = Release|Win32
-		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Debug|x64.ActiveCfg = Debug|x64
-		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Debug|x64.Build.0 = Debug|x64
-		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Debug|x86.ActiveCfg = Debug|Win32
-		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Debug|x86.Build.0 = Debug|Win32
-		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Release|x64.ActiveCfg = Release|x64
-		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Release|x64.Build.0 = Release|x64
-		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Release|x86.ActiveCfg = Release|Win32
-		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Release|x86.Build.0 = Release|Win32
-		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Debug|x64.ActiveCfg = Debug|x64
-		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Debug|x64.Build.0 = Debug|x64
-		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Debug|x86.ActiveCfg = Debug|Win32
-		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Debug|x86.Build.0 = Debug|Win32
-		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x64.ActiveCfg = Release|x64
-		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x64.Build.0 = Release|x64
-		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x86.ActiveCfg = Release|Win32
-		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x86.Build.0 = Release|Win32
 		{3714A2DD-57EA-49F6-845F-FAF1C1AFA156}.Debug|x64.ActiveCfg = Debug|x64
 		{3714A2DD-57EA-49F6-845F-FAF1C1AFA156}.Debug|x64.Build.0 = Debug|x64
 		{3714A2DD-57EA-49F6-845F-FAF1C1AFA156}.Debug|x86.ActiveCfg = Debug|Win32
@@ -65,6 +45,22 @@ Global
 		{3714A2DD-57EA-49F6-845F-FAF1C1AFA156}.Release|x64.Build.0 = Release|x64
 		{3714A2DD-57EA-49F6-845F-FAF1C1AFA156}.Release|x86.ActiveCfg = Release|Win32
 		{3714A2DD-57EA-49F6-845F-FAF1C1AFA156}.Release|x86.Build.0 = Release|Win32
+		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Debug|x64.ActiveCfg = Debug|x64
+		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Debug|x64.Build.0 = Debug|x64
+		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Debug|x86.ActiveCfg = Debug|Win32
+		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Debug|x86.Build.0 = Debug|Win32
+		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x64.ActiveCfg = Release|x64
+		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x64.Build.0 = Release|x64
+		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x86.ActiveCfg = Release|Win32
+		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x86.Build.0 = Release|Win32
+		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Debug|x64.ActiveCfg = Debug|x64
+		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Debug|x64.Build.0 = Debug|x64
+		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Debug|x86.ActiveCfg = Debug|Win32
+		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Debug|x86.Build.0 = Debug|Win32
+		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Release|x64.ActiveCfg = Release|x64
+		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Release|x64.Build.0 = Release|x64
+		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Release|x86.ActiveCfg = Release|Win32
+		{B112E33D-BA9B-418C-8D5B-3FDC6898A330}.Release|x86.Build.0 = Release|Win32
 		{21D450F4-D4EB-4C32-82F6-73E439591B1D}.Debug|x64.ActiveCfg = Debug|x64
 		{21D450F4-D4EB-4C32-82F6-73E439591B1D}.Debug|x64.Build.0 = Debug|x64
 		{21D450F4-D4EB-4C32-82F6-73E439591B1D}.Debug|x86.ActiveCfg = Debug|Win32
@@ -73,14 +69,39 @@ Global
 		{21D450F4-D4EB-4C32-82F6-73E439591B1D}.Release|x64.Build.0 = Release|x64
 		{21D450F4-D4EB-4C32-82F6-73E439591B1D}.Release|x86.ActiveCfg = Release|Win32
 		{21D450F4-D4EB-4C32-82F6-73E439591B1D}.Release|x86.Build.0 = Release|Win32
+		{A323E634-7404-4860-B4C8-55FD3443804C}.Debug|x64.ActiveCfg = Debug|x64
+		{A323E634-7404-4860-B4C8-55FD3443804C}.Debug|x64.Build.0 = Debug|x64
+		{A323E634-7404-4860-B4C8-55FD3443804C}.Debug|x86.ActiveCfg = Debug|Win32
+		{A323E634-7404-4860-B4C8-55FD3443804C}.Debug|x86.Build.0 = Debug|Win32
+		{A323E634-7404-4860-B4C8-55FD3443804C}.Release|x64.ActiveCfg = Release|x64
+		{A323E634-7404-4860-B4C8-55FD3443804C}.Release|x64.Build.0 = Release|x64
+		{A323E634-7404-4860-B4C8-55FD3443804C}.Release|x86.ActiveCfg = Release|Win32
+		{A323E634-7404-4860-B4C8-55FD3443804C}.Release|x86.Build.0 = Release|Win32
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x64.ActiveCfg = Debug|x64
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x64.Build.0 = Debug|x64
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x86.ActiveCfg = Debug|Win32
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x86.Build.0 = Debug|Win32
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x64.ActiveCfg = Release|x64
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x64.Build.0 = Release|x64
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x86.ActiveCfg = Release|Win32
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x86.Build.0 = Release|Win32
+		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Debug|x64.ActiveCfg = Debug|x64
+		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Debug|x64.Build.0 = Debug|x64
+		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Debug|x86.ActiveCfg = Debug|Win32
+		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Debug|x86.Build.0 = Debug|Win32
+		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Release|x64.ActiveCfg = Release|x64
+		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Release|x64.Build.0 = Release|x64
+		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Release|x86.ActiveCfg = Release|Win32
+		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{B12702AD-ABFB-343A-A199-8E24837244A3} = {C7362413-E4F9-4012-875F-A7D81D9EBE96}
-		{A7639B86-7FF9-495D-B6D1-53D9785EBA48} = {C7362413-E4F9-4012-875F-A7D81D9EBE96}
 		{3714A2DD-57EA-49F6-845F-FAF1C1AFA156} = {C7362413-E4F9-4012-875F-A7D81D9EBE96}
+		{A7639B86-7FF9-495D-B6D1-53D9785EBA48} = {C7362413-E4F9-4012-875F-A7D81D9EBE96}
+		{04520FA2-F602-472C-9BE7-246A7387100B} = {C7362413-E4F9-4012-875F-A7D81D9EBE96}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B3FAF30B-443F-405A-927E-1FDA8DD61552}
diff --git a/examples/QtDirect3D_DX12.sln b/examples/QtDirect3D_DX12.sln
deleted file mode 100644
index 8615e32..0000000
--- a/examples/QtDirect3D_DX12.sln
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D12_ImGui", "Direct3D12Widget_ImGui\QtDirect3D12_ImGui.vcxproj", "{04520FA2-F602-472C-9BE7-246A7387100B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D12", "Direct3D12Widget\QtDirect3D12.vcxproj", "{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x64.ActiveCfg = Debug|x64
-		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x64.Build.0 = Debug|x64
-		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x86.ActiveCfg = Debug|Win32
-		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x86.Build.0 = Debug|Win32
-		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x64.ActiveCfg = Release|x64
-		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x64.Build.0 = Release|x64
-		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x86.ActiveCfg = Release|Win32
-		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x86.Build.0 = Release|Win32
-		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Debug|x64.ActiveCfg = Debug|x64
-		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Debug|x64.Build.0 = Debug|x64
-		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Debug|x86.ActiveCfg = Debug|Win32
-		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Debug|x86.Build.0 = Debug|Win32
-		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Release|x64.ActiveCfg = Release|x64
-		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Release|x64.Build.0 = Release|x64
-		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Release|x86.ActiveCfg = Release|Win32
-		{37659FE3-7AA7-4EFB-8E89-F7596DA80A79}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2EFD07BC-EE4C-48AF-B6C6-78757441EB0C}
-	EndGlobalSection
-EndGlobal
diff --git a/examples/QtDirect3D_ImGui.sln b/examples/QtDirect3D_ImGui.sln
index f767922..f89a9c4 100644
--- a/examples/QtDirect3D_ImGui.sln
+++ b/examples/QtDirect3D_ImGui.sln
@@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D10_ImGui", "Direc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D11_ImGui", "Direct3D11Widget_ImGui\QtDirect3D11_ImGui.vcxproj", "{A7639B86-7FF9-495D-B6D1-53D9785EBA48}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtDirect3D12_ImGui", "Direct3D12Widget_ImGui\QtDirect3D12_ImGui.vcxproj", "{04520FA2-F602-472C-9BE7-246A7387100B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -41,6 +43,14 @@ Global
 		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x64.Build.0 = Release|x64
 		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x86.ActiveCfg = Release|Win32
 		{A7639B86-7FF9-495D-B6D1-53D9785EBA48}.Release|x86.Build.0 = Release|Win32
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x64.ActiveCfg = Debug|x64
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x64.Build.0 = Debug|x64
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x86.ActiveCfg = Debug|Win32
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Debug|x86.Build.0 = Debug|Win32
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x64.ActiveCfg = Release|x64
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x64.Build.0 = Release|x64
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x86.ActiveCfg = Release|Win32
+		{04520FA2-F602-472C-9BE7-246A7387100B}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/source/QDirect3D12Widget/ImGui/QDirect3D12Widget.cpp b/source/QDirect3D12Widget/ImGui/QDirect3D12Widget.cpp
index 74a3f0e..2b9ee29 100644
--- a/source/QDirect3D12Widget/ImGui/QDirect3D12Widget.cpp
+++ b/source/QDirect3D12Widget/ImGui/QDirect3D12Widget.cpp
@@ -11,7 +11,6 @@
 #include <QEvent>
 #include <QWheelEvent>
 
-//#define ImTextureID D3D12_GPU_DESCRIPTOR_HANDLE * // x32 builds
 #include "imgui.h"
 #include "imgui_impl_dx12.h"
 #include "imgui_impl_win32.h"
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 3640876..361e97f 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -12,7 +12,7 @@ if (NOT EXISTS "${IMGUI_ROOT_DIR}/imgui.h")
     else()
         message(FATAL_ERROR "[ERROR] Failed to find Git client. Please install Git and try again.")
     endif()
-    
+
     set(IMGUI_REPO "https://github.com/ocornut/imgui.git")
     set(IMGUI_TAG  "v1.76")
     message(STATUS "[INFO] Cloning imgui. Please wait...")