diff --git a/.gitmodules b/.gitmodules
index 41d62e4..af2212b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "lib_source/3rdparty/qwindowkit"]
-	path = lib_source/3rdparty/qwindowkit
+[submodule "3rdparty/qwindowkit"]
+	path = 3rdparty/qwindowkit
 	url = https://github.com/stdware/qwindowkit.git
diff --git a/3rdparty/qwindowkit b/3rdparty/qwindowkit
new file mode 160000
index 0000000..3575329
--- /dev/null
+++ b/3rdparty/qwindowkit
@@ -0,0 +1 @@
+Subproject commit 357532958f2e806c69c96f018333a45e65e35201
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8568f3..c997ae3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,10 +10,24 @@ option(RIBBONUI_BUILD_EXAMPLES "Build RibbonUI APP." ON)
 option(RIBBONUI_BUILD_QWINDOWKIT "Build QWindowKit." ON)
 option(RIBBONUI_BUILD_STATIC_LIB "Build RibbonUI static library." OFF)
 
+if(APPLE)
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
+endif()
+
 if(NOT RIBBONUI_QML_PLUGIN_DIRECTORY)
     set(RIBBONUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/RibbonUI CACHE PATH "RibbonUI Plugin Path")
 endif()
 
+if (RIBBONUI_BUILD_QWINDOWKIT)
+    set(QWINDOWKIT_BUILD_STATIC ON)
+    set(QWINDOWKIT_BUILD_EXAMPLES OFF)
+    set(QWINDOWKIT_BUILD_QUICK ON)
+    set(QWINDOWKIT_BUILD_WIDGETS OFF)
+    set(QWINDOWKIT_ENABLE_STYLE_AGENT ON)
+    set(QWINDOWKIT_INSTALL OFF)
+    add_subdirectory(3rdparty/qwindowkit)
+endif()
+
 add_subdirectory(lib_source)
 
 if (RIBBONUI_BUILD_EXAMPLES)
diff --git a/lib_source/3rdparty/qwindowkit b/lib_source/3rdparty/qwindowkit
deleted file mode 160000
index 0177eed..0000000
--- a/lib_source/3rdparty/qwindowkit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0177eedd03bd9a75dafea296f77b8a6bdad9c3cb
diff --git a/lib_source/CMakeLists.txt b/lib_source/CMakeLists.txt
index 086c561..d1e274b 100644
--- a/lib_source/CMakeLists.txt
+++ b/lib_source/CMakeLists.txt
@@ -20,16 +20,6 @@ if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
 endif()
 
-if (RIBBONUI_BUILD_QWINDOWKIT)
-    set(QWINDOWKIT_BUILD_STATIC ON)
-    set(QWINDOWKIT_BUILD_EXAMPLES OFF)
-    set(QWINDOWKIT_BUILD_QUICK ON)
-    set(QWINDOWKIT_BUILD_WIDGETS OFF)
-    set(QWINDOWKIT_ENABLE_STYLE_AGENT ON)
-    set(QWINDOWKIT_INSTALL OFF)
-    add_subdirectory(3rdparty/qwindowkit)
-endif()
-
 find_package(Qt6 COMPONENTS Core Quick Qml REQUIRED)
 
 set(version_str "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}")