Update server and rebuild theme
Update and merge with upstream