Sync with recent jarvi themes.