Prepare for region layers with alternate config style
More support for layers
Layer swither done, more cleanup fixes