diff --git a/app/fanvil/app_config.php b/app/fanvil/app_config.php
index c3ff7bec51..6a9fe66fbc 100644
--- a/app/fanvil/app_config.php
+++ b/app/fanvil/app_config.php
@@ -150,6 +150,46 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "enter a stun port number";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1dcd2c0b-f13a-4a9a-8055-069c38a92517";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_softkey_exit";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "2";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Exit key on left or right side of menu. 2 - Left, 1 - Right";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f6522bc8-2af9-4811-934a-b4fb38020545";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_softkey_desktopsoftkey";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "history;contact;dnd;menu;";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Menu keys to display on desktop. Example 'history;dss1;dss2;dss3;'";
+		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e7d2f9fb-359d-426a-9f6a-4343f1b61802";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_softkey_talkingsoftkey";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "hold;xfer;conf;end;";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Menu keys to display while on call. Example 'history;dss1;dss2;dss3;'";
+		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "102c3315-af54-4f0d-a462-ac9347ae56a0";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_softkey_ringingsoftkey";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "accept;none;forward;reject;";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Menu keys to display while ringing. Example 'history;dss1;dss2;dss3;'";
+		$y++;
+                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "10d62c3e-f64d-4a7d-93fd-99f1b701609e";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_softkey_desktopclick";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "history;status;none;none;none;";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Physical Menu Buttons. Example Map: up;down;left;right;ok";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "68feb973-be9a-42ac-94a1-54263dfde589";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_lldp_tx_enable";
diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 579e2ad004..3ac47187f8 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -1192,9 +1192,11 @@
             <DateSeparator>{if isset($fanvil_date_separator)}{$fanvil_date_separator}{else}0{/if}</DateSeparator>
         </timeDisplay>
         <softkey>
-            <DesktopSoftkey>history;contact;dnd;menu;</DesktopSoftkey>
-            <TalkingSoftkey>hold;xfer;conf;end;</TalkingSoftkey>
-            <RingingSoftkey>accept;none;forward;reject;</RingingSoftkey>
+            <SoftkeyMode>0</SoftkeyMode>
+            <SoftKeyExitStyle>{if isset($fanvil_softkey_exit)}{$fanvil_softkey_exit}{else}1{/if}</SoftKeyExitStyle>
+            <DesktopSoftkey>{if isset($fanvil_softkey_desktopsoftkey)}{$fanvil_softkey_desktopsoftkey}{else}history;contact;dnd;menu;{/if}</DesktopSoftkey>
+            <TalkingSoftkey>{if isset($fanvil_softkey_talkingsoftkey)}{$fanvil_softkey_talkingsoftkey}{else}hold;xfer;conf;end;{/if}</TalkingSoftkey>
+            <RingingSoftkey>{if isset($fanvil_softkey_ringingsoftkey)}{$fanvil_softkey_ringingsoftkey}{else}accept;none;forward;reject;{/if}</RingingSoftkey>
             <AlertingSoftkey>end;none;none;none;</AlertingSoftkey>
             <XAlertingSoftkey>end;none;none;none;</XAlertingSoftkey>
             <ConferenceSoftkey>hold;none;split;end;</ConferenceSoftkey>
@@ -1204,7 +1206,7 @@
             <DialerCallSoftkey>repeat;2aB;delete;exit;</DialerCallSoftkey>
             <DialerXferSoftkey>repeat;2aB;delete;exit;</DialerXferSoftkey>
             <DialerCfwdSoftkey>repeat;2aB;delete;exit;</DialerCfwdSoftkey>
-            <DesktopClick>history;status;none;none;none;</DesktopClick>
+            <DesktopClick>{if isset($fanvil_softkey_desktopclick)}{$fanvil_softkey_desktopclick}{else}history;status;none;none;none;{/if}</DesktopClick>
             <DailerClick>none;none;none;none;none;</DailerClick>
             <CallClick>none;none;voldown;volup;none;</CallClick>
             <DesktopLongPress>status;none;none;none;reset;</DesktopLongPress>
@@ -1837,56 +1839,13 @@
 {/if}
 {/foreach}
         </internal>
-        <dssSoft index="1">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-        </dssSoft>
-        <dssSoft index="2">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-        </dssSoft>
-        <dssSoft index="3">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-        </dssSoft>
-        <dssSoft index="4">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-        </dssSoft>
-        <dssSoft index="5">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-        </dssSoft>
-        <dssSoft index="6">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-        </dssSoft>
-        <dssSoft index="7">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-        </dssSoft>
-        <dssSoft index="8">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-        </dssSoft>
-        <dssSoft index="9">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-        </dssSoft>
-        <dssSoft index="10">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
+{foreach $keys["programmable"] as $row}
+        <dssSoft index="{$row.device_key_id}">
+            <Type>1</Type>
+            <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+            <Title>{$row.device_key_label}</Title>
         </dssSoft>
+{/foreach}
 {strip}{*-- Each External Index contains 20 keys --*}{/strip}
         <external index="1">        
 {foreach $keys["expansion"] as $row}