Syntax update & theme vars