Removing default theme.  Fixing ContentPresenter/ContentControl defaults.
Updated version.