Changed template paths to include language