Un-suckify the boxes further

Make sure to get ALL of the changes from the local copy this time.. derp.