diff --git a/.gitignore b/.gitignore
index 1267eb7..02126a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@
 *.exe
 *.out
 *.app
+*.aps
 
 !Framework/ThirdParty/vulkan/vulkan-1.lib
 
diff --git a/Config/Icon.icns b/Config/Resources/Icon.icns
similarity index 100%
rename from Config/Icon.icns
rename to Config/Resources/Icon.icns
diff --git a/Config/Resources/Icon.ico b/Config/Resources/Icon.ico
new file mode 100644
index 0000000..2b0f64f
Binary files /dev/null and b/Config/Resources/Icon.ico differ
diff --git a/Config/Icon.iconset/icon_128x128.png b/Config/Resources/Icon.iconset/icon_128x128.png
similarity index 100%
rename from Config/Icon.iconset/icon_128x128.png
rename to Config/Resources/Icon.iconset/icon_128x128.png
diff --git a/Config/Icon.iconset/icon_128x128@2x.png b/Config/Resources/Icon.iconset/icon_128x128@2x.png
similarity index 100%
rename from Config/Icon.iconset/icon_128x128@2x.png
rename to Config/Resources/Icon.iconset/icon_128x128@2x.png
diff --git a/Config/Icon.iconset/icon_16x16.png b/Config/Resources/Icon.iconset/icon_16x16.png
similarity index 100%
rename from Config/Icon.iconset/icon_16x16.png
rename to Config/Resources/Icon.iconset/icon_16x16.png
diff --git a/Config/Icon.iconset/icon_16x16@2x.png b/Config/Resources/Icon.iconset/icon_16x16@2x.png
similarity index 100%
rename from Config/Icon.iconset/icon_16x16@2x.png
rename to Config/Resources/Icon.iconset/icon_16x16@2x.png
diff --git a/Config/Icon.iconset/icon_256x256.png b/Config/Resources/Icon.iconset/icon_256x256.png
similarity index 100%
rename from Config/Icon.iconset/icon_256x256.png
rename to Config/Resources/Icon.iconset/icon_256x256.png
diff --git a/Config/Icon.iconset/icon_256x256@2x.png b/Config/Resources/Icon.iconset/icon_256x256@2x.png
similarity index 100%
rename from Config/Icon.iconset/icon_256x256@2x.png
rename to Config/Resources/Icon.iconset/icon_256x256@2x.png
diff --git a/Config/Icon.iconset/icon_32x32.png b/Config/Resources/Icon.iconset/icon_32x32.png
similarity index 100%
rename from Config/Icon.iconset/icon_32x32.png
rename to Config/Resources/Icon.iconset/icon_32x32.png
diff --git a/Config/Icon.iconset/icon_32x32@2x.png b/Config/Resources/Icon.iconset/icon_32x32@2x.png
similarity index 100%
rename from Config/Icon.iconset/icon_32x32@2x.png
rename to Config/Resources/Icon.iconset/icon_32x32@2x.png
diff --git a/Config/Icon.iconset/icon_512x512.png b/Config/Resources/Icon.iconset/icon_512x512.png
similarity index 100%
rename from Config/Icon.iconset/icon_512x512.png
rename to Config/Resources/Icon.iconset/icon_512x512.png
diff --git a/Config/Icon.iconset/icon_512x512@2x.png b/Config/Resources/Icon.iconset/icon_512x512@2x.png
similarity index 100%
rename from Config/Icon.iconset/icon_512x512@2x.png
rename to Config/Resources/Icon.iconset/icon_512x512@2x.png
diff --git a/Config/Info.plist b/Config/Resources/Info.plist
similarity index 87%
rename from Config/Info.plist
rename to Config/Resources/Info.plist
index b27b71b..a536546 100644
--- a/Config/Info.plist
+++ b/Config/Resources/Info.plist
@@ -4,13 +4,13 @@
 <dict>
     <!-- Application Metadata -->
     <key>CFBundleName</key>
-    <string>MyApp</string>
+    <string>UImGuiDemo</string>
 
     <key>CFBundleDisplayName</key>
-    <string>MyApp</string>
+    <string>UntitledImGuiFramework Demo</string>
 
     <key>CFBundleIdentifier</key>
-    <string>com.example.MyApp</string>
+    <string>com.madladsquad.UImGuiDemo</string>
 
     <key>CFBundleVersion</key>
     <string>1.0</string>
@@ -20,7 +20,7 @@
 
     <!-- Executable -->
     <key>CFBundleExecutable</key>
