--- a/userguide/inc/HelpCommon.h	Mon May 03 12:24:47 2010 +0300
+++ b/userguide/inc/HelpCommon.h	Fri May 14 15:42:52 2010 +0300
@@ -50,29 +50,33 @@
 const char* const TXT_BUTTON_LINK_SUPPORT = "txt_user_guide_button_link_to_nokiacomsupport";
 const char* const TXT_SETLABEL_SEARCH = "txt_user_guide_setlabel_search";
 const char* const TXT_SETLABEL_SEARCH_RESULTS = "txt_user_guide_setlabel_search_results";
+const char* const TXT_APPLICATIONS = "txt_user_guide_list_applications";
+const char* const TXT_COLLAPSE_ALL = "txt_user_guide_opt_collapse_all";
+const char* const TXT_EXPAND_ALL = "txt_user_guide_opt_expand_all";
 
 // docml
+const char* const QRC_DOCML_BASE = ":/xml/baseView.docml";
 const char* const QRC_DOCML_CATEGORY = ":/xml/categoryView.docml";
+const char* const QRC_DOCML_KEYWORD = ":/xml/keywordView.docml";
 const char* const QRC_DOCML_CONTENTS = ":/xml/contentsView.docml";
 const char* const QRC_DOCML_TOOLBAR = ":/xml/toolbar.docml";
+const char* const DOCML_VIEW_NAME = "view_help";
 const char* const DOCML_ACTION_ALL = "action_all";
 const char* const DOCML_ACTION_SEARCH = "action_find";
 const char* const DOCML_ACTION_LINK_NOKIA = "action_online_support";
-const char* const DOCML_VIEW_CATEGORY = "view_category";
-const char* const DOCML_VIEW_CONTENTS = "view_contents";
 const char* const DOCML_LIST_CATEGORY_ALL = "list_category_all";
-const char* const DOCML_LIST_CATEGORY_SEARCH = "list_category_search";
-const char* const DOCML_SEARCH_PANEL_CATEGORY = "search_panel_category";
+const char* const DOCML_LIST_SEARCH = "list_search";
+const char* const DOCML_SEARCH_PANEL = "search_panel";
 const char* const DOCML_TOOLBAR = "toolbar";
 const char* const DOCML_BROWSER_CONTENTS = "browser_contents";
 const char* const DOCML_BROWSER = "browser";
-const char* const DOCML_LAYOUT_CATEGORY_ALL = "layout_category_all";
-const char* const DOCML_LAYOUT_CATEGORY_SEARCH = "layout_category_find";
-const char* const DOCML_LAYOUT_CATEGORY_SEARCH_NO_SRHPAL = "layout_category_find_no_searchpanel";
+const char* const DOCML_LAYOUT_SEARCH = "layout_find";
+const char* const DOCML_LAYOUT_SEARCH_NO_SRHPAL = "layout_find_no_searchpanel";
 const char* const DOCML_GROUPBOX = "groupBox";
-const char* const DOCML_LAYOUT_CATEGORY_SEARCH_NO_MATCH = "layout_category_find_no_match";
-const char* const DOCML_LAYOUT_CATEGORY_SEARCH_NO_SRHPAL_NO_MATCH = "layout_category_find_no_searchpanel_no_match";
+const char* const DOCML_LAYOUT_SEARCH_NO_MATCH = "layout_find_no_match";
+const char* const DOCML_LAYOUT_SEARCH_NO_SRHPAL_NO_MATCH = "layout_find_no_searchpanel_no_match";
 const char* const DOCML_NO_MATCH_LABEL = "no_match_label";
+const char* const DOCML_ACTION_EXPAND_COLLAPSE_ALL = "action_expand_collapse_all";
 
 
 // enum
@@ -80,7 +84,9 @@
 enum HelpViewName
 {
     HelpViewCategory = 0,
-    HelpViewContents
+	HelpViewKeyword,
+    HelpViewContents,
+	PreviousView = 100
 };
 
 enum HelpItemRole