diff --git a/resources/templates/provision/cisco/7960/DISTINCTIVERINGLIST.XML b/resources/templates/provision/cisco/7960/DISTINCTIVERINGLIST.XML
new file mode 100644
index 0000000000..8841ee8303
--- /dev/null
+++ b/resources/templates/provision/cisco/7960/DISTINCTIVERINGLIST.XML
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/templates/provision/cisco/7960/RINGLIST.XML b/resources/templates/provision/cisco/7960/RINGLIST.XML
new file mode 100644
index 0000000000..c30df63119
--- /dev/null
+++ b/resources/templates/provision/cisco/7960/RINGLIST.XML
@@ -0,0 +1,30 @@
+
+
+ Chirp 3
+ ringer3.pcm
+
+
+ Old Style
+ ringer1.pcm
+
+
+ Door Chime
+ doorchime.pcm
+
+
+ Red Alert
+ redalert.pcm
+
+
+ Terri
+ terri.pcm
+
+
+ Door Chime 2
+ chime2.pcm
+
+
+ Silence
+ silence.pcm
+
+
diff --git a/resources/templates/provision/cisco/7960/SIPDefault.cnf b/resources/templates/provision/cisco/7960/SIPDefault.cnf
index aa90396792..e69de29bb2 100644
--- a/resources/templates/provision/cisco/7960/SIPDefault.cnf
+++ b/resources/templates/provision/cisco/7960/SIPDefault.cnf
@@ -1,131 +0,0 @@
-# Image Version
-image_version: "P0S3-08-7-00"
-
-# Proxy Server
-proxy1_address: "192.168.1.1"
-
-# Proxy Server Port (default - 5060)
-proxy1_port:"5060"
-
-# Emergency Proxy info
-proxy_emergency: "192.168.1.1"
-proxy_emergency_port: "5060"
-
-# Backup Proxy info
-proxy_backup: "192.168.1.1"
-proxy_backup_port: "5060"
-
-# Outbound Proxy info
-outbound_proxy: ""
-outbound_proxy_port: "5060"
-
-# NAT/Firewall Traversal
-nat_enable: "0"
-nat_address: ""
-voip_control_port: "5060"
-start_media_port: "16384"
-end_media_port: "32766"
-nat_received_processing: "0"
-
-# Proxy Registration (0-disable (default), 1-enable)
-proxy_register: "1"
-
-# Phone Registration Expiration [1-3932100 sec] (Default - 3600)
-timer_register_expires: "3600"
-
-# Codec for media stream (g711ulaw (default), g711alaw, g729)
-preferred_codec: "none"
-
-# TOS bits in media stream [0-5] (Default - 5)
-tos_media: "5"
-
-# Enable VAD (0-disable (default), 1-enable)
-enable_vad: "0"
-
-# Allow for the bridge on a 3way call to join remaining parties upon hangup
-cnf_join_enable: "1" ; 0-Disabled, 1-Enabled (default)
-
-# Allow Transfer to be completed while target phone is still ringing
-semi_attended_transfer: "0" ; 0-Disabled, 1-Enabled (default)
-
-# Telnet Level (enable or disable the ability to telnet into this phone
-telnet_level: "2" ; 0-Disabled (default), 1-Enabled, 2-Privileged
-
-# Inband DTMF Settings (0-disable, 1-enable (default))
-dtmf_inband: "1"
-
-# Out of band DTMF Settings (none-disable, avt-avt enable (default), avt_always - always avt )
-dtmf_outofband: "avt"
-
-# DTMF dB Level Settings (1-6dB down, 2-3db down, 3-nominal (default), 4-3db up, 5-6dB up)
-dtmf_db_level: "3"
-
-# SIP Timers
-timer_t1: "500" ; Default 500 msec
-timer_t2: "4000" ; Default 4 sec
-sip_retx: "10" ; Default 11
-sip_invite_retx: "6" ; Default 7
-timer_invite_expires: "180" ; Default 180 sec
-
-# Setting for Message speeddial to UOne box
-messages_uri: "*98"
-
-# TFTP Phone Specific Configuration File Directory
-tftp_cfg_dir: ""
-
-# Time Server
-sntp_mode: "unicast"
-sntp_server: "192.168.1.1"
-time_zone: "EST"
-dst_offset: "1"
-dst_start_month: "Mar"
-dst_start_day: ""
-dst_start_day_of_week: "Sun"
-dst_start_week_of_month: "2"
-dst_start_time: "02"
-dst_stop_month: "Nov"
-dst_stop_day: ""
-dst_stop_day_of_week: "Sunday"
-dst_stop_week_of_month: "1"
-dst_stop_time: "2"
-dst_auto_adjust: "1"
-
-# Do Not Disturb Control (0-off, 1-on, 2-off with no user control, 3-on with no user control)
-dnd_control: "0" ; Default 0 (Do Not Disturb feature is off)
-
-# Caller ID Blocking (0-disabled, 1-enabled, 2-disabled no user control, 3-enabled no user control)
-callerid_blocking: "0" ; Default 0 (Disable sending all calls as anonymous)
-
-# Anonymous Call Blocking (0-disbaled, 1-enabled, 2-disabled no user control, 3-enabled no user control)
-anonymous_call_block: "0" ; Default 0 (Disable blocking of anonymous calls)
-
-# Call Waiting (0-disabled, 1-enabled, 2-disabled with no user control, 3-enabled with no user control)
-call_waiting: "1" ; Default 1 (Call Waiting enabled)
-
-# DTMF AVT Payload (Dynamic payload range for AVT tones - 96-127)
-dtmf_avt_payload: "101" ; Default 100
-
-# XML file that specifies the dialplan desired
-dial_template: "dialplan"
-
-# Network Media Type (auto, full100, full10, half100, half10)
-network_media_type: "auto"
-
-#Autocompletion During Dial (0-off, 1-on [default])
-autocomplete: "1"
-
-#Time Format (0-12hr, 1-24hr [default])
-time_format_24hr: "0"
-
-# URL for external Phone Services
-#services_url: "http://192.168.1.1/xmlservices/index.php"
-
-# URL for external Directory location
-#directory_url: "http://192.168.1.1/xmlservices/PhoneDirectory.php"
-
-# URL for branding logo
-#logo_url: "http://192.168.1.1/cisco/bmp/trixbox.bmp"
-
-# Remote Party ID
-remote_party_id: 1 ; 0-Disabled (default), 1-Enabled
-
diff --git a/resources/templates/provision/cisco/7960/SIP{$mac}.cnf b/resources/templates/provision/cisco/7960/SIP{$mac}.cnf
index f2dda35d42..2d9adbd63f 100644
--- a/resources/templates/provision/cisco/7960/SIP{$mac}.cnf
+++ b/resources/templates/provision/cisco/7960/SIP{$mac}.cnf
@@ -1,43 +1,150 @@
-phone_label: "{$display_name_1}"
-proxy1_address: "{$server_address_1}"
+{if isset($cisco_time_zone)}
+# Image version
+image_version: "{$cisco_image_version}"
+{/if}
+
+# Phone settings
+phone_label: "{$label}"
proxy_register: 1
timer_register_expires: 300
preferred_codec: g711ulaw
enable_vad: 0
dial_template: "dialplan"
-line1_name: "{$user_id_1}"
-line1_displayname: "{$user_id_1}"
-line1_shortname: "{$short_name_1}"
-line1_authname: "{$auth_id_1}"
-line1_password: "{$user_password_1}"
+{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
+#registration information
+proxy{$row.line_number}_address: "{$row.server_address}"
+proxy{$row.line_number}_port:"{$row.sip_port}"
+line{$row.line_number}_name: "{$row.user_id}"
+line{$row.line_number}_displayname: "{$row.user_id}"
+line{$row.line_number}_shortname: "{$row.display_name}"
+line{$row.line_number}_authname: "{$row.auth_id}"
+line{$row.line_number}_password: "{$row.password}"
-line2_name: "{$user_id_2}"
-line2_displayname: "{$user_id_2}"
-line2_shortname: "{$short_name_2}"
-line2_authname: "{$auth_id_2}"
-line2_password: "{$user_password_2}"
+{/foreach}
+# Emergency Proxy info
+proxy_emergency: "{$proxy_emergency}"
+proxy_emergency_port: "{$proxy_emergency_port}"
-line3_name: "{$user_id_3}"
-line3_displayname: "{$user_id_3}"
-line3_shortname: "{$short_name_3}"
-line3_authname: "{$auth_id_3}"
-line3_password: "{$user_password_3}"
+# Backup Proxy info
+proxy_backup: "{$proxy_backup}"
+proxy_backup_port: "{$proxy_backup_port}"
+
+# Outbound Proxy info
+outbound_proxy: "{$outbound_proxy}"
+outbound_proxy_port: "{$outbound_proxy_port}"
+
+# NAT/Firewall Traversal
+voip_control_port: "5060"
+start_media_port: "16384"
+end_media_port: "32768"
+nat_received_processing: "0"
+nat_enable: "{if isset($nat_enable)}{$nat_enable}{else}1{/if}"
+nat_address: "{$nat_nat_address}"
-line4_name: "{$user_id_4}"
-line4_displayname: "{$user_id_4}"
-line4_shortname: "{$short_name_4}"
-line4_authname: "{$auth_id_4}"
-line4_password: "{$user_password_4}"
+# Sync value of the phone used for remote reset
+sync: 1 ; Default 1
-line5_name: "{$user_id_5}"
-line5_displayname: "{$user_id_5}"
-line5_shortname: "{$short_name_5}"
-line5_authname: "{$auth_id_5}"
-line5_password: "{$user_password_5}"
+# Proxy Registration (0-disable (default), 1-enable)
+proxy_register: "1"
+
+# Phone Registration Expiration [1-3932100 sec] (Default - 3600)
+timer_register_expires: "80"
+
+# Codec for media stream (g711ulaw (default), g711alaw, g729)
+preferred_codec: "none"
+
+# TOS bits in media stream [0-5] (Default - 5)
+tos_media: "5"
-line6_name: "{$user_id_6}"
-line6_displayname: "{$user_id_6}"
-line6_shortname: "{$short_name_6}"
-line6_authname: "{$auth_id_6}"
-line6_password: "{$user_password_6}"
\ No newline at end of file
+# Enable VAD (0-disable (default), 1-enable)
+enable_vad: "0"
+
+# Allow for the bridge on a 3way call to join remaining parties upon hangup
+cnf_join_enable: "1" ; 0-Disabled, 1-Enabled (default)
+
+# Allow Transfer to be completed while target phone is still ringing
+semi_attended_transfer: "0" ; 0-Disabled, 1-Enabled (default)
+
+# Telnet Level (enable or disable the ability to telnet into this phone
+telnet_level: "2" ; 0-Disabled (default), 1-Enabled, 2-Privileged
+
+# Inband DTMF Settings (0-disable, 1-enable (default))
+dtmf_inband: "1"
+
+# Out of band DTMF Settings (none-disable, avt-avt enable (default), avt_always - always avt )
+dtmf_outofband: "avt"
+
+# DTMF dB Level Settings (1-6dB down, 2-3db down, 3-nominal (default), 4-3db up, 5-6dB up)
+dtmf_db_level: "3"
+
+# SIP Timers
+timer_t1: "500" ; Default 500 msec
+timer_t2: "4000" ; Default 4 sec
+sip_retx: "10" ; Default 11
+sip_invite_retx: "6" ; Default 7
+timer_invite_expires: "180" ; Default 180 sec
+
+# Setting for Message speeddial to UOne box
+messages_uri: "*97"
+
+# TFTP Phone Specific Configuration File Directory
+tftp_cfg_dir: ""
+
+# Time Server
+sntp_mode: "unicast"
+sntp_server: "{$sntp_server}"
+{if isset($cisco_time_zone)}
+time_zone: "{$cisco_time_zone}"
+{/if}
+dst_offset: "1"
+dst_start_month: "Mar"
+dst_start_day: ""
+dst_start_day_of_week: "Sun"
+dst_start_week_of_month: "2"
+dst_start_time: "02"
+dst_stop_month: "Nov"
+dst_stop_day: ""
+dst_stop_day_of_week: "Sunday"
+dst_stop_week_of_month: "1"
+dst_stop_time: "2"
+dst_auto_adjust: "1"
+
+# Do Not Disturb Control (0-off, 1-on, 2-off with no user control, 3-on with no user control)
+dnd_control: "2" ; Default 0 (Do Not Disturb feature is off)
+
+# Caller ID Blocking (0-disabled, 1-enabled, 2-disabled no user control, 3-enabled no user control)
+callerid_blocking: "0" ; Default 0 (Disable sending all calls as anonymous)
+
+# Anonymous Call Blocking (0-disbaled, 1-enabled, 2-disabled no user control, 3-enabled no user control)
+anonymous_call_block: "0" ; Default 0 (Disable blocking of anonymous calls)
+
+# Call Waiting (0-disabled, 1-enabled, 2-disabled with no user control, 3-enabled with no user control)
+call_waiting: "1" ; Default 1 (Call Waiting enabled)
+
+# DTMF AVT Payload (Dynamic payload range for AVT tones - 96-127)
+dtmf_avt_payload: "101" ; Default 100
+
+# XML file that specifies the dialplan desired
+dial_template: "dialplan"
+
+# Network Media Type (auto, full100, full10, half100, half10)
+network_media_type: "auto"
+
+#Autocompletion During Dial (0-off, 1-on [default])
+autocomplete: "1"
+
+#Time Format (0-12hr, 1-24hr [default])
+time_format_24hr: "0"
+
+# URL for external Phone Services
+#services_url: "http://{$domain_name}/app/provision/file/services.xml"
+
+# URL for external Directory location
+directory_url: "http://{$domain_name}/app/provision/file/directory.xml"
+
+# URL for branding logo
+#logo_url: "http://{$domain_name}/app/provision/logo.bmp"
+
+# Remote Party ID
+remote_party_id: 1 ; 0-Disabled (default), 1-Enabled
diff --git a/resources/templates/provision/cisco/7960/directory-enterprise.xml b/resources/templates/provision/cisco/7960/directory-enterprise.xml
new file mode 100644
index 0000000000..5c977112b0
--- /dev/null
+++ b/resources/templates/provision/cisco/7960/directory-enterprise.xml
@@ -0,0 +1,25 @@
+
+ Enterprise
+ Please choose...
+{assign var=x value=1}
+{foreach $contacts as $row}{if $row.contact_category == "enterprise"}
+
+{if $row.contact_name_given != ""}
+ {$row.contact_name_given} {$row.contact_name_family}
+{else}
+ {$row.contact_organization}
+{/if}
+{if $row.phone_number != ""}
+ {$row.phone_number}
+{else}
+ {$row.phone_extension}
+{/if}
+
+{/if}
+{assign var=x value=$x+1}
+{/foreach}
+
+
+
+
+
diff --git a/resources/templates/provision/cisco/7960/directory-personal.xml b/resources/templates/provision/cisco/7960/directory-personal.xml
new file mode 100644
index 0000000000..2e6750eb98
--- /dev/null
+++ b/resources/templates/provision/cisco/7960/directory-personal.xml
@@ -0,0 +1,24 @@
+
+ Personal
+ Please choose...
+{assign var=x value=1}
+{foreach $contacts as $row}{if $row.contact_category == "personal"}
+
+{if $row.contact_name_given != ""}
+ {$row.contact_name_given} {$row.contact_name_family}
+{else}
+ {$row.contact_organization}
+{/if}
+{if $row.phone_number != ""}
+ {$row.phone_number}
+{else}
+ {$row.phone_extension}
+{/if}
+
+{/if}
+{assign var=x value=$x+1}
+{/foreach}
+
+
+
+
diff --git a/resources/templates/provision/cisco/7960/directory-speed_dial.xml b/resources/templates/provision/cisco/7960/directory-speed_dial.xml
new file mode 100644
index 0000000000..16138ed111
--- /dev/null
+++ b/resources/templates/provision/cisco/7960/directory-speed_dial.xml
@@ -0,0 +1,21 @@
+
+ Speed Dial
+ Please choose...
+{assign var=x value=1}
+{foreach $contacts as $row}{if $row.contact_category == "speed dial"}
+
+{if $row.contact_name_given != ""}
+ {$row.contact_name_given} {$row.contact_name_family}
+{else}
+ {$row.contact_organization}
+{/if}
+{if $row.phone_number != ""}
+ {$row.phone_number}
+{else}
+ {$row.phone_extension}
+{/if}
+
+{/if}
+{assign var=x value=$x+1}
+{/foreach}
+
diff --git a/resources/templates/provision/cisco/7960/directory.xml b/resources/templates/provision/cisco/7960/directory.xml
new file mode 100644
index 0000000000..24351b9b2d
--- /dev/null
+++ b/resources/templates/provision/cisco/7960/directory.xml
@@ -0,0 +1,17 @@
+
+ Contacts
+ Please choose...
+
+
+
+
\ No newline at end of file