-    <string>Icons</string>
+    <string>UImGuiDemo</string>
 
     <key>CFBundlePackageType</key>
     <string>APPL</string>
diff --git a/Config/Resources/resource.h b/Config/Resources/resource.h
new file mode 100644
index 0000000..d754560
--- /dev/null
+++ b/Config/Resources/resource.h
@@ -0,0 +1,2 @@
+#define IDI_APP_ICON 101
+#define IDS_APP_TITLE 102
diff --git a/Config/Resources/resource.rc b/Config/Resources/resource.rc
new file mode 100644
index 0000000..4704ffb
--- /dev/null
+++ b/Config/Resources/resource.rc
@@ -0,0 +1,3 @@
+#include "resource.h"
+
+IDI_APP_ICON ICON "Icon.ico"
\ No newline at end of file
diff --git a/Framework/cmake/CompileProject.cmake b/Framework/cmake/CompileProject.cmake
index 5873a63..04ba940 100644
--- a/Framework/cmake/CompileProject.cmake
+++ b/Framework/cmake/CompileProject.cmake
@@ -3,7 +3,7 @@ if (BUILD_VARIANT_STATIC)
         if (NOT UIMGUI_SKIP_FRAMEWORK)
             add_library(UntitledImGuiFramework STATIC "${LIBRARY_SOURCES}" "${APP_LIBRARY_SOURCES}")
         endif()
-        add_executable(${APP_TARGET} ${EXECUTABLE_SOURCES})
+        add_executable(${APP_TARGET} ${EXECUTABLE_SOURCES} "Config/Resources/resource.rc")
     elseif (EMSCRIPTEN)
         add_executable(${APP_TARGET} "${LIBRARY_SOURCES}" "${APP_LIBRARY_SOURCES}" ${EXECUTABLE_SOURCES})
     else ()
@@ -22,7 +22,11 @@ else()
         endif ()
         add_library(${APP_LIB_TARGET} SHARED ${APP_LIBRARY_SOURCES})
     endif()
-    add_executable(${APP_TARGET} ${EXECUTABLE_SOURCES})
+    if (WIN32)
+        add_executable(${APP_TARGET} ${EXECUTABLE_SOURCES} "Config/Resources/resource.rc")
+    else()
+        add_executable(${APP_TARGET} ${EXECUTABLE_SOURCES})
+    endif()
 endif()
 
 include(SetupTargetSettings)
diff --git a/Framework/cmake/SetupSources.cmake b/Framework/cmake/SetupSources.cmake
index bad05f9..8e50521 100644
--- a/Framework/cmake/SetupSources.cmake
+++ b/Framework/cmake/SetupSources.cmake
@@ -107,11 +107,7 @@ if (USE_KNOBS_MODULE)
 endif()
 
 if (USE_SPINNER_MODULE)
-    if (WIN32)
-        file(GLOB_RECURSE UGUI_SPINNER_HEAD "${UIMGUI_SRC_PREFIX}/Framework/Modules/Spinners/*.h")
-    else()
-        file(GLOB_RECURSE UGUI_SPINNER_HEAD "${UIMGUI_SRC_PREFIX}/Framework/Modules/Spinners/*.h")
-    endif()
+    file(GLOB_RECURSE UGUI_SPINNER_HEAD "${UIMGUI_SRC_PREFIX}/Framework/Modules/Spinners/*.h")
 endif()
 
 if (USE_TOGGLES_MODULE)
diff --git a/UVKBuildTool b/UVKBuildTool
index 9603f13..74d9258 160000
--- a/UVKBuildTool
+++ b/UVKBuildTool
@@ -1 +1 @@
-Subproject commit 9603f1306dadd386aded5a4643c617b161ce99b4
+Subproject commit 74d9258e71eedde34163a0c8800eb709319494ec
diff --git a/export.sh b/export.sh
index 42b42e2..01e4757 100755
--- a/export.sh
+++ b/export.sh
@@ -96,9 +96,13 @@ cp -r "${real_framework_path}" . || die_
 
 while true; do
   if [ "$macos" = true ]; then
-    cd Config/macOS || break
+    cd Config/Resources || break
     iconutil -c icns Icon.iconset || break
     cd ../../ || break
+  elif [ "$windows" = true ]; then
+    cd Config/Resources || break
+    whick magick && magick Icon.iconset/* Icon.ico
+    cd ../../ || break
   fi
   break
 done