Update syntax config
Update layout