Consolidated all blade templates to use the master template