--- a/csxhelp/HelpEngine/src/CSXHHTMLContentParser.cpp	Mon Mar 15 12:39:40 2010 +0200
+++ b/csxhelp/HelpEngine/src/CSXHHTMLContentParser.cpp	Wed Mar 31 21:16:13 2010 +0300
@@ -23,7 +23,7 @@
 #include "CSXHHelpDataBase.h"
 #include "csxhconstants.h"
 #include "CSXHRuntimeIndexing.h"
-#include "csxhviewids.h"
+#include "CSXHViewIDs.h"
 
 #include <eikenv.h> 
 #include <utf.h>

--- a/csxhelp/data/CsHelp.rss	Mon Mar 15 12:39:40 2010 +0200
+++ b/csxhelp/data/CsHelp.rss	Wed Mar 31 21:16:13 2010 +0300
@@ -118,7 +118,7 @@
 RESOURCE AVKON_VIEW r_KywdTOC1List
     {
     menubar = r_CSXH_menubar_KywdTOC1List;
-    cba = r_cshelp_softkeys_options_exit_find;
+    cba = r_cshelp_softkeys_options_back_find;
     }
 
 RESOURCE AVKON_VIEW r_KywdTOC2List
@@ -340,6 +340,28 @@
             }
         };
     }
+
+RESOURCE CBA r_cshelp_softkeys_options_back_find
+    {
+    buttons =
+        {
+        AVKON_CBA_BUTTON
+            {
+            id = EAknSoftkeyOptions;
+            txt = text_softkey_option;
+            },
+        AVKON_CBA_BUTTON
+            {
+            id = EAknSoftkeyBack;
+            txt = text_softkey_back;
+            },
+        AVKON_CBA_BUTTON
+            {
+            id = ECSXHOpenTopicText;
+            txt = qtn_help_msk_find;
+            }
+        };
+    }
 // ---------------------------------------------------------
 //   
 //   r_CSXH_menubar

--- a/csxhelp/src/CSXHGenericView.cpp	Mon Mar 15 12:39:40 2010 +0200
+++ b/csxhelp/src/CSXHGenericView.cpp	Wed Mar 31 21:16:13 2010 +0300
@@ -87,13 +87,26 @@
             {
             CCSXHDocument* doc = static_cast<CCSXHDocument*>(AppUi()->Document());
             if(iUid == KCSXHToc2ViewID)
+            	{
                 doc->SetDisplayAndPrevTopic(doc->GetHelpDataBase()->GetMainTopics());
+            	}
             else if(iUid == KCSXHKywdToc2ViewID)
+            	{
                 doc->SetDisplayAndPrevTopic(doc->GetHelpDataBase()->GetKywdTopics());
+            	}
             else if ( iUid == KCSXHToc1AppHelpsViewID )
+            	{
                 doc->SetDisplayAndPrevTopic( doc->GetHelpDataBase()->GetMainTopics() );
+            	}
             else if ( iUid == KCSXHToc2AppHelpsViewID )
+            	{
                 doc->SetDisplayAndPrevTopic( doc->GetHelpDataBase()->GetAppHelpsTopics() );
+            	}
+            else if ( iUid == KCSXHKywdToc1ViewID )
+            	{
+                doc->SetDisplayAndPrevTopic( doc->GetHelpDataBase()->GetMainTopics() );
+            	}
+            	
             
             AppUi()->HandleCommandL(ECSXHOpenItem); 
             }

--- a/csxhelp/src/CSXHHtmlTopicContainer.cpp	Mon Mar 15 12:39:40 2010 +0200
+++ b/csxhelp/src/CSXHHtmlTopicContainer.cpp	Wed Mar 31 21:16:13 2010 +0300
@@ -30,8 +30,8 @@
 
 
 #include <brctlinterface.h>
-#include <BrowserLauncher.h>
-#include <BrCtlDefs.h>
+#include <browserlauncher.h>
+#include <brctldefs.h>
 
 #include <coemain.h>
 #include <AknUtils.h>

--- a/csxhelp/src/CSXHHtmlTopicView.cpp	Mon Mar 15 12:39:40 2010 +0200
+++ b/csxhelp/src/CSXHHtmlTopicView.cpp	Wed Mar 31 21:16:13 2010 +0300
@@ -33,7 +33,7 @@
 
 #include <avkon.hrh>
 #include <aknnotewrappers.h> 
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 #include <f32file.h>
 #include <apgcli.h>
 #include <akntitle.h>