diff --git a/include/commctrl.h b/include/commctrl.h
index 0f50bea..a4d5dbf 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -1410,37 +1410,37 @@
 
 #define TTM_ACTIVATE            (WM_USER+1)
 #define TTM_SETDELAYTIME        (WM_USER+3)
-#define TTM_ADDTOOLA          (WM_USER+4)
-#define TTM_ADDTOOLW          (WM_USER+50)
+#define TTM_ADDTOOLA            (WM_USER+4)
+#define TTM_ADDTOOLW            (WM_USER+50)
 #define TTM_ADDTOOL WINELIB_NAME_AW(TTM_ADDTOOL)
-#define TTM_DELTOOLA          (WM_USER+5)
-#define TTM_DELTOOLW          (WM_USER+51)
+#define TTM_DELTOOLA            (WM_USER+5)
+#define TTM_DELTOOLW            (WM_USER+51)
 #define TTM_DELTOOL WINELIB_NAME_AW(TTM_DELTOOL)
-#define TTM_NEWTOOLRECTA      (WM_USER+6)
-#define TTM_NEWTOOLRECTW      (WM_USER+52)
+#define TTM_NEWTOOLRECTA        (WM_USER+6)
+#define TTM_NEWTOOLRECTW        (WM_USER+52)
 #define TTM_NEWTOOLRECT WINELIB_NAME_AW(TTM_NEWTOOLRECT)
 #define TTM_RELAYEVENT          (WM_USER+7)
-#define TTM_GETTOOLINFOA      (WM_USER+8)
-#define TTM_GETTOOLINFOW      (WM_USER+53)
+#define TTM_GETTOOLINFOA        (WM_USER+8)
+#define TTM_GETTOOLINFOW        (WM_USER+53)
 #define TTM_GETTOOLINFO WINELIB_NAME_AW(TTM_GETTOOLINFO)
-#define TTM_SETTOOLINFOA      (WM_USER+9)
-#define TTM_SETTOOLINFOW      (WM_USER+54)
+#define TTM_SETTOOLINFOA        (WM_USER+9)
+#define TTM_SETTOOLINFOW        (WM_USER+54)
 #define TTM_SETTOOLINFO WINELIB_NAME_AW(TTM_SETTOOLINFO)
-#define TTM_HITTESTA          (WM_USER+10)
-#define TTM_HITTESTW          (WM_USER+55)
+#define TTM_HITTESTA            (WM_USER+10)
+#define TTM_HITTESTW            (WM_USER+55)
 #define TTM_HITTEST WINELIB_NAME_AW(TTM_HITTEST)
-#define TTM_GETTEXTA          (WM_USER+11)
-#define TTM_GETTEXTW          (WM_USER+56)
+#define TTM_GETTEXTA            (WM_USER+11)
+#define TTM_GETTEXTW            (WM_USER+56)
 #define TTM_GETTEXT WINELIB_NAME_AW(TTM_GETTEXT)
-#define TTM_UPDATETIPTEXTA    (WM_USER+12)
-#define TTM_UPDATETIPTEXTW    (WM_USER+57)
+#define TTM_UPDATETIPTEXTA      (WM_USER+12)
+#define TTM_UPDATETIPTEXTW      (WM_USER+57)
 #define TTM_UPDATETIPTEXT WINELIB_NAME_AW(TTM_UPDATETIPTEXT)
 #define TTM_GETTOOLCOUNT        (WM_USER+13)
-#define TTM_ENUMTOOLSA        (WM_USER+14)
-#define TTM_ENUMTOOLSW        (WM_USER+58)
+#define TTM_ENUMTOOLSA          (WM_USER+14)
+#define TTM_ENUMTOOLSW          (WM_USER+58)
 #define TTM_ENUMTOOLS WINELIB_NAME_AW(TTM_ENUMTOOLS)
-#define TTM_GETCURRENTTOOLA   (WM_USER+15)
-#define TTM_GETCURRENTTOOLW   (WM_USER+59)
+#define TTM_GETCURRENTTOOLA     (WM_USER+15)
+#define TTM_GETCURRENTTOOLW     (WM_USER+59)
 #define TTM_GETCURRENTTOOL WINELIB_NAME_AW(TTM_GETCURRENTTOOL)
 #define TTM_WINDOWFROMPOINT     (WM_USER+16)
 #define TTM_TRACKACTIVATE       (WM_USER+17)
@@ -1456,12 +1456,13 @@
 #define TTM_GETMARGIN           (WM_USER+27)
 #define TTM_POP                 (WM_USER+28)
 #define TTM_UPDATE              (WM_USER+29)
+#define TTM_GETBUBBLESIZE       (WM_USER+30)
 
 
 #define TTN_FIRST               (0U-520U)
 #define TTN_LAST                (0U-549U)
-#define TTN_GETDISPINFOA      (TTN_FIRST-0)
-#define TTN_GETDISPINFOW      (TTN_FIRST-10)
+#define TTN_GETDISPINFOA        (TTN_FIRST-0)
+#define TTN_GETDISPINFOW        (TTN_FIRST-10)
 #define TTN_GETDISPINFO WINELIB_NAME_AW(TTN_GETDISPINFO)
 #define TTN_SHOW                (TTN_FIRST-1)
 #define TTN_POP                 (TTN_FIRST-2)
@@ -1787,7 +1788,8 @@
 #define TBS_FIXEDLENGTH         0x0040
 #define TBS_NOTHUMB             0x0080
 #define TBS_TOOLTIPS            0x0100
-#define TBS_REVERSED			0x0200
+#define TBS_REVERSED		0x0200
+#define TBS_DOWNISLEFT		0x0400
 
 #define TBTS_TOP                0
 #define TBTS_LEFT               1