Updated to use the new xctool with a fix for incorrectly sized dividers.