diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dc9423d9..e9814c746 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Aseprite
+# Copyright (C) 2018-2020  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 cmake_minimum_required(VERSION 3.4)
@@ -23,13 +24,6 @@ if(NOT CMAKE_BUILD_TYPE)
       FORCE)
 endif()
 
-# Restrict configuration types to the selected build type.
-# Note: This needs to be done before the project command
-set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE INTERNAL "internal")
-
-set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake)
-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake)
-
 # Aseprite project
 project(aseprite C CXX)
 
diff --git a/cmake/c_flag_overrides.cmake b/cmake/c_flag_overrides.cmake
deleted file mode 100644
index a39591965..000000000
--- a/cmake/c_flag_overrides.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-if(MSVC)
-  set(CMAKE_C_FLAGS_DEBUG_INIT            "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
-  set(CMAKE_C_FLAGS_MINSIZEREL_INIT       "/MT /O1 /Ob1 /D NDEBUG")
-  set(CMAKE_C_FLAGS_RELEASE_INIT          "/MT /O2 /Ob2 /D NDEBUG")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT   "/MT /Zi /O2 /Ob1 /D NDEBUG")
-endif()
diff --git a/cmake/cxx_flag_overrides.cmake b/cmake/cxx_flag_overrides.cmake
deleted file mode 100644
index deccbd46f..000000000
--- a/cmake/cxx_flag_overrides.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-if(MSVC)
-  set(CMAKE_CXX_FLAGS_DEBUG_INIT          "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
-  set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT     "/MT /O1 /Ob1 /D NDEBUG")
-  set(CMAKE_CXX_FLAGS_RELEASE_INIT        "/MT /O2 /Ob2 /D NDEBUG")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG")
-endif()
diff --git a/laf b/laf
index 29d275d47..d46f9a106 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit 29d275d47087acb897f3d4791a055963934906a1
+Subproject commit d46f9a10602c96a1de67042200c78a652888b08f