Add dvorak (,aoe) and shifted cluster (esdf/.oeu) support