Merge in theme changes from Jeff