Sync with Muzyka edition

Bring formatting more in line with Muzyka edition, instead of (inferior)
Gutheil edition