Allow vista images
Remove syntax highlighting code
Add waypoints scripts