Rework titles and add packets