Re-edited the shared templates