Updated theme and added metrics