diff --git a/.github/workflows/Test PKGBUILD-git.yml b/.github/workflows/Test PKGBUILD-git.yml
index 619a478..8f61cda 100644
--- a/.github/workflows/Test PKGBUILD-git.yml	
+++ b/.github/workflows/Test PKGBUILD-git.yml	
@@ -2,7 +2,7 @@ name: Test PKGBUILD-git
 
 on:
   push:
-    branch: master
+    branches: master
   pull_request:
     branches: master
 
@@ -42,4 +42,4 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: clrsync-git
-        path: AUR/*.pkg.tar.zst
\ No newline at end of file
+        path: AUR/*.pkg.tar.zst
diff --git a/.gitignore b/.gitignore
index cb1c37e..5359878 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 out
 
 build/
+build-msvc/
 CMakeCache.txt
 CMakeFiles/
 cmake_install.cmake
@@ -34,4 +35,4 @@ result-*
 *.o
 *.a
 *.so
-*.dylib
\ No newline at end of file
+*.dylib
diff --git a/src/core/version.hpp b/src/core/version.hpp
index 88e106a..f031564 100644
--- a/src/core/version.hpp
+++ b/src/core/version.hpp
@@ -6,7 +6,7 @@
 namespace clrsync::core
 {
 
-const std::string GIT_SEMVER = "0.1.6+git.g57c3c55";
+const std::string GIT_SEMVER = "0.1.6+git.g1a1747a";
 
 const std::string version_string();
 } // namespace clrsync::core
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 66ef295..226e79a 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -19,7 +19,11 @@ if(APPLE)
     list(APPEND GUI_SOURCES file_browser_macos.mm)
 endif()
 
-add_executable(clrsync_gui ${GUI_SOURCES})
+if(WIN32)
+    add_executable(clrsync_gui WIN32 ${GUI_SOURCES})
+else()
+    add_executable(clrsync_gui ${GUI_SOURCES})
+endif()
 
 target_include_directories(clrsync_gui PRIVATE 
     ${CMAKE_SOURCE_DIR}/src 
@@ -38,7 +42,9 @@ if(WIN32)
         comdlg32
         shlwapi
     )
-    set_target_properties(clrsync_gui PROPERTIES WIN32_EXECUTABLE TRUE)
+    if (MSVC)
+        target_link_options(clrsync_gui PRIVATE /ENTRY:mainCRTStartup)
+    endif()
 elseif(APPLE)
     target_link_libraries(clrsync_gui PRIVATE
         clrsync_core