--- a/core/com.nokia.carbide.discovery.ui/plugin.properties	Wed Sep 29 11:13:18 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/plugin.properties	Wed Sep 29 15:13:47 2010 -0500
@@ -10,7 +10,14 @@
 kits.title = Kits
 kits.tooltip = Installed SDKs
 install.layer.title = Install Extensions
-wrenchscience.title = Wrench Science
+tools.layer.title = Tools Blog
 creatingcarbide.title = Creating Carbide
 Export.desc = Export a set of installed features to a file that can be imported from a different installation
-Import.desc = Import a set of installed features from an exported file and perform installation of the features
\ No newline at end of file
+Import.desc = Import a set of installed features from an exported file and perform installation of the features
+main.layer.title = Main Page
+carbidewiki.layer.title = Carbide Wiki
+support.layer.title = Carbide Support
+bugs.layer.title = Report Bugs
+platsim.layer.title = PlatSim Wiki
+wizard.name = Installed Feature Configuration
+wizard1.name = Installed Feature Configuration
\ No newline at end of file

--- a/core/com.nokia.carbide.discovery.ui/plugin.xml	Wed Sep 29 11:13:18 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/plugin.xml	Wed Sep 29 15:13:47 2010 -0500
@@ -84,12 +84,18 @@
           class="com.nokia.carbide.internal.discovery.ui.view.HomePage"
           order="1"
           pageId="com.nokia.carbide.discovery.ui.homePage"
-          title="Carbide (S60 Wiki)">
+          title="%main.layer.title">
+    </portalPageLayer>
+    <portalPageLayer
+          class="com.nokia.carbide.internal.discovery.ui.view.CarbideWikiPage"
+          order="5"
+          pageId="com.nokia.carbide.discovery.ui.homePage"
+          title="%carbidewiki.layer.title">
     </portalPageLayer>
     <portalPageLayer
           class="com.nokia.carbide.internal.discovery.ui.view.SupportPage"
           pageId="com.nokia.carbide.discovery.ui.supportPage"
-          title="Carbide Support">
+          title="%support.layer.title">
     </portalPageLayer>
     <portalPageLayer
           class="com.nokia.carbide.internal.discovery.ui.view.InstallExtensionsPortalExtension"
@@ -101,35 +107,19 @@
           class="com.nokia.carbide.internal.discovery.ui.view.WrenchSciencePage"
           order="30"
           pageId="com.nokia.carbide.discovery.ui.homePage"
-          title="%wrenchscience.title">
+          title="%tools.layer.title">
     </portalPageLayer>
-<!-- Pulling this out for now because it doesn't work with the proxypac auto-proxy config script
-    <portalPageLayer
-          class="com.nokia.carbide.internal.discovery.ui.view.CreatingCarbidePage"
-          order="25"
-          pageId="com.nokia.carbide.discovery.ui.homePage"
-          title="%creatingcarbide.title">
-    </portalPageLayer>
--->
     <portalPageLayer
           class="com.nokia.carbide.internal.discovery.ui.view.BugzillaPage"
           order="100"
           pageId="com.nokia.carbide.discovery.ui.homePage"
-          title="Report Bugs">
+          title="%bugs.layer.title">
     </portalPageLayer>
-<!--    
-	<portalPageLayer
-          class="com.nokia.carbide.internal.discovery.ui.view.PulsarPageLayer"
-          order="25"
-          pageId="com.nokia.carbide.discovery.ui.kitsPage"
-          title="Install SDKs">
-    </portalPageLayer>
--->
     <portalPageLayer
           class="com.nokia.carbide.internal.discovery.ui.view.InstallPlatSimPage"
           order="10"
           pageId="com.nokia.carbide.discovery.ui.homePage"
-          title="Install PlatSim">
+          title="%platsim.layer.title">
     </portalPageLayer>
  </extension>
    <extension
@@ -159,7 +149,7 @@
             class="com.nokia.carbide.internal.discovery.ui.wizard.ExportWizard"
             icon="icons/icon-discovery_exp.png"
             id="com.nokia.carbide.discovery.ui.features.exportWizard"
-            name="Installed Feature Configuration">
+            name="%wizard.name">
          <description>
             %Export.desc
          </description>
@@ -172,7 +162,7 @@
             class="com.nokia.carbide.internal.discovery.ui.wizard.ImportWizard"
             icon="icons/icon-discovery.png"
             id="com.nokia.carbide.discovery.ui.features.importWizard"
-            name="Installed Feature Configuration">
+            name="%wizard1.name">
          <description>
             %Import.desc
          </description>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/CarbideWikiPage.java	Wed Sep 29 15:13:47 2010 -0500
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+package com.nokia.carbide.internal.discovery.ui.view;
+
+import com.nokia.carbide.internal.discovery.ui.extension.AbstractBrowserPortalPageLayer;
+
+public class CarbideWikiPage extends AbstractBrowserPortalPageLayer {
+}

--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/CreatingCarbidePage.java	Wed Sep 29 11:13:18 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.carbide.internal.discovery.ui.view;
-
-import com.nokia.carbide.internal.discovery.ui.extension.AbstractRSSPortalPageLayer;
-
-public class CreatingCarbidePage extends AbstractRSSPortalPageLayer {
-}

--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/WrenchSciencePage.java	Wed Sep 29 11:13:18 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/WrenchSciencePage.java	Wed Sep 29 15:13:47 2010 -0500
@@ -16,7 +16,7 @@
 */
 package com.nokia.carbide.internal.discovery.ui.view;
 
-import com.nokia.carbide.internal.discovery.ui.extension.AbstractRSSPortalPageLayer;
+import com.nokia.carbide.internal.discovery.ui.extension.AbstractBrowserPortalPageLayer;
 
-public class WrenchSciencePage extends AbstractRSSPortalPageLayer {
+public class WrenchSciencePage extends AbstractBrowserPortalPageLayer {
 }