Restored CODEXROOT/CODEXCONTENT references to CodexLayout