ACP files and various fixes (todo: ACP category delete)