diff --git a/src_main/console/piscreentypes.h b/src_main/console/piscreentypes.h
index c227130c..d1efb9ce 100644
--- a/src_main/console/piscreentypes.h
+++ b/src_main/console/piscreentypes.h
@@ -96,17 +96,17 @@ namespace PIScreenTypes {
 	typedef PIFlags<FocusFlag> FocusFlags;
 	
 	union PIP_EXPORT CellFormat {
-		CellFormat(uint f = 0) {raw_format = f;}
+		CellFormat(ushort f = 0) {raw_format = f;}
 		CellFormat(Color col_char, Color col_back = Default, CharFlags flags_ = 0) {
 			color_char = col_char;
 			color_back = col_back;
 			flags = flags_;
 		}
-		uint raw_format;
+		ushort raw_format;
 		struct {
-			uchar color_char;
-			uchar color_back;
-			ushort flags;
+			ushort color_char : 4;
+			ushort color_back : 4;
+			ushort flags : 8;
 		};
 		bool operator ==(const CellFormat & c) const {return raw_format == c.raw_format;}
 		bool operator !=(const CellFormat & c) const {return raw_format != c.raw_format;}