diff --git a/common/defines.h b/common/defines.h
index c6e85a08..d87ddae7 100644
--- a/common/defines.h
+++ b/common/defines.h
@@ -72,7 +72,7 @@
   (bpp==8?COLOR8(HRED(c),HGREEN(c),HBLUE(c)): \
    (bpp==15?COLOR15(HRED(c),HGREEN(c),HBLUE(c)): \
     (bpp==16?COLOR16(HRED(c),HGREEN(c),HBLUE(c)): \
-      (bpp==24?COLOR24BGR(HRED(c),HGREEN(c),HBLUE(c)):c) \
+      (bpp>=24?COLOR24BGR(HRED(c),HGREEN(c),HBLUE(c)):c) \
     ) \
    ) \
   ) \
@@ -101,4 +101,10 @@
 /* use crc for bitmap cache lookups */
 #define USE_CRC
 
+#define XR_RGB2BGR(a_ulColor) \
+   (a_ulColor & 0xFF000000) | \
+  ((a_ulColor & 0x00FF0000) >> 16) | \
+   (a_ulColor & 0x0000FF00) |  \
+  ((a_ulColor & 0x000000FF) << 16)
+
 #endif