Added proper 4- and 8-bit colour support