Moved display code to separate file, colour modes