diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ec8fc3d..136aadb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(XCEngine)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 enable_testing()
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt
index ef4e9602..50e6c2c4 100644
--- a/editor/CMakeLists.txt
+++ b/editor/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(XCEditor VERSION 1.0 LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 get_filename_component(XCENGINE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE)
diff --git a/editor/src/UI/Widgets.h b/editor/src/UI/Widgets.h
index 77c79125..25c085f0 100644
--- a/editor/src/UI/Widgets.h
+++ b/editor/src/UI/Widgets.h
@@ -7,6 +7,7 @@
 #include <XCEngine/Debug/Logger.h>
 
 #include <imgui.h>
+#include <imgui_internal.h>
 #include <string>
 
 namespace XCEngine {
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 26751ece..5ec1bd5c 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(XCEngineLib)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(XCENGINE_VULKAN_SDK_HINT "$ENV{VULKAN_SDK}")
diff --git a/engine/include/XCEngine/Core/Containers/Array.h b/engine/include/XCEngine/Core/Containers/Array.h
index fabff56a..052a14b7 100644
--- a/engine/include/XCEngine/Core/Containers/Array.h
+++ b/engine/include/XCEngine/Core/Containers/Array.h
@@ -261,7 +261,7 @@ void Array<T>::Reallocate(size_t newCapacity) {
     T* newData = nullptr;
     if (newCapacity > 0) {
         newData = static_cast<T*>(::operator new(newCapacity * sizeof(T)));
-        size_t count = std::min(m_size, newCapacity);
+        size_t count = (std::min)(m_size, newCapacity);
         if (count > 0) {
             CopyRange(m_data, newData, count);
         }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0d986fdc..18ee4088 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(XCEngineTests)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # ============================================================
diff --git a/tests/RHI/CMakeLists.txt b/tests/RHI/CMakeLists.txt
index e9d39c69..c7f28f49 100644
--- a/tests/RHI/CMakeLists.txt
+++ b/tests/RHI/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 project(RHIEngineTests)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_subdirectory(D3D12)
diff --git a/tests/RHI/D3D12/CMakeLists.txt b/tests/RHI/D3D12/CMakeLists.txt
index 8ffaf8ff..cc055668 100644
--- a/tests/RHI/D3D12/CMakeLists.txt
+++ b/tests/RHI/D3D12/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 project(rhi_d3d12_tests)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_subdirectory(unit)
diff --git a/tests/RHI/OpenGL/CMakeLists.txt b/tests/RHI/OpenGL/CMakeLists.txt
index 4a133765..ec481e00 100644
--- a/tests/RHI/OpenGL/CMakeLists.txt
+++ b/tests/RHI/OpenGL/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.15)
 
 project(OpenGLEngineTests)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_subdirectory(unit)
-add_subdirectory(integration)
\ No newline at end of file
+add_subdirectory(integration)
diff --git a/tests/RHI/Vulkan/CMakeLists.txt b/tests/RHI/Vulkan/CMakeLists.txt
index 93165c27..736e7c29 100644
--- a/tests/RHI/Vulkan/CMakeLists.txt
+++ b/tests/RHI/Vulkan/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 project(rhi_vulkan_tests)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_subdirectory(unit)