Template fixes
Removed deprecated includes
Development command file