diff --git a/modules/game_things/things.lua b/modules/game_things/things.lua
index 35c29903c..b41f5f7c9 100644
--- a/modules/game_things/things.lua
+++ b/modules/game_things/things.lua
@@ -25,8 +25,8 @@ function load()
     datPath = resolvepath('/things/' .. filename)
     sprPath = resolvepath('/things/' .. filename)
   else
-    datPath = resolvepath('/things/' .. version .. '/Tibia')
-    sprPath = resolvepath('/things/' .. version .. '/Tibia')
+    datPath = resolvepath('/things/' .. version .. '/Tibia.dat')
+    sprPath = resolvepath('/things/' .. version .. '/Tibia.spr')
   end
 
   local errorMessage = ''
diff --git a/src/framework/luaengine/lbitlib.cpp b/src/framework/luaengine/lbitlib.cpp
index d688aea31..712d69d2d 100644
--- a/src/framework/luaengine/lbitlib.cpp
+++ b/src/framework/luaengine/lbitlib.cpp
@@ -33,8 +33,8 @@
 #define LUA_LIB
 
 extern "C" {
-#include <lua.h>
-#include <lauxlib.h>
+#include <luajit/lua.h>
+#include <luajit/lauxlib.h>
 }
 
 /* ----- adapted from lua-5.2.0 luaconf.h: ----- */
@@ -175,10 +175,10 @@ static lua_Unsigned luaL_checkunsigned (lua_State *L, int arg) {
 #define lbitlib_c
 #define LUA_LIB
 
-#include "lua.h"
+#include "luajit/lua.h"
 
-#include "lauxlib.h"
-#include "lualib.h"
+#include "luajit/lauxlib.h"
+#include "luajit/lualib.h"
 
 
 /* number of bits to consider in a number */
diff --git a/src/framework/luaengine/luainterface.cpp b/src/framework/luaengine/luainterface.cpp
index 0e06a2b02..0b64c1cc1 100644
--- a/src/framework/luaengine/luainterface.cpp
+++ b/src/framework/luaengine/luainterface.cpp
@@ -24,7 +24,7 @@
 #include "luaobject.h"
 
 #include <framework/core/resourcemanager.h>
-#include <lua.hpp>
+#include <luajit/lua.hpp>
 
 #include "lbitlib.h"
 
diff --git a/things/.gitignore b/things/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/things/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/vc14/otclient.vcxproj b/vc14/otclient.vcxproj
index 823fe4d71..020fec9a9 100644
--- a/vc14/otclient.vcxproj
+++ b/vc14/otclient.vcxproj
@@ -22,28 +22,28 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{17A8F78F-1FFB-4128-A3B3-59CC6C19D89A}</ProjectGuid>
     <RootNamespace>otclient</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">