diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
index d41d13c..03b9e42 100644
--- a/.github/workflows/cmake-multi-platform.yml
+++ b/.github/workflows/cmake-multi-platform.yml
@@ -45,7 +45,7 @@ jobs:
             cmake_args: >
               -DSDL2MIXER_VENDORED=ON
               -DSDL2TTF_VENDORED=ON
-              -DCMAKE_TOOLCHAIN_FILE=build_deps/toolchains/mingw-w64-x86_64.cmake
+              -DCMAKE_TOOLCHAIN_FILE=build_deps/toolchains/mingw-w64-i686.cmake
               -GNinja
           - os: macos-latest
             c_compiler: gcc
diff --git a/.gitignore b/.gitignore
index 1447d91..61e6964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,8 @@
 /data.pack
 /.vs/
 /.data.db
-/steamworks_c_wrapper/_build
-/steamworks_c_wrapper/sdk
+/lib/steamworks_c_wrapper/build
+/lib/steamworks_c_wrapper/sdk
 *.swp
 *~
 /steam_appid.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cfe203..ab33fee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,8 @@ set(breakhack_PATCH_VERSION 3)
 set(breakhack_RELEASE_TYPE "")
 
 # Checksums
-set(breakhack_STEAMAPI_DLL_CHECKSUM 0x18dba28)
-set(breakhack_STEAMAPI_SO_CHECKSUM 0x1f5786b)
+set(breakhack_STEAMAPI_DLL_CHECKSUM 0x1a20dd5)
+set(breakhack_STEAMAPI_SO_CHECKSUM 0x19f8c71)
 
 include(build_deps/cmake/FindCCache.cmake)
 include(build_deps/cmake/FindCMocka.cmake)
@@ -23,12 +23,18 @@ configure_file(
 	"${PROJECT_BINARY_DIR}/config.h"
 	)
 
-if (EXISTS "${PROJECT_SOURCE_DIR}/steamworks_c_wrapper/sdk")
-	MESSAGE ( STATUS "Steam SDK located, Steam build enabled")
-	set(STEAM 1)
+set(DISABLE_STEAM_BUILD OFF CACHE BOOL "Disable Steam build")
+
+if (NOT DISABLE_STEAM_BUILD)
+	if (EXISTS "${PROJECT_SOURCE_DIR}/lib/steamworks_c_wrapper/sdk")
+		MESSAGE ( STATUS "Steam SDK located, Steam build enabled")
+		set(STEAM ON)
+	else ()
+		MESSAGE ( STATUS "Steam SDK not found, Steam build disabled")
+	endif()
 else ()
-	MESSAGE ( STATUS "Steam SDK not found, Steam build disabled")
-endif()
+	MESSAGE ( STATUS "Steam build disabled by DISABLE_STEAM_BUILD flag")
+endif ()
 
 if (STEAM)
 	add_subdirectory(lib/steamworks_c_wrapper)
@@ -98,8 +104,7 @@ ENDIF ()
 
 if (STEAM)
 	include_directories(
-	${STEAMWORKS_INCLUDE_DIR}
-	steamworks_c_wrapper/src
+	lib/steamworks_c_wrapper/src
 	)
 endif ()
 
@@ -196,7 +201,7 @@ if (STEAM)
 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSTEAM_BUILD")
 	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DSTEAM_BUILD")
 	set(STEAM_SOURCES
-		src/steam/steamworks_api_wrapper
+		src/steam/steamworks_api_wrapper.c
 		)
 else ()
 	set(STEAM_SOURCES "")
@@ -301,6 +306,7 @@ endif ()
 
 if (STEAM)
 	target_link_libraries(breakhack
+		${STEAMWORKS_LIBRARY}
 		steamworks_c_wrapper
 		)
 endif ()
@@ -382,37 +388,21 @@ endif ()
 SET(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT "Release")
 SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ".")
 if (WIN32)
