diff --git a/data/resources/layouts/Debug.xml b/data/resources/layouts/Debug.xml
index a8eec1a768..9f9ef0663e 100644
--- a/data/resources/layouts/Debug.xml
+++ b/data/resources/layouts/Debug.xml
@@ -2,9 +2,9 @@
 <!-- DockPanel configuration file. Author: Weifen Luo, all rights reserved. -->
 <!-- !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! -->
 <DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="0">
-  <Contents Count="31">
+  <Contents Count="32">
     <Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
-    <Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
+    <Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
     <Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.SideBarView" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
     <Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
@@ -32,8 +32,9 @@
     <Content ID="26" PersistString="SharpReportAddin.FieldsExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="27" PersistString="ICSharpCode.UnitTesting.PadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="28" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
-    <Content ID="29" PersistString="SharpDbTools.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
+    <Content ID="29" PersistString="SharpServerTools.Forms.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="30" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
+    <Content ID="31" PersistString="SharpReportAddin.ReportExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
   </Contents>
   <Panes Count="7">
     <Pane ID="0" DockState="DockLeft" ActiveContent="0">
diff --git a/data/resources/layouts/Default.xml b/data/resources/layouts/Default.xml
index 173e46b8e1..25a7c69ddc 100644
--- a/data/resources/layouts/Default.xml
+++ b/data/resources/layouts/Default.xml
@@ -2,9 +2,9 @@
 <!-- DockPanel configuration file. Author: Weifen Luo, all rights reserved. -->
 <!-- !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! -->
 <DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="-1">
-  <Contents Count="31">
+  <Contents Count="32">
     <Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
-    <Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
+    <Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
     <Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.SideBarView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
     <Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
     <Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
@@ -32,8 +32,9 @@
     <Content ID="26" PersistString="SharpReportAddin.FieldsExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="27" PersistString="ICSharpCode.UnitTesting.PadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="28" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
-    <Content ID="29" PersistString="SharpDbTools.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
+    <Content ID="29" PersistString="SharpServerTools.Forms.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="30" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
+    <Content ID="31" PersistString="SharpReportAddin.ReportExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
   </Contents>
   <Panes Count="5">
     <Pane ID="0" DockState="DockRight" ActiveContent="6">
diff --git a/data/resources/layouts/Plain.xml b/data/resources/layouts/Plain.xml
index cf1c75bdc8..ff39833c5f 100644
--- a/data/resources/layouts/Plain.xml
+++ b/data/resources/layouts/Plain.xml
@@ -2,9 +2,9 @@
 <!-- DockPanel configuration file. Author: Weifen Luo, all rights reserved. -->
 <!-- !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! -->
 <DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="-1">
-  <Contents Count="31">
+  <Contents Count="32">
     <Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
-    <Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
+    <Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.SideBarView" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
@@ -32,8 +32,9 @@
     <Content ID="26" PersistString="SharpReportAddin.FieldsExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="27" PersistString="ICSharpCode.UnitTesting.PadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="28" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
-    <Content ID="29" PersistString="SharpDbTools.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
+    <Content ID="29" PersistString="SharpServerTools.Forms.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
     <Content ID="30" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
+    <Content ID="31" PersistString="SharpReportAddin.ReportExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
   </Contents>
   <Panes Count="5">
     <Pane ID="0" DockState="DockRight" ActiveContent="-1">