Restore base tones references to terminal syntax
Merge branch 'abstract-all-tones' into dusk