Add time to completion, track some additional data under themes.