* To make is easier to reuse layouts and override the position maps for them, add labels to all the position map children in our shared layouts.
Split up the Corne layout files to match the previous commit.