diff --git a/CMakeLists.txt b/CMakeLists.txt
index e45a6a4f8..a29eae841 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake_modules)
 
 # enable Release mode but only if it was not set
 if (NOT CMAKE_BUILD_TYPE)
-        set(CMAKE_BUILD_TYPE RelWithDebInfo)
+		set(CMAKE_BUILD_TYPE RelWithDebInfo)
 endif()
 
 # VCMI version
@@ -61,7 +61,7 @@ if (WIN32)
 
 	include(CheckLibraryExists)
 	check_library_exists(iconv libiconv_open "" ICONV_LIB_FOUND)
-    check_library_exists(iconv iconv_open "" ICONV_FOUND)
+	check_library_exists(iconv iconv_open "" ICONV_FOUND)
 	if(ICONV_LIB_FOUND OR ICONV_FOUND)
 		set(SYSTEM_LIBS ${SYSTEM_LIBS} iconv)
 	endif()
@@ -76,7 +76,7 @@ endif()
 if(NOT WIN32)
 	INCLUDE(CheckLibraryExists)
 
-    #check if some platform-specific libraries are needed for linking
+	#check if some platform-specific libraries are needed for linking
 	CHECK_LIBRARY_EXISTS(rt shm_open "" HAVE_RT_LIB)
 	if(HAVE_RT_LIB)
 		set(SYSTEM_LIBS ${SYSTEM_LIBS} rt)
@@ -121,7 +121,7 @@ endif()
 
 if(ENABLE_TEST)
 	# find_package overwrites BOOST_* variables which are already set, so all components have to be included again
-    find_package(Boost 1.48.0 COMPONENTS program_options filesystem system thread locale unit_test_framework REQUIRED)
+	find_package(Boost 1.48.0 COMPONENTS program_options filesystem system thread locale unit_test_framework REQUIRED)
 endif()
 
 if(NOT WIN32)
@@ -157,7 +157,7 @@ else()
 	include(GNUInstallDirs)
 
 	if (NOT BIN_DIR)
-        set(BIN_DIR "bin" CACHE STRING "Where to install binaries")
+		set(BIN_DIR "bin" CACHE STRING "Where to install binaries")
 	endif()
 	if (NOT LIB_DIR)
 		set(LIB_DIR "${CMAKE_INSTALL_LIBDIR}/vcmi" CACHE STRING "Where to install main library")
@@ -186,7 +186,7 @@ SET(PCH_PROPERTIES
 )
 
 if (ENABLE_ERM)
