Small updates to Theme