1.0 theme integration Usability

This will merge in the usability based changes to the theme.