Major revisions.  More simple. More better.  Removed some theme specifics.