diff --git a/altdrag.c b/altdrag.c
index 342649a8..43843ce2 100644
--- a/altdrag.c
+++ b/altdrag.c
@@ -11,11 +11,6 @@
 #define _WIN32_WINNT 0x0400
 #include <windows.h>
 
-// App
-#define APP_NAME       L"AltDrag"
-#define APP_NAMEA      "AltDrag"
-#define APP_VERSION    "1.45"
-
 // Messages
 #define SWM_TOGGLE     (WM_APP+1)
 #define SWM_HIDE       (WM_APP+2)
@@ -31,11 +26,6 @@
 HINSTANCE g_hinst = NULL;
 HWND g_hwnd = NULL;
 UINT WM_TASKBARCREATED = 0;
-UINT WM_UPDATESETTINGS = 0;
-UINT WM_ADDTRAY = 0;
-UINT WM_HIDETRAY = 0;
-UINT WM_OPENCONFIG = 0;
-UINT WM_CLOSECONFIG = 0;
 wchar_t inipath[MAX_PATH];
 
 // Cool stuff
@@ -167,11 +157,12 @@ void ShowSClickMenu(HWND hwnd, LPARAM param)
 /////////////////////////////////////////////////////////////////////////////
 LRESULT CALLBACK WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    if (msg == WM_TRAY) {
+    if (!msg) {
+        // In case some messages are not registered.
+    } else if (msg == WM_TRAY) {
         if (lParam == WM_LBUTTONDOWN || lParam == WM_LBUTTONDBLCLK) {
             ToggleState();
-            if (lParam == WM_LBUTTONDBLCLK
-                && !(GetAsyncKeyState(VK_SHIFT) & 0x8000)) {
+            if (lParam == WM_LBUTTONDBLCLK) {
                 SendMessage(hwnd, WM_OPENCONFIG, 0, 0);
             }
         } else if (lParam == WM_MBUTTONDOWN) {
@@ -368,7 +359,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, char *szCmdLine, in
 }
 /////////////////////////////////////////////////////////////////////////////
 // use -nostdlib and -e_unfuckMain@0 to use this main
-void WINAPI unfuckWinMain(void)
+void WINAPI noreturn unfuckWinMain(void)
 {
     HINSTANCE hInst;
     HINSTANCE hPrevInstance = NULL;
diff --git a/altdrag.rc b/altdrag.rc
index 85f8055f..3cd4e986 100644
--- a/altdrag.rc
+++ b/altdrag.rc
@@ -8,8 +8,8 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "AltDrag.exe.manifest"
 
 #define VS_VERSION_INFO 1
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1,4,5,0
-  PRODUCTVERSION 1,4,5,0
+  FILEVERSION 1,4,6,0
+  PRODUCTVERSION 1,4,6,0
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0x0L
   FILEOS 0x40004L
@@ -21,7 +21,7 @@ BEGIN
     BLOCK "040904b0"
     BEGIN
       VALUE "FileDescription", "AltDrag"
-      VALUE "FileVersion", "1.45"
+      VALUE "FileVersion", "1.46"
       VALUE "InternalName", "altdrag"
       VALUE "OriginalFilename", "AltDrag.exe"
       VALUE "CompanyName", "Gillibert Software"
diff --git a/hooks.c b/hooks.c
index ad6e40c2..923434f4 100644
--- a/hooks.c
+++ b/hooks.c
@@ -15,8 +15,6 @@
 #include <endpointvolume.h>
 #include "unfuck.h"
 #include "hooks.h"
-// App
-#define APP_NAME L"AltDrag"
 
 // Boring stuff
 #define REHOOK_TIMER    WM_APP+1
@@ -2629,6 +2627,7 @@ static int WheelActions(POINT pt, PMSLLHOOKSTRUCT msg, WPARAM wParam)
     else if (action == AC_MAXIMIZE)     ActionMaxRestMin(&pt, hwnd, delta);
     else if (action == AC_ROLL)         RollWindow(hwnd, delta);
     else if (action == AC_HSCROLL)      ret = ScrollPointedWindow(pt, -delta, WM_MOUSEHWHEEL);
+    else                                ret = 0; // No action
 
     // ret is 0: next hook or 1: block mousedown and AltUp.
     state.blockaltup = ret; // block or not;
diff --git a/hooks.h b/hooks.h
index a9a73444..1e9fcd5e 100644
--- a/hooks.h
+++ b/hooks.h
@@ -1,14 +1,27 @@
 #ifndef ALTDRAG_RPC_H
 #define ALTDRAG_RPC_H
 
-#define WM_TRAY         (WM_USER+1)
-#define WM_SCLICK       (WM_USER+2)
-#define WM_UPDCFRACTION (WM_USER+3)
-#define WM_UPDATETRAY   (WM_USER+4)
+// App
+#define APP_NAME       L"AltDrag"
+#define APP_NAMEA      "AltDrag"
+#define APP_VERSION    "1.46"
 
+// User Messages
+#define WM_TRAY           (WM_USER+1)
+#define WM_SCLICK         (WM_USER+2)
+#define WM_UPDCFRACTION   (WM_USER+3)
+#define WM_UPDATETRAY     (WM_USER+4)
+#define WM_UPDATESETTINGS (WM_USER+5)
+#define WM_OPENCONFIG     (WM_USER+6)
+#define WM_CLOSECONFIG    (WM_USER+7)
+#define WM_ADDTRAY        (WM_USER+8)
+#define WM_HIDETRAY       (WM_USER+9)
+
+// List of possible actions
 enum action { AC_NONE=0, AC_MOVE, AC_RESIZE, AC_MENU, AC_MINIMIZE, AC_MAXIMIZE, AC_CENTER
             , AC_ALWAYSONTOP, AC_CLOSE, AC_LOWER, AC_BORDERLESS, AC_KILL
             , AC_ROLL, AC_ALTTAB, AC_VOLUME, AC_TRANSPARENCY, AC_HSCROLL };
 
 #define MOUVEMENT(action) (action <= AC_RESIZE)
+
 #endif /* ALTDRAG_RPC_H */
diff --git a/hooks.rc b/hooks.rc
index 481bb1d8..50bd0197 100644
--- a/hooks.rc
+++ b/hooks.rc
@@ -1,6 +1,6 @@
 1 VERSIONINFO
-  FILEVERSION 1,4,5,0
-  PRODUCTVERSION 1,4,5,0
+  FILEVERSION 1,4,6,0
+  PRODUCTVERSION 1,4,6,0
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0x0L
   FILEOS 0x40004L
@@ -11,10 +11,10 @@ BEGIN
   BEGIN
     BLOCK "040904b0"
     BEGIN
-      VALUE "FileDescription", "Hooks for AltDrag"
+      VALUE "FileDescription", "Hooks for AltSnap"
       VALUE "InternalName", "hooks"
       VALUE "OriginalFilename", "hooks.dll"
-      VALUE "FileVersion", "1.45"
+      VALUE "FileVersion", "1.46"
       VALUE "CompanyName", "Gillibert Software"
       VALUE "LegalCopyright", "Stefan Sundin"
     END