diff --git a/right/usb_descriptor_mouse_report.c b/right/usb_descriptor_mouse_report.c
index f08a84b..d8d97ff 100644
--- a/right/usb_descriptor_mouse_report.c
+++ b/right/usb_descriptor_mouse_report.c
@@ -111,12 +111,12 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
                 HID_RI_FEATURE(8, HID_IOF_CONSTANT | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
 
                 // Horizontal wheel
-                0x05, 0x0c,        //         USAGE_PAGE (Consumer Devices)
-                0x0a, 0x38, 0x02,  //         USAGE (AC Pan)
-                0x15, 0x81,        //         LOGICAL_MINIMUM (-127)
-                0x25, 0x7f,        //         LOGICAL_MAXIMUM (127)
-                0x75, 0x08,        //         REPORT_SIZE (8)
-                0x81, 0x06,        //         INPUT (Data,Var,Rel)
+                HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER),
+                HID_RI_USAGE(16, HID_RI_USAGE_AC_PAN),
+                HID_RI_LOGICAL_MINIMUM(8, -127),
+                HID_RI_LOGICAL_MAXIMUM(8, 127),
+                HID_RI_REPORT_SIZE(8, 0x08),
+                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
 
                 HID_RI_END_COLLECTION(0),
         HID_RI_END_COLLECTION(0),
diff --git a/right/usb_report_item_macros.h b/right/usb_report_item_macros.h
index eb96bbe..93926fb 100644
--- a/right/usb_report_item_macros.h
+++ b/right/usb_report_item_macros.h
@@ -11,6 +11,7 @@
     #define HID_RI_USAGE_PAGE_GENERIC_DESKTOP 0x01
     #define HID_RI_USAGE_PAGE_LEDS            0x08
     #define HID_RI_USAGE_PAGE_MOUSE_BUTTONS   0x09
+    #define HID_RI_USAGE_PAGE_CONSUMER        0x0C
 
     #define HID_RI_USAGE_POINTER               0x01
     #define HID_RI_USAGE_MOUSE                 0x02
@@ -20,6 +21,7 @@
     #define HID_RI_USAGE_Y                     0x31
     #define HID_RI_USAGE_WHEEL                 0x38
     #define HID_RI_USAGE_RESOLUTION_MULTIPLIER 0x48
+    #define HID_RI_USAGE_AC_PAN                0x0238
 
     #define HID_RI_COLLECTION_PHYSICAL    0x00
     #define HID_RI_COLLECTION_APPLICATION 0x01