diff --git a/CMakePresets.json b/CMakePresets.json
index bc0c6bd..0a4f655 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -65,16 +65,14 @@
     {
       "name": "Scarlett",
       "cacheVariables": {
-        "XBOX_CONSOLE_TARGET": "scarlett",
-        "BUILD_TESTING": false
+        "XBOX_CONSOLE_TARGET": "scarlett"
       },
       "hidden": true
     },
     {
       "name": "XboxOne",
       "cacheVariables": {
-        "XBOX_CONSOLE_TARGET": "xboxone",
-        "BUILD_TESTING": false
+        "XBOX_CONSOLE_TARGET": "xboxone"
       },
       "hidden": true
     },
@@ -224,6 +222,12 @@
     { "name": "arm64-Debug-VCPKG-Clang"  , "description": "Clang/LLVM for AArch64 (Debug) uvatlastool", "inherits": [ "base", "ARM64", "Debug", "VCPKG", "Clang", "Tools" ], "environment": { "CXXFLAGS": "--target=arm64-pc-windows-msvc" } },
     { "name": "arm64-Release-VCPKG-Clang", "description": "Clang/LLVM for AArch64 (Release) uvatlastool", "inherits": [ "base", "ARM64", "Release", "VCPKG", "Clang", "Tools" ], "environment": { "CXXFLAGS": "--target=arm64-pc-windows-msvc" } },
 
+    { "name": "x64-Debug-Scarlett-Clang"  , "description": "Clang/LLVM for x64 (Debug) for Xbox Series X|S", "inherits": [ "base", "x64", "Debug", "Clang", "Scarlett" ] },
+    { "name": "x64-Release-Scarlett-Clang", "description": "Clang/LLVM for x64 (Release) for Xbox Series X|S", "inherits": [ "base", "x64", "Release", "Clang", "Scarlett" ] },
+
+    { "name": "x64-Debug-XboxOne-Clang"   , "description": "Clang/LLVM for x64 (Debug) for Xbox One", "inherits": [ "base", "x64", "Debug", "Clang", "XboxOne" ] },
+    { "name": "x64-Release-XboxOne-Clang" , "description": "Clang/LLVM for x64 (Release) for Xbox One", "inherits": [ "base", "x64", "Release", "Clang", "XboxOne" ] },
+
     { "name": "x64-Debug-MinGW"  , "description": "MinG-W64 (Debug)", "inherits": [ "base", "x64", "Debug", "GNUC", "VCPKG", "MinGW64" ] },
     { "name": "x64-Release-MinGW", "description": "MinG-W64 (Release)", "inherits": [ "base", "x64", "Release", "GNUC", "VCPKG", "MinGW64" ] },
     { "name": "x86-Debug-MinGW"  , "description": "MinG-W32 (Debug)", "inherits": [ "base", "x86", "Debug", "GNUC", "VCPKG", "MinGW32" ] },
diff --git a/NuGet.Config b/NuGet.Config
deleted file mode 100644
index e35944e..0000000
--- a/NuGet.Config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <config>
-    <add key="repositoryPath" value=".\packages" />
-  </config>
-  <packageSources>
-     <clear />
-     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>
diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake
index 759491f..2a6e864 100644
--- a/build/CompilerAndLinker.cmake
+++ b/build/CompilerAndLinker.cmake
@@ -57,7 +57,7 @@ endif()
 #--- Target architecture switches
 if(XBOX_CONSOLE_TARGET STREQUAL "scarlett")
     list(APPEND COMPILER_SWITCHES $<IF:$<CXX_COMPILER_ID:MSVC>,/favor:AMD64 /arch:AVX2,-march=znver2>)
-elseif(XBOX_CONSOLE_TARGET STREQUAL "xboxone|durago")
+elseif(XBOX_CONSOLE_TARGET MATCHES "xboxone|durango")
     list(APPEND COMPILER_SWITCHES  $<IF:$<CXX_COMPILER_ID:MSVC>,/favor:AMD64 /arch:AVX,-march=btver2>)
 elseif(NOT (${DIRECTX_ARCH} MATCHES "^arm"))
     if((${DIRECTX_ARCH} MATCHES "x86") OR (CMAKE_SIZEOF_VOID_P EQUAL 4))
diff --git a/build/UVAtlas-GitHub-SDK-prerelease.yml b/build/UVAtlas-GitHub-SDK-prerelease.yml
index 0a235a7..d190c69 100644
--- a/build/UVAtlas-GitHub-SDK-prerelease.yml
+++ b/build/UVAtlas-GitHub-SDK-prerelease.yml
@@ -46,17 +46,27 @@ jobs:
     displayName: 'Use NuGet'
     inputs:
       versionSpec: '6.5.x'
+  - task: PowerShell@2
+    displayName: 'Create nuget.config with single source'
+    inputs:
+      targetType: inline
+      script: |
+        $xml = @'
+        <?xml version="1.0" encoding="utf-8"?>
+        <configuration>
+          <packageSources>
+            <clear />
+          </packageSources>
+        </configuration>
+        '@
+        $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
   - task: NuGetCommand@2
     # We have to use a nuget.config to provide the feed for the 'nuget install' option.
     displayName: 'NuGet set package source to ADO feed'
     inputs:
       command: custom
       arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
