Add TP5 suit + fix formatting