that looks right to me, but I would consider getting 16mm instead of 12mm long
screws.
There are a couple of places that the 16mm will be too long for, but most places
have pleanty of space and the extra length will better engage with the nylock
portion of the nut.
David Lang