-  - task: NuGetCommand@2
-    displayName: 'Set nuget.config to single source'
-    inputs:
-      command: custom
-      arguments: sources remove -Name nuget.org -ConfigFile $(Build.SourcesDirectory)\NuGet.config
   - task: nuget-security-analysis@0
     displayName: 'Secure Supply Chain Analysis'
   - task: NuGetCommand@2
@@ -141,16 +151,26 @@ jobs:
     displayName: 'Use NuGet'
     inputs:
       versionSpec: '6.5.x'
+  - task: PowerShell@2
+    displayName: 'Create nuget.config with single source'
+    inputs:
+      targetType: inline
+      script: |
+        $xml = @'
+        <?xml version="1.0" encoding="utf-8"?>
+        <configuration>
+          <packageSources>
+            <clear />
+          </packageSources>
+        </configuration>
+        '@
+        $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
   - task: NuGetCommand@2
     displayName: NuGet set package source to ADO feed
     inputs:
       command: custom
       arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
-  - task: NuGetCommand@2
-    displayName: 'Set nuget.config to single source'
-    inputs:
-      command: custom
-      arguments: sources remove -Name nuget.org -ConfigFile $(Build.SourcesDirectory)\NuGet.config
   - task: nuget-security-analysis@0
     displayName: 'Secure Supply Chain Analysis'
   - task: NuGetCommand@2
diff --git a/build/UVAtlas-GitHub-SDK-release.yml b/build/UVAtlas-GitHub-SDK-release.yml
index 1efdbf4..14a4b47 100644
--- a/build/UVAtlas-GitHub-SDK-release.yml
+++ b/build/UVAtlas-GitHub-SDK-release.yml
@@ -46,17 +46,27 @@ jobs:
     displayName: 'Use NuGet'
     inputs:
       versionSpec: '6.5.x'
+  - task: PowerShell@2
+    displayName: 'Create nuget.config with single source'
+    inputs:
+      targetType: inline
+      script: |
+        $xml = @'
+        <?xml version="1.0" encoding="utf-8"?>
+        <configuration>
+          <packageSources>
+            <clear />
+          </packageSources>
+        </configuration>
+        '@
+        $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
   - task: NuGetCommand@2
     # We have to use a nuget.config to provide the feed for the 'nuget install' option.
     displayName: 'NuGet set package source to ADO feed'
     inputs:
       command: custom
       arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
-  - task: NuGetCommand@2
-    displayName: 'Set nuget.config to single source'
-    inputs:
-      command: custom
-      arguments: sources remove -Name nuget.org -ConfigFile $(Build.SourcesDirectory)\NuGet.config
   - task: nuget-security-analysis@0
     displayName: 'Secure Supply Chain Analysis'
   - task: NuGetCommand@2
@@ -141,16 +151,26 @@ jobs:
     displayName: 'Use NuGet'
     inputs:
       versionSpec: '6.5.x'
+  - task: PowerShell@2
+    displayName: 'Create nuget.config with single source'
+    inputs:
+      targetType: inline
+      script: |
+        $xml = @'
+        <?xml version="1.0" encoding="utf-8"?>
+        <configuration>
+          <packageSources>
+            <clear />
+          </packageSources>
+        </configuration>
+        '@
+        $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
   - task: NuGetCommand@2
     displayName: NuGet set package source to ADO feed
     inputs:
       command: custom
       arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
-  - task: NuGetCommand@2
-    displayName: 'Set nuget.config to single source'
-    inputs:
-      command: custom
-      arguments: sources remove -Name nuget.org -ConfigFile $(Build.SourcesDirectory)\NuGet.config
   - task: nuget-security-analysis@0
     displayName: 'Secure Supply Chain Analysis'
   - task: NuGetCommand@2
diff --git a/build/UVAtlas-SDL.yml b/build/UVAtlas-SDL.yml
index 26aa0ff..0ea338f 100644
--- a/build/UVAtlas-SDL.yml
+++ b/build/UVAtlas-SDL.yml
@@ -44,16 +44,26 @@ jobs:
   - checkout: self
     clean: true
     fetchTags: false
+  - task: PowerShell@2
+    displayName: 'Create nuget.config with single source'
+    inputs:
+      targetType: inline
+      script: |
+        $xml = @'
+        <?xml version="1.0" encoding="utf-8"?>
+        <configuration>
+          <packageSources>
+            <clear />
+          </packageSources>
+        </configuration>
+        '@
+        $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
   - task: NuGetCommand@2
     displayName: 'NuGet set package source to ADO feed'
     inputs:
       command: custom
       arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
-  - task: NuGetCommand@2
-    displayName: 'Set nuget.config to single source'
-    inputs:
-      command: custom
-      arguments: sources remove -Name nuget.org -ConfigFile $(Build.SourcesDirectory)\NuGet.config
   - task: nuget-security-analysis@0
     displayName: 'Secure Supply Chain Analysis'
   - task: NodeTool@0