fixes
fix deprecated syntax
replaced package type with custom define
fix output