Merged 2.2.2 layout with 2.3.3 additions, and with a few other tweaks, all is sweet.