Adds categories, fixes some broken paths