Fix caret color and some source formatting