updated scrub theme
merge