diff --git a/src/format.h b/src/format.h
index 418d837..9a7a8e4 100644
--- a/src/format.h
+++ b/src/format.h
@@ -175,8 +175,8 @@ namespace TR {
     struct Color16 {
         uint16 r:5, g:5, b:5, a:1;
 
-        operator Color24() const { return Color24(r << 3, g << 3, b << 3); }
-        operator Color32() const { return Color32(r << 3, g << 3, b << 3, -a); }
+        operator Color24() const { return Color24((r << 3) | (r >> 2), (g << 3) | (g >> 2), (b << 3) | (b >> 2)); }
+        operator Color32() const { return Color32((r << 3) | (r >> 2), (g << 3) | (g >> 2), (b << 3) | (b >> 2), -a); }
     };
 
     struct Vertex {
diff --git a/src/utils.h b/src/utils.h
index ca60e4d..14fd68a 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -31,7 +31,7 @@
 
 
 #define EPS     FLT_EPSILON
-#define INF		INFINITY
+#define INF     INFINITY
 #define PI      3.14159265358979323846f
 #define PI2     (PI * 2.0f)
 #define DEG2RAD (PI / 180.0f)