Migrate more demos to new syntax
Migrate opts to new system