[M] Updated the graphics and graphics related code to fix the colour keys.