-	SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
-		${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
-		${CMAKE_SOURCE_DIR}/bin/libFLAC-8.dll
-		${CMAKE_SOURCE_DIR}/bin/libfreetype-6.dll
-		${CMAKE_SOURCE_DIR}/bin/libmodplug-1.dll
-		${CMAKE_SOURCE_DIR}/bin/libmpg123-0.dll
-		${CMAKE_SOURCE_DIR}/bin/libogg-0.dll
-		${CMAKE_SOURCE_DIR}/bin/libpng16-16.dll
-		${CMAKE_SOURCE_DIR}/bin/libvorbis-0.dll
-		${CMAKE_SOURCE_DIR}/bin/libvorbisfile-3.dll
-		${CMAKE_SOURCE_DIR}/bin/SDL2.dll
-		${CMAKE_SOURCE_DIR}/bin/SDL2_image.dll
-		${CMAKE_SOURCE_DIR}/bin/SDL2_mixer.dll
-		${CMAKE_SOURCE_DIR}/bin/SDL2_ttf.dll
-		${CMAKE_SOURCE_DIR}/bin/zlib1.dll
-		)
 	if (STEAM)
 		SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
 			${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
-			steamworks_c_wrapper/sdk/redistributable_bin/steam_api.dll
+			lib/steamworks_c_wrapper/sdk/redistributable_bin/steam_api.dll
 			)
 	endif ()
-else (WIN32)
+else ()
 	if (STEAM)
 		SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
 			${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
-			steamworks_c_wrapper/sdk/redistributable_bin/linux64/libsteam_api.so
+			lib/steamworks_c_wrapper/sdk/redistributable_bin/linux64/libsteam_api.so
 			build_deps/linux/breakhack.run
 			)
 	endif ()
