--- a/connectivity/com.nokia.carbide.remoteConnections/plugin.xml	Wed May 19 15:35:14 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/plugin.xml	Wed May 19 20:42:35 2010 -0500
@@ -24,7 +24,7 @@
          <view
                id="com.nokia.carbide.remoteconnections.view.ConnectionsView"
                relationship="stack"
-               relative="org.eclipse.ui.views.TaskList">
+               relative="org.eclipse.cdt.debug.ui.executablesView">
          </view>
       </perspectiveExtension>
    </extension>

--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/perspective/CarbideCppPerspectiveFactory.java	Wed May 19 15:35:14 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/perspective/CarbideCppPerspectiveFactory.java	Wed May 19 20:42:35 2010 -0500
@@ -18,7 +18,6 @@
 
 import org.eclipse.cdt.internal.ui.wizards.CWizardRegistry;
 import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.search.ui.NewSearchUI;
 import org.eclipse.ui.*;
 import org.eclipse.ui.console.IConsoleConstants;
 import org.eclipse.ui.navigator.resources.ProjectExplorer;
@@ -30,6 +29,8 @@
 	private static final String EXECUTABLES_VIEW_ID = 
 		"org.eclipse.cdt.debug.ui.executablesView"; //$NON-NLS-1$
 	
+	private static final String INSTALL_VIEW_ID = "com.nokia.carbide.discovery.view"; //$NON-NLS-1$
+	
 	private static final String TOP_LEFT = "topLeft"; //$NON-NLS-1$
 	private static final String BOTTOM_LEFT = "bottomLeft"; //$NON-NLS-1$
 	private static final String BOTTOM_RIGHT = "bottom"; //$NON-NLS-1$
@@ -53,11 +54,8 @@
 		// Top left: Resource Navigator view and Bookmarks view placeholder
 		IFolderLayout topLeft = layout.createFolder(TOP_LEFT, IPageLayout.LEFT, 0.25f, editorArea);
 		topLeft.addView(ProjectExplorer.VIEW_ID);
-		topLeft.addView(IPageLayout.ID_RES_NAV);
-		topLeft.addPlaceholder(IPageLayout.ID_BOOKMARKS);
-		
 
-		// Bottom left: Outline view and Property Sheet view
+		// Bottom left: SPN View
 		IFolderLayout bottomLeft = layout.createFolder(BOTTOM_LEFT, IPageLayout.BOTTOM, 0.5f, TOP_LEFT);
 		bottomLeft.addView(SYMBIAN_PROJECT_NAVIGATOR_VIEW_ID);
 
@@ -65,11 +63,6 @@
 		IFolderLayout bottomRight = layout.createFolder(BOTTOM_RIGHT, IPageLayout.BOTTOM, 0.75f, editorArea);
 		bottomRight.addView(IPageLayout.ID_PROBLEM_VIEW);
 		bottomRight.addView(IConsoleConstants.ID_CONSOLE_VIEW);
-		bottomRight.addView(IPageLayout.ID_PROP_SHEET);
-		bottomRight.addView(IPageLayout.ID_TASK_LIST);
-		bottomRight.addView(CUIPlugin.ID_INCLUDE_BROWSER);
-		bottomRight.addView(CUIPlugin.ID_CALL_HIERARCHY);
-		bottomRight.addView(CUIPlugin.ID_TYPE_HIERARCHY);
 		bottomRight.addView(EXECUTABLES_VIEW_ID);
 		
 		// Top right: Outline view
@@ -78,37 +71,27 @@
 
 		// Add action sets for search, c element and navigate
 		layout.addActionSet(CUIPlugin.SEARCH_ACTION_SET_ID);
-		layout.addActionSet(CUIPlugin.ID_CELEMENT_CREATION_ACTION_SET);
 		layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
 		
 		// show view shortcuts
-		layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW); // build console
-		layout.addShowViewShortcut(NewSearchUI.SEARCH_VIEW_ID); // searching
-		// standard workbench
+		layout.addShowViewShortcut(ProjectExplorer.VIEW_ID);
+		layout.addShowViewShortcut(SYMBIAN_PROJECT_NAVIGATOR_VIEW_ID);
 		layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
 		layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
-		layout.addShowViewShortcut(ProjectExplorer.VIEW_ID);
-		layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
-		layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);
-		layout.addShowViewShortcut(SYMBIAN_PROJECT_NAVIGATOR_VIEW_ID);
+		layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW); // build console
+		layout.addShowViewShortcut(EXECUTABLES_VIEW_ID);
+		layout.addShowViewShortcut(INSTALL_VIEW_ID);
 
 		// add show-in contributions
 		layout.addShowInPart(ProjectExplorer.VIEW_ID);
-		layout.addShowInPart(IPageLayout.ID_RES_NAV);
 		
 		addCDTWizardShortcutIdsToLayout(layout);
 	}
 	
 	@SuppressWarnings("restriction")
 	private void addCDTWizardShortcutIdsToLayout(IPageLayout layout) {
-		// cdt project wizard ids
-		String[] ids = CWizardRegistry.getProjectWizardIDs();
-		for (String id : ids) {
-			layout.addNewWizardShortcut(id);
-		}
-		
 		// cdt folder wizard ids
-		ids = CWizardRegistry.getFolderWizardIDs();
+		String[] ids = CWizardRegistry.getFolderWizardIDs();
 		for (String id : ids) {
 			layout.addNewWizardShortcut(id);
 		}

--- a/qt/com.nokia.carbide.cpp.qt.ui/plugin.xml	Wed May 19 15:35:14 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/plugin.xml	Wed May 19 20:42:35 2010 -0500
@@ -51,9 +51,6 @@
                id="com.nokia.carbide.cpp.CarbideCppPerspective">
          </perspectiveShortcut>
          <newWizardShortcut id="com.nokia.carbide.cpp.qt.ui.wizard.NewQtCppProjectWizard"/>
-         <newWizardShortcut id="com.nokia.carbide.cpp.project.ui.wizards.NewProjectWizard"/>
-         <newWizardShortcut id="com.nokia.carbide.cpp.project.ui.wizards.NewClassWizard"/>
-         <newWizardShortcut id="com.nokia.carbide.cpp.project.ui.mmpWizard"/>
       </perspectiveExtension>
    </extension>