Style fixes & switch to colorize