merge theme updates.