diff --git a/resources/templates/provision/fanvil/x5u/{$mac}.cfg b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
index 4ec78d3eb4..2aea3fc240 100644
--- a/resources/templates/provision/fanvil/x5u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
@@ -2829,8 +2829,10 @@
             <SecondSNTPServer>{$ntp_server_secondary}</SecondSNTPServer>
             <TimeZone>{$fanvil_time_zone}</TimeZone>
             <TimeZoneName>{$fanvil_time_zone_name}</TimeZoneName>
+            <Enable_DST>{$fanvil_enable_dst}</Enable_DST>
+            <DST_Fixed_Type>2</DST_Fixed_Type>
             <SNTPTimeout>60</SNTPTimeout>
-            <DSTType>0</DSTType>
+            <DSTType>1</DSTType>
             <DSTLocation>{if isset($fanvil_location)}{$fanvil_location}{else}4{/if}</DSTLocation>
             <DSTRuleMode>0</DSTRuleMode>
             <DSTMinOffset>{if isset($fanvil_dst_minute_offset)}{$fanvil_dst_minute_offset}{else}60{/if}</DSTMinOffset>
@@ -3276,256 +3278,199 @@
             <Title></Title>
             <ICON>Green</ICON>
         </SidekeyConfig1>
+        {strip}{*-- Each Internal Index contains 6 keys --*}{/strip}        
+
         <internal index="1">
-            <Fkey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id <= 6}
+            <Fkey index="{$row.device_key_id}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
+        {/if}
+        {/foreach}
         </internal>
         <internal index="2">
-            <Fkey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id > 6 && $row.device_key_id <= 12}
+            <Fkey index="{$row.device_key_id-6}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
+        {/if}
+        {/foreach}
         </internal>
         <internal index="3">
-            <Fkey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id > 12 && $row.device_key_id <= 18}
+            <Fkey index="{$row.device_key_id-12}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
+        {/if}
+        {/foreach}
         </internal>
         <internal index="4">
-            <Fkey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id > 18 && $row.device_key_id <= 24}
+            <Fkey index="{$row.device_key_id-18}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
+        {/if}
+        {/foreach}
         </internal>
         <internal index="5">
-            <Fkey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
+        {foreach $keys["line"] as $row}
+        {if $row.device_key_id > 24 && $row.device_key_id <= 30}
+            <Fkey index="{$row.device_key_id-24}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
             </Fkey>
+        {/if}
+        {/foreach}
         </internal>
-        <dssSoft index="1">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="2">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="3">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="4">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="5">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="6">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="7">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="8">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="9">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="10">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
+
+        <internal index="1">
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id <= 6}
+            <Fkey index="{$row.device_key_id}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+        {/if}
+        {/foreach}
+        </internal>
+        <internal index="2">
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 6 && $row.device_key_id <= 12}
+            <Fkey index="{$row.device_key_id-6}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+        {/if}
+        {/foreach}
+        </internal>
+        <internal index="3">
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 12 && $row.device_key_id <= 18}
+            <Fkey index="{$row.device_key_id-12}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+        {/if}
+        {/foreach}
+        </internal>
+        <internal index="4">
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 18 && $row.device_key_id <= 24}
+            <Fkey index="{$row.device_key_id-18}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+        {/if}
+        {/foreach}
+        </internal>
+        <internal index="5">
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 24 && $row.device_key_id <= 30}
+            <Fkey index="{$row.device_key_id-32}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+        {/if}
+        {/foreach}
+        </internal>
+
+        {foreach $keys["programmable"] as $row}
+        <dssSoft index="{$row.device_key_id}">
+            <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+            <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+            <Title>{$row.device_key_label}</Title>
+            <ICON>{$row.device_key_icon}</ICON>
         </dssSoft>
+        {/foreach}
+        {strip}{*-- Each External Index contains 20 keys --*}{/strip}
+        <external index="1">        
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id < 20}
+            <exKey index="{$row.device_key_id}">
+                <Type>0</Type>
+                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </exKey>
+        {/if}
+        {/foreach}
+        </external>
+        <external index="2">        
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id > 19 && $row.device_key_id < 40}
+            <exKey index="{$row.device_key_id}">
+                <Type>0</Type>
+                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </exKey>
+        {/if}
+        {/foreach}
+        </external>
+        <external index="3">
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id > 39 && $row.device_key_id < 60}
+            <exKey index="{$row.device_key_id}">
+                <Type>0</Type>
+                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </exKey>
+        {/if}
+        {/foreach}
+        </external>
+        <external index="4">        
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id > 59 && $row.device_key_id < 80}
+            <exKey index="{$row.device_key_id}">
+                <Type>0</Type>
+                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </exKey>
+        {/if}
+        {/foreach}
+        </external>
+        <external index="5">        
+        {foreach $keys["expansion"] as $row}
+        {if $row.device_key_id > 79 && $row.device_key_id < 100}
+            <exKey index="{$row.device_key_id}">
+                <Type>0</Type>
+                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </exKey>
+        {/if}
+        {/foreach}
+        </external>
     </dsskey>
     <web>
         <WebServerType>0</WebServerType>