Fixed wrapping issue, plus colors