Rebuild theme and merge with upstream copy changes