Code cleanup... Removed "change" hack flag to track changes

I removed hack for keeping track of changes that required themes to be
reapplied.  Also cleaned up a bit of the comments