-endif (WIN32)
+endif ()
 include(InstallRequiredSystemLibraries)
 
 INSTALL(TARGETS breakhack
diff --git a/Makefile b/Makefile
index c1377ca..35ff80f 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ lint:
 
 package:
 	@cmake --build build/release --target package
+	@cmake --build build/win-release --target package
 .PHONY: package
 
 setup:
@@ -44,7 +45,7 @@ setup:
 	@cmake -B build/release -DCMAKE_BUILD_TYPE=Release -GNinja
 	@cmake -B build/win-release \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_TOOLCHAIN_FILE=build_deps/toolchains/mingw-w64-x86_64.cmake \
+		-DCMAKE_TOOLCHAIN_FILE=build_deps/toolchains/mingw-w64-i686.cmake \
 		-DSDL2MIXER_VENDORED=ON \
 		-DSDL2TTF_VENDORED=ON \
 		-GNinja
@@ -54,5 +55,5 @@ setup:
 
 teardown:
 	@rm -rf build
-	@rm compile_commands.json
+	@rm -f compile_commands.json
 .PHONY: teardown
diff --git a/bin/SDL2.dll b/bin/SDL2.dll
deleted file mode 100644
index c21f747..0000000
Binary files a/bin/SDL2.dll and /dev/null differ
diff --git a/bin/SDL2_image.dll b/bin/SDL2_image.dll
deleted file mode 100644
index cadd2c5..0000000
Binary files a/bin/SDL2_image.dll and /dev/null differ
diff --git a/bin/SDL2_mixer.dll b/bin/SDL2_mixer.dll
deleted file mode 100644
index 54ebbb1..0000000
Binary files a/bin/SDL2_mixer.dll and /dev/null differ
diff --git a/bin/SDL2_ttf.dll b/bin/SDL2_ttf.dll
deleted file mode 100644
index 2d8929e..0000000
Binary files a/bin/SDL2_ttf.dll and /dev/null differ
diff --git a/bin/libFLAC-8.dll b/bin/libFLAC-8.dll
deleted file mode 100644
index 1c55ad4..0000000
Binary files a/bin/libFLAC-8.dll and /dev/null differ
diff --git a/bin/libfreetype-6.dll b/bin/libfreetype-6.dll
deleted file mode 100644
index 6b19b3c..0000000
Binary files a/bin/libfreetype-6.dll and /dev/null differ
diff --git a/bin/libmodplug-1.dll b/bin/libmodplug-1.dll
deleted file mode 100644
index a2cba0d..0000000
Binary files a/bin/libmodplug-1.dll and /dev/null differ
diff --git a/bin/libmpg123-0.dll b/bin/libmpg123-0.dll
deleted file mode 100644
index ca7de30..0000000
Binary files a/bin/libmpg123-0.dll and /dev/null differ
diff --git a/bin/libogg-0.dll b/bin/libogg-0.dll
deleted file mode 100644
index 3abe6eb..0000000
Binary files a/bin/libogg-0.dll and /dev/null differ
diff --git a/bin/libpng16-16.dll b/bin/libpng16-16.dll
deleted file mode 100644
index d59e67e..0000000
Binary files a/bin/libpng16-16.dll and /dev/null differ
diff --git a/bin/libvorbis-0.dll b/bin/libvorbis-0.dll
deleted file mode 100644
index 4e44ef0..0000000
Binary files a/bin/libvorbis-0.dll and /dev/null differ
diff --git a/bin/libvorbisfile-3.dll b/bin/libvorbisfile-3.dll
deleted file mode 100644
index e757eb6..0000000
Binary files a/bin/libvorbisfile-3.dll and /dev/null differ
diff --git a/bin/zlib1.dll b/bin/zlib1.dll
deleted file mode 100644
index 1aa57ce..0000000
Binary files a/bin/zlib1.dll and /dev/null differ
diff --git a/build_deps/cmake/FindSDL2.cmake b/build_deps/cmake/FindSDL2.cmake
deleted file mode 100644
index e16dcd3..0000000
--- a/build_deps/cmake/FindSDL2.cmake
+++ /dev/null
@@ -1,171 +0,0 @@
-# This module defines
-# SDL2_LIBRARY, the name of the library to link against
-# SDL2_FOUND, if false, do not try to link to SDL2
-# SDL2_INCLUDE_DIR, where to find SDL.h
-#
-# This module responds to the the flag:
-# SDL2_BUILDING_LIBRARY
-# If this is defined, then no SDL2main will be linked in because
-# only applications need main().
-# Otherwise, it is assumed you are building an application and this
-# module will attempt to locate and set the the proper link flags
-# as part of the returned SDL2_LIBRARY variable.
-#
-# Don't forget to include SDLmain.h and SDLmain.m your project for the
-# OS X framework based version. (Other versions link to -lSDL2main which
-# this module will try to find on your behalf.) Also for OS X, this
-# module will automatically add the -framework Cocoa on your behalf.
-#
-#
-# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
-# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
-# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
-# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
-# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
-# as appropriate. These values are used to generate the final SDL2_LIBRARY
-# variable, but when these values are unset, SDL2_LIBRARY does not get created.
-#
-#
-# $SDL2DIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDL2DIR
-# used in building SDL2.
-# l.e.galup  9-20-02
-#
-# Modified by Eric Wing.
-# Added code to assist with automated building by using environmental variables
-# and providing a more controlled/consistent search behavior.
-# Added new modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-# Also corrected the header search path to follow "proper" SDL guidelines.
-# Added a search for SDL2main which is needed by some platforms.
-# Added a search for threads which is needed by some platforms.
-# Added needed compile switches for MinGW.
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# SDL2_LIBRARY to override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# Note that the header path has changed from SDL2/SDL.h to just SDL.h
-# This needed to change because "proper" SDL convention
-# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
-# reasons because not all systems place things in SDL2/ (see FreeBSD).
-
-#=============================================================================
-# Copyright 2003-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(SDL2_ARCH_64 TRUE)
-  set(SDL2_PROCESSOR_ARCH "x64")
-else()
-  set(SDL2_ARCH_64 FALSE)
-  set(SDL2_PROCESSOR_ARCH "x86")
-endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-SET(SDL2_SEARCH_PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-  ${SDL2_PATH}
-)
-
-FIND_PATH(SDL2_INCLUDE_DIR SDL.h
-  HINTS
-  $ENV{SDL2DIR}
-  PATH_SUFFIXES include/SDL2 include
-  PATHS ${SDL2_SEARCH_PATHS} ${SDL2_LIBRARY_TEMP}/../..
-)
-
-FIND_LIBRARY(SDL2_LIBRARY_TEMP
-  NAMES SDL2
-  HINTS
-  $ENV{SDL2DIR}
-  PATH_SUFFIXES lib64 lib lib/${SDL2_PROCESSOR_ARCH}
-  PATHS ${SDL2_SEARCH_PATHS} ${SDL2_INCLUDE_DIR}/../..
-)
-
-IF(NOT SDL2_BUILDING_LIBRARY)
-  IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-    # Non-OS X framework versions expect you to also dynamically link to
-    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
-    # seem to provide SDL2main for compatibility even though they don't
-    # necessarily need it.
-    FIND_LIBRARY(SDL2MAIN_LIBRARY
-      NAMES SDL2main
-      HINTS
-      $ENV{SDL2DIR}
-      PATH_SUFFIXES lib64 lib lib/${SDL2_PROCESSOR_ARCH}
-      PATHS ${SDL2_SEARCH_PATHS}
-    )
-  ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-# SDL2 may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-IF(NOT APPLE)
-  FIND_PACKAGE(Threads)
-ENDIF(NOT APPLE)
-
-# MinGW needs an additional library, mwindows
-# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
-# (Actually on second look, I think it only needs one of the m* libraries.)
-IF(MINGW)
-  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
-ENDIF(MINGW)
-
-IF(SDL2_LIBRARY_TEMP)
-  # For SDL2main
-  IF(NOT SDL2_BUILDING_LIBRARY)
-    IF(SDL2MAIN_LIBRARY)
-      SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
-    ENDIF(SDL2MAIN_LIBRARY)
-  ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-  # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-  # CMake doesn't display the -framework Cocoa string in the UI even
-  # though it actually is there if I modify a pre-used variable.
-  # I think it has something to do with the CACHE STRING.
-  # So I use a temporary variable until the end so I can set the
-  # "real" variable in one-shot.
-  IF(APPLE)
-    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
-  ENDIF(APPLE)
-
-  # For threads, as mentioned Apple doesn't need this.
-  # In fact, there seems to be a problem if I used the Threads package
-  # and try using this line, so I'm just skipping it entirely for OS X.
-  IF(NOT APPLE)
-    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
-  ENDIF(NOT APPLE)
-
-  # For MinGW library
-  IF(MINGW)
-    SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
-  ENDIF(MINGW)
-
-  # Set the final string here so the GUI reflects the final state.
-  SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
-  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
-  SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
-ENDIF(SDL2_LIBRARY_TEMP)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
diff --git a/build_deps/cmake/FindSDL2_image.cmake b/build_deps/cmake/FindSDL2_image.cmake
deleted file mode 100644
index 78704cb..0000000
--- a/build_deps/cmake/FindSDL2_image.cmake
+++ /dev/null
@@ -1,158 +0,0 @@
-# Locate SDL2_image library
-# This module defines
-# SDL2_IMAGE_LIBRARY, the name of the library to link against
-# SDL2_IMAGE_FOUND, if false, do not try to link to SDL2_image
-# SDL2_IMAGE_INCLUDE_DIR, where to find SDL_image.h
-#
-# Additional Note: If you see an empty SDL2_IMAGE_LIBRARY_TEMP in your configuration
-# and no SDL2_IMAGE_LIBRARY, it means CMake did not find your SDL2_Image library
-# (SDL2_image.dll, libsdl2_image.so, SDL2_image.framework, etc).
-# Set SDL2_IMAGE_LIBRARY_TEMP to point to your SDL2 library, and configure again.
-# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
-# as appropriate. These values are used to generate the final SDL2_IMAGE_LIBRARY
-# variable, but when these values are unset, SDL2_IMAGE_LIBRARY does not get created.
-#
-# $SDL2 is an environment variable that would
-# correspond to the ./configure --prefix=$SDL2
-# used in building SDL2.
-# l.e.galup 9-20-02
-#
-# Modified by Eric Wing.
-# Added code to assist with automated building by using environmental variables
-# and providing a more controlled/consistent search behavior.
-# Added new modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-# Also corrected the header search path to follow "proper" SDL2 guidelines.
-# Added a search for SDL2main which is needed by some platforms.
-# Added a search for threads which is needed by some platforms.
-# Added needed compile switches for MinGW.
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# SDL2_IMAGE_LIBRARY to override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# Note that the header path has changed from SDL2/SDL.h to just SDL.h
-# This needed to change because "proper" SDL2 convention
-# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
-# reasons because not all systems place things in SDL2/ (see FreeBSD).
-#
-# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
-# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
-# was not created for redistribution, and exists temporarily pending official
-# SDL2 CMake modules.
-# 
-# Note that on windows this will only search for the 32bit libraries, to search
-# for 64bit change x86/i686-w64 to x64/x86_64-w64
-
-#=============================================================================
-# Copyright 2003-2009 Kitware, Inc.
-#
-# CMake - Cross Platform Makefile Generator
-# Copyright 2000-2014 Kitware, Inc.
-# Copyright 2000-2011 Insight Software Consortium
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-# nor the names of their contributors may be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-FIND_PATH(SDL2_IMAGE_INCLUDE_DIR SDL_image.h
-	HINTS
-	${SDL2}
-	$ENV{SDL2}
-	$ENV{SDL2_IMAGE}
-	PATH_SUFFIXES include/SDL2 include SDL2
-	i686-w64-mingw32/include/SDL2
-	x86_64-w64-mingw32/include/SDL2
-	PATHS
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local/include/SDL2
-	/usr/include/SDL2
-	/sw # Fink
-	/opt/local # DarwinPorts
-	/opt/csw # Blastwave
-	/opt
-)
-
-# Lookup the 64 bit libs on x64
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	FIND_LIBRARY(SDL2_IMAGE_LIBRARY_TEMP
-		NAMES SDL2_image
-		HINTS
-		${SDL2}
-		$ENV{SDL2}
-		$ENV{SDL2_IMAGE}
-		PATH_SUFFIXES lib64 lib
-		lib/x64
-		x86_64-w64-mingw32/lib
-		PATHS
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-	)
-# On 32bit build find the 32bit libs
-ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	FIND_LIBRARY(SDL2_IMAGE_LIBRARY_TEMP
-		NAMES SDL2_image
-		HINTS
-		${SDL2}
-		$ENV{SDL2}
-		$ENV{SDL2_IMAGE}
-		PATH_SUFFIXES lib
-		lib/x86
-		i686-w64-mingw32/lib
-		PATHS
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-	)
-ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-SET(SDL2_IMAGE_FOUND "NO")
-	IF(SDL2_IMAGE_LIBRARY_TEMP)
-	# Set the final string here so the GUI reflects the final state.
-	SET(SDL2_IMAGE_LIBRARY ${SDL2_IMAGE_LIBRARY_TEMP} CACHE STRING "Where the SDL2_image Library can be found")
-	# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
-	SET(SDL2_IMAGE_LIBRARY_TEMP "${SDL2_IMAGE_LIBRARY_TEMP}" CACHE INTERNAL "")
-	SET(SDL2_IMAGE_FOUND "YES")
-ENDIF(SDL2_IMAGE_LIBRARY_TEMP)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_IMAGE REQUIRED_VARS SDL2_IMAGE_LIBRARY SDL2_IMAGE_INCLUDE_DIR)
-
diff --git a/build_deps/cmake/FindSDL2_mixer.cmake b/build_deps/cmake/FindSDL2_mixer.cmake
deleted file mode 100644
index 7c3e14e..0000000
--- a/build_deps/cmake/FindSDL2_mixer.cmake
+++ /dev/null
@@ -1,109 +0,0 @@
-# - Locate SDL_mixer library
-# This module defines:
-#  SDL2_MIXER_LIBRARIES, the name of the library to link against
-#  SDL2_MIXER_INCLUDE_DIRS, where to find the headers
-#  SDL2_MIXER_FOUND, if false, do not try to link against
-#  SDL2_MIXER_VERSION_STRING - human-readable string containing the version of SDL_mixer
-#
-# For backward compatiblity the following variables are also set:
-#  SDLMIXER_LIBRARY (same value as SDL2_MIXER_LIBRARIES)
-#  SDLMIXER_INCLUDE_DIR (same value as SDL2_MIXER_INCLUDE_DIRS)
-#  SDLMIXER_FOUND (same value as SDL2_MIXER_FOUND)
-#
-# $SDLDIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDLDIR
-# used in building SDL.
-#
-# Created by Eric Wing. This was influenced by the FindSDL.cmake
-# module, but with modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-
-#=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
-# Copyright 2012 Benjamin Eikel
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(SDL2_ARCH_64 TRUE)
-  set(SDL2_PROCESSOR_ARCH "x64")
-else()
-  set(SDL2_ARCH_64 FALSE)
-  set(SDL2_PROCESSOR_ARCH "x86")
-endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-SET(SDL2_SEARCH_PATHS
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local
-	/usr
-	/sw # Fink
-	/opt/local # DarwinPorts
-	/opt/csw # Blastwave
-	/opt
-)
-
-if(NOT SDL2_MIXER_INCLUDE_DIR AND SDL2MIXER_INCLUDE_DIR)
-  set(SDL2_MIXER_INCLUDE_DIR ${SDL2MIXER_INCLUDE_DIR} CACHE PATH "directory cache
-entry initialized from old variable name")
-endif()
-find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
-  HINTS
-    ENV SDL2MIXERDIR
-    ENV SDL2DIR
-  PATH_SUFFIXES include include/SDL2
-  PATHS ${SDL2_SEARCH_PATHS}
-)
-
-if(NOT SDL2_MIXER_LIBRARY AND SDL2MIXER_LIBRARY)
-  set(SDL2_MIXER_LIBRARY ${SDL2MIXER_LIBRARY} CACHE FILEPATH "file cache entry
-initialized from old variable name")
-endif()
-find_library(SDL2_MIXER_LIBRARY
-  NAMES SDL2_mixer
-  HINTS
-    ENV SDL2MIXERDIR
-    ENV SDL2DIR
-  PATH_SUFFIXES lib64 lib lib/${SDL2_PROCESSOR_ARCH}
-  PATHS ${SDL2_SEARCH_PATHS}
-)
-
-if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")
-  file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+[0-9]+$")
-  string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MAJOR "${SDL2_MIXER_VERSION_MAJOR_LINE}")
-  string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MINOR "${SDL2_MIXER_VERSION_MINOR_LINE}")
-  string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_PATCH "${SDL2_MIXER_VERSION_PATCH_LINE}")
-  set(SDL2_MIXER_VERSION_STRING ${SDL2_MIXER_VERSION_MAJOR}.${SDL2_MIXER_VERSION_MINOR}.${SDL2_MIXER_VERSION_PATCH})
-  unset(SDL2_MIXER_VERSION_MAJOR_LINE)
-  unset(SDL2_MIXER_VERSION_MINOR_LINE)
-  unset(SDL2_MIXER_VERSION_PATCH_LINE)
-  unset(SDL2_MIXER_VERSION_MAJOR)
-  unset(SDL2_MIXER_VERSION_MINOR)
-  unset(SDL2_MIXER_VERSION_PATCH)
-endif()
-
-set(SDL2_MIXER_LIBRARIES ${SDL2_MIXER_LIBRARY})
-set(SDL2_MIXER_INCLUDE_DIRS ${SDL2_MIXER_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_mixer
-                                  REQUIRED_VARS SDL2_MIXER_LIBRARIES SDL2_MIXER_INCLUDE_DIRS
-                                  VERSION_VAR SDL2_MIXER_VERSION_STRING)
-
-# for backward compatiblity
-set(SDL2MIXER_LIBRARY ${SDL2_MIXER_LIBRARIES})
-set(SDL2MIXER_INCLUDE_DIR ${SDL2_MIXER_INCLUDE_DIRS})
-set(SDL2MIXER_FOUND ${SDL2_MIXER_FOUND})
-
-mark_as_advanced(SDL2_MIXER_LIBRARY SDL2_MIXER_INCLUDE_DIR)
diff --git a/build_deps/cmake/FindSDL2_ttf.cmake b/build_deps/cmake/FindSDL2_ttf.cmake
deleted file mode 100644
index d664480..0000000
--- a/build_deps/cmake/FindSDL2_ttf.cmake
+++ /dev/null
@@ -1,92 +0,0 @@
-# - Locate SDL2_ttf library (modified from Cmake's FindSDL_ttf.cmake)
-# This module defines:
-#  SDL2_TTF_LIBRARIES, the name of the library to link against
-#  SDL2_TTF_INCLUDE_DIRS, where to find the headers
-#  SDL2_TTF_FOUND, if false, do not try to link against
-#  SDL2_TTF_VERSION_STRING - human-readable string containing the version of SDL2_ttf
-#
-# For backward compatiblity the following variables are also set:
-#  SDL2TTF_LIBRARY (same value as SDL2_TTF_LIBRARIES)
-#  SDL2TTF_INCLUDE_DIR (same value as SDL2_TTF_INCLUDE_DIRS)
-#  SDL2TTF_FOUND (same value as SDL2_TTF_FOUND)
-#
-# $SDLDIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDLDIR
-# used in building SDL.
-#
-#=============================================================================
-# Copyright 2000-2014 Kitware, Inc.
-# Copyright 2000-2011 Insight Software Consortium
-# Copyright 2014 Justin Jacobs
-# All rights reserved.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(SDL2_ARCH_64 TRUE)
-  set(SDL2_PROCESSOR_ARCH "x64")
-else()
-  set(SDL2_ARCH_64 FALSE)
-  set(SDL2_PROCESSOR_ARCH "x86")
-endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-if(NOT SDL2_TTF_INCLUDE_DIR AND SDL2TTF_INCLUDE_DIR)
-  set(SDL2_TTF_INCLUDE_DIR ${SDL2TTF_INCLUDE_DIR} CACHE PATH "directory cache
-entry initialized from old variable name")
-endif()
-find_path(SDL2_TTF_INCLUDE_DIR SDL_ttf.h
-  HINTS
-    ENV SDLTTFDIR
-    ENV SDLDIR
-  PATH_SUFFIXES include/SDL2 include
-)
-
-if(NOT SDL2_TTF_LIBRARY AND SDL2TTF_LIBRARY)
-  set(SDL2_TTF_LIBRARY ${SDLTTF_LIBRARY} CACHE FILEPATH "file cache entry
-initialized from old variable name")
-endif()
-find_library(SDL2_TTF_LIBRARY
-  NAMES SDL2_ttf
-  HINTS
-    ENV SDLTTFDIR
-    ENV SDLDIR
-  PATH_SUFFIXES lib lib/${SDL2_PROCESSOR_ARCH}
-)
-
-if(SDL2_TTF_INCLUDE_DIR AND EXISTS "${SDL2_TTF_INCLUDE_DIR}/SDL_ttf.h")
-  file(STRINGS "${SDL2_TTF_INCLUDE_DIR}/SDL_ttf.h" SDL2_TTF_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_TTF_MAJOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL2_TTF_INCLUDE_DIR}/SDL_ttf.h" SDL2_TTF_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_TTF_MINOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL2_TTF_INCLUDE_DIR}/SDL_ttf.h" SDL2_TTF_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_TTF_PATCHLEVEL[ \t]+[0-9]+$")
-  string(REGEX REPLACE "^#define[ \t]+SDL_TTF_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_TTF_VERSION_MAJOR "${SDL2_TTF_VERSION_MAJOR_LINE}")
-  string(REGEX REPLACE "^#define[ \t]+SDL_TTF_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_TTF_VERSION_MINOR "${SDL2_TTF_VERSION_MINOR_LINE}")
-  string(REGEX REPLACE "^#define[ \t]+SDL_TTF_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_TTF_VERSION_PATCH "${SDL2_TTF_VERSION_PATCH_LINE}")
-  set(SDL2_TTF_VERSION_STRING ${SDL2_TTF_VERSION_MAJOR}.${SDL2_TTF_VERSION_MINOR}.${SDL2_TTF_VERSION_PATCH})
-  unset(SDL2_TTF_VERSION_MAJOR_LINE)
-  unset(SDL2_TTF_VERSION_MINOR_LINE)
-  unset(SDL2_TTF_VERSION_PATCH_LINE)
-  unset(SDL2_TTF_VERSION_MAJOR)
-  unset(SDL2_TTF_VERSION_MINOR)
-  unset(SDL2_TTF_VERSION_PATCH)
-endif()
-
-set(SDL2_TTF_LIBRARIES ${SDL2_TTF_LIBRARY})
-set(SDL2_TTF_INCLUDE_DIRS ${SDL2_TTF_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_ttf
-                                  REQUIRED_VARS SDL2_TTF_LIBRARIES SDL2_TTF_INCLUDE_DIRS
-                                  VERSION_VAR SDL2_TTF_VERSION_STRING)
-
-# for backward compatiblity
-set(SDL2TTF_LIBRARY ${SDL2_TTF_LIBRARIES})
-set(SDL2TTF_INCLUDE_DIR ${SDL2_TTF_INCLUDE_DIRS})
-set(SDL2TTF_FOUND ${SDL2_TTF_FOUND})
-
-mark_as_advanced(SDL2_TTF_LIBRARY SDL2_TTF_INCLUDE_DIR)
diff --git a/build_deps/toolchains/mingw-w64-i686.cmake b/build_deps/toolchains/mingw-w64-i686.cmake
new file mode 100644
index 0000000..3baa1d2
--- /dev/null
+++ b/build_deps/toolchains/mingw-w64-i686.cmake
@@ -0,0 +1,16 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(TOOLCHAIN_PREFIX i686-w64-mingw32)
+
+# cross compilers to use for C, C++ and Fortran
+set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
+set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
+set(CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
+set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
+
+# target environment on the build host system
+set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
+
+# modify default behavior of FIND_XXX() commands
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
diff --git a/build_deps/toolchains/mingw-w64-x86_64.cmake b/build_deps/toolchains/mingw-w64-x86_64.cmake
index 2f22e13..2e9a6b1 100644
--- a/build_deps/toolchains/mingw-w64-x86_64.cmake
+++ b/build_deps/toolchains/mingw-w64-x86_64.cmake
@@ -11,6 +11,6 @@ set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
 set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
 
 # modify default behavior of FIND_XXX() commands
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
diff --git a/lib/steamworks_c_wrapper/CMakeLists.txt b/lib/steamworks_c_wrapper/CMakeLists.txt
index df04e29..100f92c 100644
--- a/lib/steamworks_c_wrapper/CMakeLists.txt
+++ b/lib/steamworks_c_wrapper/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6)
-project(steamworks_c_wrapper)
+project(steamworks_c_wrapper CXX)
 
 if (NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release)
@@ -23,16 +23,21 @@ else()
 	#Linux
 endif ()
 
-include_directories(${STEAMWORKS_INCLUDE_DIR})
 
 add_library(steamworks_c_wrapper STATIC
-	src/steamworks_c_wrapper
-	src/CallbackHandler
+	src/steamworks_c_wrapper.cpp
+	src/CallbackHandler.cpp
 	)
+target_include_directories(steamworks_c_wrapper PRIVATE
+	${STEAMWORKS_INCLUDE_DIR})
 
 target_link_libraries(steamworks_c_wrapper ${STEAMWORKS_LIBRARY})
-if (NOT WIN32)
-	target_link_libraries(steamworks_c_wrapper -lstdc++)
+if (NOT MSVC)
+	if (MINGW)
+		target_link_libraries(steamworks_c_wrapper -static -lstdc++)
+	else ()
+		target_link_libraries(steamworks_c_wrapper -lstdc++)
+	endif ()
 endif()
 
 IF ( MSVC )
diff --git a/lib/steamworks_c_wrapper/cmake/FindSTEAMWORKS.cmake b/lib/steamworks_c_wrapper/cmake/FindSTEAMWORKS.cmake
index 87b6fd3..9211581 100644
--- a/lib/steamworks_c_wrapper/cmake/FindSTEAMWORKS.cmake
+++ b/lib/steamworks_c_wrapper/cmake/FindSTEAMWORKS.cmake
@@ -12,21 +12,13 @@ find_path(STEAMWORKS_INCLUDE_DIR
 		${PROJECT_SOURCE_DIR}/sdk/public/steam/
 )
 
-if (WIN32)
-	find_library(STEAMWORKS_LIBRARY
-		NAMES
+find_library(STEAMWORKS_LIBRARY
+	NAMES
 		steam_api
-		PATHS
+	PATHS
 		${PROJECT_SOURCE_DIR}/sdk/redistributable_bin/
-		)
-else()
-	find_library(STEAMWORKS_LIBRARY
-		NAMES
-		steam_api
-		PATHS
 		${PROJECT_SOURCE_DIR}/sdk/redistributable_bin/linux64/
-		)
-endif()
+)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(STEAMWORKS DEFAULT_MSG STEAMWORKS_INCLUDE_DIR STEAMWORKS_LIBRARY)
diff --git a/src/linkedlist.c b/src/linkedlist.c
index e889694..a11a1c1 100644
--- a/src/linkedlist.c
+++ b/src/linkedlist.c
@@ -109,7 +109,8 @@ void* linkedlist_get(LinkedList **head, unsigned int index)
 	return linkedlist_get(&(*head)->next, --index);
 }
 
-void linkedlist_each(const LinkedList **head, void (*fun)(void*))
+/* cppcheck-suppress constParameter */
+void linkedlist_each(LinkedList **head, void (*fun)(void*))
 {
 	const LinkedList *next = *head;
 
diff --git a/src/linkedlist.h b/src/linkedlist.h
index f52741a..3496bd1 100644
--- a/src/linkedlist.h
+++ b/src/linkedlist.h
@@ -37,7 +37,7 @@ void* linkedlist_poplast(LinkedList **head);
 
 void* linkedlist_get(LinkedList **head, unsigned int index);
 
-void linkedlist_each(const LinkedList **head, void (*fun)(void*));
+void linkedlist_each(LinkedList **head, void (*fun)(void*));
 
 void linkedlist_destroy(LinkedList **head);
 
diff --git a/src/menu.c b/src/menu.c
index 73ea463..fe13dd0 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -104,19 +104,19 @@ menu_create_text_menu(Menu **menu, TEXT_MENU_ITEM *menu_items, unsigned int size
 Menu *
 menu_create_character_selector(void (*onCharacterSelect)(const char *), Camera *cam)
 {
-	static const char *spriteSheets[] = {
+	static char * const spriteSheets[] = {
 		"Commissions/Warrior.png",
 		"Commissions/Rogue.png",
 		"Commissions/Mage.png"
 	};
 
-	static const char *callbackData[] = {
+	static char * const callbackData[] = {
 		"warrior",
 		"rogue",
 		"mage"
 	};
 
-	static const char *descriptions[] = {
+	static char * const descriptions[] = {
 		"Play as the warrior",
 		"Play as the rogue",
 		"Play as the mage"