fixed layout and onyx versions