Tidying up things from upgrade, including jambulance theme.