Updated standalone templates