Improvement to theme caluclation for dossier and installation