Renamed #org to #script
Improved number highlighting.