Updated to 2.1d

Moved around and tweaked several addons to uniform the design a bit
more. Nothing major. Started setting up for different resolution support
coming in v2.2.