Added option to disable block and spacing helpers