Theming bug fixes

Addresses the following issues:
#328 
#327 
#326 
#325 
#323 

Feel free to pull after review and delete the staff-approval branch I restored (leave this branch, please). I'll be busy. Good luck on launch!