diff --git a/modules/corelib/const.lua b/modules/corelib/const.lua
index ab5c9ce..86191ff 100644
--- a/modules/corelib/const.lua
+++ b/modules/corelib/const.lua
@@ -39,6 +39,8 @@ MouseMidButton = 3
 MouseTouch = 4
 MouseTouch2 = 5 -- multitouch, 2nd finger
 MouseTouch3 = 6 -- multitouch, 3th finger
+MouseButton4 = 7 -- side mouse button 1
+MouseButton5 = 8 -- side mouse button 2
 
 MouseNoWheel = 0
 MouseWheelUp = 1
diff --git a/modules/game_walking/walking.lua b/modules/game_walking/walking.lua
index 88af196..47f9499 100644
--- a/modules/game_walking/walking.lua
+++ b/modules/game_walking/walking.lua
@@ -17,10 +17,11 @@ autoFinishNextServerWalk = 0
 turnKeys = {}
 
 function init()
+  connect(g_game, { onTeleport = onTeleport })
+  
   connect(LocalPlayer, {
     onPositionChange = onPositionChange,
     onWalk = onWalk,
-    onTeleport = onTeleport,
     onWalkFinish = onWalkFinish,
     onCancelWalk = onCancelWalk
   })
@@ -30,10 +31,11 @@ function init()
 end
 
 function terminate()
+  disconnect(g_game, { onTeleport = onTeleport })
+  
   disconnect(LocalPlayer, {
     onPositionChange = onPositionChange,
     onWalk = onWalk,
-    onTeleport = onTeleport,
     onWalkFinish = onWalkFinish
   })
   removeEvent(autoWalkEvent)
diff --git a/modules/gamelib/const.lua b/modules/gamelib/const.lua
index c1c0810..2fc4ce3 100644
--- a/modules/gamelib/const.lua
+++ b/modules/gamelib/const.lua
@@ -210,6 +210,7 @@ GameNewCreatureStacking = 121 -- Ignore MAX_THINGS limit while adding to tile
 GameCreaturesMana = 122 -- get mana from server for creatures other than Player
 GameQuickLootFlags = 123 -- enables quick loot feature for all protocols
 GameDontMergeAnimatedText = 124
+GameCreatureTitle = 125
 
 LastGameFeature = 130
         
diff --git a/otclient_dx.exe b/otclient_dx.exe
index 87aa9bf..5ce6de2 100644
Binary files a/otclient_dx.exe and b/otclient_dx.exe differ
diff --git a/otclient_gl.exe b/otclient_gl.exe
index 846c3e8..e86deaa 100644
Binary files a/otclient_gl.exe and b/otclient_gl.exe differ
diff --git a/otclient_linux b/otclient_linux
index 7fe6230..c933e91 100644
Binary files a/otclient_linux and b/otclient_linux differ
diff --git a/otclient_mac b/otclient_mac
index 0691497..1e24d14 100644
Binary files a/otclient_mac and b/otclient_mac differ
diff --git a/otclientv8.apk b/otclientv8.apk
index 0d2dacd..b6f71cb 100644
Binary files a/otclientv8.apk and b/otclientv8.apk differ