diff -r 800e0f20cfe9 -r d9c996538b26 layouts/aknlayout2/cdl/AknLayoutScalable_Avkon.cdl
--- a/layouts/aknlayout2/cdl/AknLayoutScalable_Avkon.cdl	Fri Feb 19 23:50:17 2010 +0200
+++ b/layouts/aknlayout2/cdl/AknLayoutScalable_Avkon.cdl	Fri Mar 12 15:48:30 2010 +0200
@@ -2,7 +2,7 @@
 // This file was generated by:
 // aknlayoutcompiler MLCompData2CDL -nodeletes -allparams ..\xml\av\_all\php_av_qhd_prt_tch\display_eur_compData.xml ..\xml\av\_all\phl_av_qhd_lsc_tch\display_eur_compData.xml ..\cdl\AknLayoutScalable_Avkon.cdl 0x1020384E
 // Generated from ..\xml\av\_all\php_av_qhd_prt_tch\display_eur_compData.xml, ..\xml\av\_all\phl_av_qhd_lsc_tch\display_eur_compData.xml, 
-// which was generated with timestamp 2010-02-01 00:42:43.319
+// which was generated with timestamp 2010-02-11 19:34:07.543
 
 Name: AknLayoutScalable_Avkon
 Version: 1.0
@@ -12322,19 +12322,23 @@
 // LAF Table : popup_fep_vkb_icf_pane
 TAknLayoutScalableParameterLimits bg_icf_pane_ParamLimits(TInt aVariety);
 
+// LAF Table : main_fep_vtchi_ss_pane
 TAknLayoutScalableParameterLimits icf_edit_indi_pane_ParamLimits(TInt aVariety);
 
 TAknWindowComponentLayout icf_edit_indi_pane(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
 
+// LAF Table : popup_fep_vkb_icf_pane
 TAknLayoutScalableParameterLimits list_vkb_icf_pane_ParamLimits(TInt aVariety);
 
 // LAF Table : popup_fep_vtchi_icf_pane
 TAknLayoutScalableParameterLimits bg_icf_pane_cp01_ParamLimits(TInt aVariety);
 
+// LAF Table : main_fep_vtchi_ss_pane
 TAknLayoutScalableParameterLimits icf_edit_indi_pane_cp01_ParamLimits(TInt aVariety);
 
 TAknWindowComponentLayout icf_edit_indi_pane_cp01(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
 
+// LAF Table : popup_fep_vtchi_icf_pane
 TAknWindowComponentLayout vtchi_query_pane(TInt aVariety = 0, TInt aCol = 0, TInt aRow = 0);
 
 // LAF Table : icf_edit_indi_pane
@@ -12431,3 +12435,63 @@
 
 TAknWindowComponentLayout signal_pane_g4(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
 
+// LAF Table : cell_ai5_widget_list_row_pane
+TAknLayoutScalableParameterLimits cell_ai5_widget_list_row_pane_t3_ParamLimits(TInt aVariety);
+
+TAknTextComponentLayout cell_ai5_widget_list_row_pane_t3(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : cell_ituss_key_pane
+TAknLayoutScalableParameterLimits cell_ituss_key_pane_t1_ParamLimits(TInt aVariety);
+
+TAknTextComponentLayout cell_ituss_key_pane_t1(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : form_field_data_wide_pane_vc
+TAknLayoutScalableParameterLimits form_field_data_wide_pane_vc_t2_ParamLimits(TInt aVariety);
+
+TAknTextComponentLayout form_field_data_wide_pane_vc_t2(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableParameterLimits form_field_data_wide_pane_vc_t3_ParamLimits(TInt aVariety);
+
+TAknTextComponentLayout form_field_data_wide_pane_vc_t3(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableTableLimits form_field_data_wide_pane_vc_t_Limits();
+
+TAknLayoutScalableParameterLimits form_field_data_wide_pane_vc_t_ParamLimits(TInt aLineIndex, TInt aVariety);
+
+TAknTextComponentLayout form_field_data_wide_pane_vc_t(TInt aLineIndex, TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : form_field_slider_wide_pane_vc
+TAknLayoutScalableParameterLimits form_field_slider_wide_pane_vc_t3_ParamLimits(TInt aVariety);
+
+TAknTextComponentLayout form_field_slider_wide_pane_vc_t3(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : form_field_popup_wide_pane_vc
+TAknLayoutScalableParameterLimits form_field_popup_wide_pane_vc_t2_ParamLimits(TInt aVariety);
+
+TAknTextComponentLayout form_field_popup_wide_pane_vc_t2(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableParameterLimits form_field_popup_wide_pane_vc_t3_ParamLimits(TInt aVariety);
+
+TAknTextComponentLayout form_field_popup_wide_pane_vc_t3(TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+TAknLayoutScalableTableLimits form_field_popup_wide_pane_vc_t_Limits();
+
+TAknLayoutScalableParameterLimits form_field_popup_wide_pane_vc_t_ParamLimits(TInt aLineIndex, TInt aVariety);
+
+TAknTextComponentLayout form_field_popup_wide_pane_vc_t(TInt aLineIndex, TInt aVariety, TInt aCol = 0, TInt aRow = 0);
+
+// LAF Table : main_fep_fshwr2_pane
+TAknLayoutScalableParameterLimits aid_fshwr2_btn_pane_ParamLimits(TInt aVariety);
+
+TAknLayoutScalableParameterLimits aid_fshwr2_syb_pane_ParamLimits(TInt aVariety);
+
+TAknLayoutScalableParameterLimits aid_fshwr2_txt_pane_ParamLimits(TInt aVariety);
+
+TAknLayoutScalableParameterLimits fshwr2_bg_pane_ParamLimits(TInt aVariety);
+
+TAknLayoutScalableParameterLimits fshwr2_func_candi_pane_ParamLimits(TInt aVariety);
+
+TAknLayoutScalableParameterLimits fshwr2_hwr_syb_pane_ParamLimits(TInt aVariety);
+
+TAknLayoutScalableParameterLimits fshwr2_icf_pane_ParamLimits(TInt aVariety);
+