Changing color codes to fix #495

Also a bit more explicit with resetting color attributes.