Updating theme with latest from Bear Group.