diff --git a/OptiScaler/OptiScaler.vcxproj b/OptiScaler/OptiScaler.vcxproj
index eea49ab6..e8434ac0 100644
--- a/OptiScaler/OptiScaler.vcxproj
+++ b/OptiScaler/OptiScaler.vcxproj
@@ -22,7 +22,7 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{8d2b73fb-eecd-45ce-b8e5-335610462f58}</ProjectGuid>
-    <RootNamespace>CyberXeSS</RootNamespace>
+    <RootNamespace>OptiScaler</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Vk.h b/OptiScaler/backends/fsr2/FSR2Feature_Vk.h
index 20e76521..f7ba98a0 100644
--- a/OptiScaler/backends/fsr2/FSR2Feature_Vk.h
+++ b/OptiScaler/backends/fsr2/FSR2Feature_Vk.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <vulkan/vulkan.hpp>
 
 
 #include "../../fsr2/include/ffx_fsr2.h"
diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h
index f378f567..5dae8644 100644
--- a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h
+++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <vulkan/vulkan.hpp>
 
 
 #include "../../fsr2_212/include/ffx_fsr2.h"
diff --git a/OptiScaler/backends/xess/XeSSFeature.cpp b/OptiScaler/backends/xess/XeSSFeature.cpp
index c49c1f0e..6c71bbd3 100644
--- a/OptiScaler/backends/xess/XeSSFeature.cpp
+++ b/OptiScaler/backends/xess/XeSSFeature.cpp
@@ -1,13 +1,14 @@
 #pragma once
+#include "XeSSFeature.h"
+
 #include "../../pch.h"
 #include "../../Config.h"
 #include "../../Util.h"
 
 #include "../../detours/detours.h"
-
-#include "XeSSFeature.h"
 #include "../../d3dx/d3dx12.h"
 
+
 inline void XeSSLogCallback(const char* Message, xess_logging_level_t Level)
 {
 	spdlog::log((spdlog::level::level_enum)((int)Level + 1), "FeatureContext::LogCallback XeSS Runtime ({0})", Message);
diff --git a/OptiScaler/backends/xess/XeSSFeature_Dx12.h b/OptiScaler/backends/xess/XeSSFeature_Dx12.h
index 771b24e6..8d9b4a5b 100644
--- a/OptiScaler/backends/xess/XeSSFeature_Dx12.h
+++ b/OptiScaler/backends/xess/XeSSFeature_Dx12.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "../IFeature_Dx12.h"
 #include "XeSSFeature.h"
-#include <string>
 
 class XeSSFeatureDx12 : public XeSSFeature, public IFeature_Dx12
 {
diff --git a/OptiScaler/imgui/imgui_common.h b/OptiScaler/imgui/imgui_common.h
index 2c6086bc..f6fc99e3 100644
--- a/OptiScaler/imgui/imgui_common.h
+++ b/OptiScaler/imgui/imgui_common.h
@@ -4,7 +4,6 @@
 #include "../Config.h"
 #include "../Resource.h"
 #include "../Logger.h"
-#include "../NVNGX_Proxy.h"
 
 #include "imgui/imgui.h"
 #include "imgui/imgui_impl_win32.h"
@@ -598,7 +597,7 @@ public:
 			selectedUpscalerName = "FSR 2.2.1 w/Dx12";
 		else if (Config::Instance()->newBackend == "fsr21_12" || (Config::Instance()->newBackend == "" && *code == "fsr21_12"))
 			selectedUpscalerName = "FSR 2.1.2 w/Dx12";
-		else if (NVNGXProxy::IsNVNGXInited() && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
+		else if (Config::Instance()->DLSSEnabled.value_or(true) && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
 			selectedUpscalerName = "DLSS";
 		else
 			selectedUpscalerName = "XeSS w/Dx12";
@@ -617,7 +616,7 @@ public:
 			if (ImGui::Selectable("FSR 2.2.1 w/Dx12", *code == "fsr22_12"))
 				Config::Instance()->newBackend = "fsr22_12";
 
-			if (NVNGXProxy::IsNVNGXInited() && ImGui::Selectable("DLSS", *code == "dlss"))
+			if (Config::Instance()->DLSSEnabled.value_or(true) && ImGui::Selectable("DLSS", *code == "dlss"))
 				Config::Instance()->newBackend = "dlss";
 
 			ImGui::EndCombo();
@@ -632,7 +631,7 @@ public:
 			selectedUpscalerName = "FSR 2.1.2";
 		else if (Config::Instance()->newBackend == "fsr22" || (Config::Instance()->newBackend == "" && *code == "fsr22"))
 			selectedUpscalerName = "FSR 2.2.1";
-		else if (NVNGXProxy::IsNVNGXInited() && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
+		else if (Config::Instance()->DLSSEnabled.value_or(true) && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
 			selectedUpscalerName = "DLSS";
 		else
 			selectedUpscalerName = "XeSS";
@@ -648,7 +647,7 @@ public:
 			if (ImGui::Selectable("FSR 2.2.1", *code == "fsr22"))
 				Config::Instance()->newBackend = "fsr22";
 
-			if (NVNGXProxy::IsNVNGXInited() && ImGui::Selectable("DLSS", *code == "dlss"))
+			if (Config::Instance()->DLSSEnabled.value_or(true) && ImGui::Selectable("DLSS", *code == "dlss"))
 				Config::Instance()->newBackend = "dlss";
 
 			ImGui::EndCombo();
@@ -661,7 +660,7 @@ public:
 
 		if (Config::Instance()->newBackend == "fsr21" || (Config::Instance()->newBackend == "" && *code == "fsr21"))
 			selectedUpscalerName = "FSR 2.1.2";
-		else if (NVNGXProxy::IsNVNGXInited() && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
+		else if (Config::Instance()->DLSSEnabled.value_or(true) && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
 			selectedUpscalerName = "DLSS";
 		else
 			selectedUpscalerName = "FSR 2.2.1";