Color Preservation

Added more code to preserve code coloring preservation with regular
highlighting.