diff --git a/.gitignore b/.gitignore
index 2f548c4c3..cf4810aee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ CMakeFiles
 cmake_install.cmake
 Makefile
 install_manifest.txt
+EmulationStation.exe.manifest
 
 # CPack
 _CPack_Packages
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bfb92f9f..5c69b0d9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,6 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     endif()
     if(WIN32)
         set(CMAKE_CXX_FLAGS "-mwindows ${CMAKE_CXX_FLAGS}")
-#        set(CMAKE_CXX_FLAGS "-static-libstdc++ -static-libgcc ${CMAKE_CXX_FLAGS}")
     endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     message("-- Compiler is MSVC")
@@ -262,7 +261,7 @@ elseif(WIN32)
                 "${PROJECT_SOURCE_DIR}/FreeImage.lib"
                 "${PROJECT_SOURCE_DIR}/glew32.lib"
                 "${PROJECT_SOURCE_DIR}/libcurl-x64.lib"
-                "${PROJECT_SOURCE_DIR}/freetyped.lib"
+                "${PROJECT_SOURCE_DIR}/freetype.lib"
                 "${PROJECT_SOURCE_DIR}/pugixml.lib"
                 "${PROJECT_SOURCE_DIR}/SDL2main.lib"
                 "${PROJECT_SOURCE_DIR}/libvlc.lib"
diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index 7e764491a..e8fee0d91 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -117,8 +117,9 @@ if(WIN32)
     install(TARGETS EmulationStation RUNTIME DESTINATION .)
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
         install(FILES ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll
-                ../freetyped.dll ../pugixml.dll ../libssl-1_1-x64.dll ../libvlc.dll
-                ../libvlccore.dll ../SDL2.dll DESTINATION .)
+                ../freetype.dll ../pugixml.dll ../libssl-1_1-x64.dll ../libvlc.dll
+                ../libvlccore.dll ../SDL2.dll ../MSVCP140.dll ../VCOMP140.DLL ../VCRUNTIME140.dll
+                ../VCRUNTIME140_1.dll DESTINATION .)
     else()
         install(FILES ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll
                 ../libfreetype.dll ../libgcc_s_seh-1.dll ../libpugixml.dll ../libssl-1_1-x64.dll