I'm just going to leave it as is. As far as the straps go, I found some oversized strap pins that should work perfectly. Placing the pins in the wrong place will just bother me.
It will be weird going sans straplocks...
It will be weird going sans straplocks...