Fix bad practice of defining PATH & add more plugins