Parser complete + GUI text highlighting and colors
Fixed merge conflict