-        add_subdirectory(scripting/erm)
+		add_subdirectory(scripting/erm)
 endif()
 add_subdirectory(lib)
 add_subdirectory(client)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b1cb9d368..785095a27 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -7,96 +7,96 @@ include_directories(${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${FFMPEG_INCLUDE_D
 
 set(client_SRCS
 		StdInc.cpp
-        ../CCallback.cpp
+		../CCallback.cpp
 
 		battle/CBattleInterface.cpp
-        battle/CBattleAnimations.cpp
-        battle/CBattleInterfaceClasses.cpp
-        battle/CCreatureAnimation.cpp
+		battle/CBattleAnimations.cpp
+		battle/CBattleInterfaceClasses.cpp
+		battle/CCreatureAnimation.cpp
 
-        gui/CGuiHandler.cpp
-        gui/CIntObject.cpp
-        gui/CIntObjectClasses.cpp
-        gui/Fonts.cpp
-        gui/Geometries.cpp
-        gui/CCursorHandler.cpp
-        gui/SDL_Extensions.cpp
+		gui/CGuiHandler.cpp
+		gui/CIntObject.cpp
+		gui/CIntObjectClasses.cpp
+		gui/Fonts.cpp
+		gui/Geometries.cpp
+		gui/CCursorHandler.cpp
+		gui/SDL_Extensions.cpp
 
 		CPreGame.cpp
 		Client.cpp
 		CPlayerInterface.cpp
 		CMT.cpp
 		GUIClasses.cpp
-        AdventureMapClasses.cpp
-        CAdvmapInterface.cpp
-        CAnimation.cpp
-        CBitmapHandler.cpp
-        CCastleInterface.cpp
-        CCreatureWindow.cpp
-        CDefHandler.cpp
-        CGameInfo.cpp
-        CHeroWindow.cpp
-        CKingdomInterface.cpp
-        CMessage.cpp
-        CMusicHandler.cpp
-        CSpellWindow.cpp
-        CVideoHandler.cpp
-        CQuestLog.cpp
-        Graphics.cpp
-        mapHandler.cpp
-        NetPacksClient.cpp
+		AdventureMapClasses.cpp
+		CAdvmapInterface.cpp
+		CAnimation.cpp
+		CBitmapHandler.cpp
+		CCastleInterface.cpp
+		CCreatureWindow.cpp
+		CDefHandler.cpp
+		CGameInfo.cpp
+		CHeroWindow.cpp
+		CKingdomInterface.cpp
+		CMessage.cpp
+		CMusicHandler.cpp
+		CSpellWindow.cpp
+		CVideoHandler.cpp
+		CQuestLog.cpp
+		Graphics.cpp
+		mapHandler.cpp
+		NetPacksClient.cpp
 )
 
 if(APPLE)
-    # OS X specific includes
-    include_directories(${SPARKLE_INCLUDE_DIR})
+	# OS X specific includes
+	include_directories(${SPARKLE_INCLUDE_DIR})
 
-    # OS X specific source files
-    set(client_SRCS ${client_SRCS} SDLMain.m OSX.mm Info.plist vcmi.icns ../osx/vcmi_dsa_public.pem)
+	# OS X specific source files
+	set(client_SRCS ${client_SRCS} SDLMain.m OSX.mm Info.plist vcmi.icns ../osx/vcmi_dsa_public.pem)
 	add_executable(vcmiclient MACOSX_BUNDLE ${client_SRCS} ${client_HEADERS})
 
-    # OS X specific libraries
-    target_link_libraries(vcmiclient ${SPARKLE_FRAMEWORK})
+	# OS X specific libraries
+	target_link_libraries(vcmiclient ${SPARKLE_FRAMEWORK})
 
-    # Because server and AI libs would be copies to bundle they need to be built before client
-    add_dependencies(vcmiclient vcmiserver VCAI EmptyAI StupidAI BattleAI minizip)
+	# Because server and AI libs would be copies to bundle they need to be built before client
+	add_dependencies(vcmiclient vcmiserver VCAI EmptyAI StupidAI BattleAI minizip)
 
-    # Custom Info.plist
-    set_target_properties(vcmiclient PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+	# Custom Info.plist
+	set_target_properties(vcmiclient PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 
-    # Copy icon file and public key for Sparkle
-    set_source_files_properties(vcmi.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-    set_source_files_properties(../osx/vcmi_dsa_public.pem PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+	# Copy icon file and public key for Sparkle
+	set_source_files_properties(vcmi.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+	set_source_files_properties(../osx/vcmi_dsa_public.pem PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
-    set_target_properties(vcmiclient PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks @executable_path/")
+	set_target_properties(vcmiclient PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks @executable_path/")
 
-    # Copy server executable, libs and game data to bundle
-    set(BUNDLE_PATH ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/vcmiclient.app/Contents)
-    set(MakeVCMIBundle
-        # Copy all needed binaries
-        mkdir -p ${BUNDLE_PATH}/MacOS/AI &&
-        cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/vcmiserver ${BUNDLE_PATH}/MacOS/vcmiserver &&
-        cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libvcmi.dylib ${BUNDLE_PATH}/MacOS/libvcmi.dylib &&
-        cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libminizip.dylib ${BUNDLE_PATH}/MacOS/libminizip.dylib &&
-        cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libVCAI.dylib ${BUNDLE_PATH}/MacOS/AI/libVCAI.dylib &&
-        cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libStupidAI.dylib ${BUNDLE_PATH}/MacOS/AI/libStupidAI.dylib &&
-        cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libEmptyAI.dylib ${BUNDLE_PATH}/MacOS/AI/libEmptyAI.dylib &&
-        cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libBattleAI.dylib ${BUNDLE_PATH}/MacOS/AI/libBattleAI.dylib &&
-        cp -r ${CMAKE_HOME_DIRECTORY}/osx/vcmibuilder.app ${BUNDLE_PATH}/MacOS/vcmibuilder.app &&
+	# Copy server executable, libs and game data to bundle
+	set(BUNDLE_PATH ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/vcmiclient.app/Contents)
+	set(MakeVCMIBundle
+		# Copy all needed binaries
+		mkdir -p ${BUNDLE_PATH}/MacOS/AI &&
+		cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/vcmiserver ${BUNDLE_PATH}/MacOS/vcmiserver &&
+		cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libvcmi.dylib ${BUNDLE_PATH}/MacOS/libvcmi.dylib &&
+		cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libminizip.dylib ${BUNDLE_PATH}/MacOS/libminizip.dylib &&
+		cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libVCAI.dylib ${BUNDLE_PATH}/MacOS/AI/libVCAI.dylib &&
+		cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libStupidAI.dylib ${BUNDLE_PATH}/MacOS/AI/libStupidAI.dylib &&
+		cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libEmptyAI.dylib ${BUNDLE_PATH}/MacOS/AI/libEmptyAI.dylib &&
+		cp ${CMAKE_HOME_DIRECTORY}/bin/$(CONFIGURATION)/libBattleAI.dylib ${BUNDLE_PATH}/MacOS/AI/libBattleAI.dylib &&
+		cp -r ${CMAKE_HOME_DIRECTORY}/osx/vcmibuilder.app ${BUNDLE_PATH}/MacOS/vcmibuilder.app &&
 
-        # Copy frameworks
-        cp -r ${CMAKE_HOME_DIRECTORY}/${CMAKE_FRAMEWORK_PATH} ${BUNDLE_PATH}/Frameworks/ &&
+		# Copy frameworks
+		cp -r ${CMAKE_HOME_DIRECTORY}/${CMAKE_FRAMEWORK_PATH} ${BUNDLE_PATH}/Frameworks/ &&
 
-        # Copy vcmi data
-        mkdir -p ${BUNDLE_PATH}/Data &&
-        mkdir -p ${BUNDLE_PATH}/Data/Mods &&
-        mkdir -p ${BUNDLE_PATH}/Data/launcher &&
-        cp -r ${CMAKE_HOME_DIRECTORY}/config/ ${BUNDLE_PATH}/Data/config/ &&
-        cp -r ${CMAKE_HOME_DIRECTORY}/Mods/vcmi/ ${BUNDLE_PATH}/Data/Mods/vcmi/ &&
-        cp -r ${CMAKE_HOME_DIRECTORY}/Mods/WoG/ ${BUNDLE_PATH}/Data/Mods/WoG/ &&
-        cp -r ${CMAKE_HOME_DIRECTORY}/launcher/icons/ ${BUNDLE_PATH}/Data/launcher/icons/)
-        
-    add_custom_command(TARGET vcmiclient POST_BUILD COMMAND ${MakeVCMIBundle})
+		# Copy vcmi data
+		mkdir -p ${BUNDLE_PATH}/Data &&
+		mkdir -p ${BUNDLE_PATH}/Data/Mods &&
+		mkdir -p ${BUNDLE_PATH}/Data/launcher &&
+		cp -r ${CMAKE_HOME_DIRECTORY}/config/ ${BUNDLE_PATH}/Data/config/ &&
+		cp -r ${CMAKE_HOME_DIRECTORY}/Mods/vcmi/ ${BUNDLE_PATH}/Data/Mods/vcmi/ &&
+		cp -r ${CMAKE_HOME_DIRECTORY}/Mods/WoG/ ${BUNDLE_PATH}/Data/Mods/WoG/ &&
+		cp -r ${CMAKE_HOME_DIRECTORY}/launcher/icons/ ${BUNDLE_PATH}/Data/launcher/icons/)
+		
+	add_custom_command(TARGET vcmiclient POST_BUILD COMMAND ${MakeVCMIBundle})
 else()
 	add_executable(vcmiclient ${client_SRCS})
 endif()
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 2c5123cb8..9bc5ca2d8 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -66,7 +66,7 @@ target_link_libraries(vcmilauncher vcmi ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIB
 #cotire(vcmilauncher)
 
 if (NOT APPLE) # Already inside bundle
-    install(TARGETS vcmilauncher DESTINATION ${BIN_DIR})
+	install(TARGETS vcmilauncher DESTINATION ${BIN_DIR})
 	# copy whole directory but .svn control files
 	install(DIRECTORY icons DESTINATION ${DATA_DIR}/launcher PATTERN ".svn" EXCLUDE)
 endif()
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2bb5890bd..e733f2132 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -95,7 +95,7 @@ set(lib_SRCS
 		registerTypes/TypesClientPacks2.cpp
 		registerTypes/TypesMapObjects1.cpp
 		registerTypes/TypesMapObjects2.cpp
-                registerTypes/TypesMapObjects3.cpp
+				registerTypes/TypesMapObjects3.cpp
 		registerTypes/TypesPregamePacks.cpp
 		registerTypes/TypesServerPacks.cpp
 )
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index db44bca27..44d0c1fda 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -6,10 +6,10 @@ include_directories(${Boost_INCLUDE_DIRS})
 
 set(server_SRCS
 		StdInc.cpp
-        CGameHandler.cpp
-        CVCMIServer.cpp
-        CQuery.cpp
-        NetPacksServer.cpp
+		CGameHandler.cpp
+		CVCMIServer.cpp
+		CQuery.cpp
+		NetPacksServer.cpp
 )
 
 add_executable(vcmiserver ${server_SRCS})
@@ -25,6 +25,6 @@ set_target_properties(vcmiserver PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PA
 cotire(vcmiserver)
 
 if (NOT APPLE) # Already inside vcmiclient bundle
-    install(TARGETS vcmiserver DESTINATION ${BIN_DIR})
+	install(TARGETS vcmiserver DESTINATION ${BIN_DIR})
 endif()