Updated templates to match latest modernui directive changes