Index: Ringtoets/Demo/src/Ringtoets.Demo/Properties/Resources.Designer.cs
===================================================================
diff -u -r79b1cdcf9dcdbe4c015f5fc6b42605a00386b120 -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Demo/src/Ringtoets.Demo/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 79b1cdcf9dcdbe4c015f5fc6b42605a00386b120)
+++ Ringtoets/Demo/src/Ringtoets.Demo/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -70,11 +70,11 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Demo project.
+        ///   Looks up a localized string similar to Demo dijk traject.
         /// </summary>
-        public static string DemoProject {
+        public static string DemoDikeAssessmentSection {
             get {
-                return ResourceManager.GetString("DemoProject", resourceCulture);
+                return ResourceManager.GetString("DemoDikeAssessmentSection", resourceCulture);
             }
         }
         
Index: Ringtoets/Demo/src/Ringtoets.Demo/Properties/Resources.resx
===================================================================
diff -u -r79b1cdcf9dcdbe4c015f5fc6b42605a00386b120 -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Demo/src/Ringtoets.Demo/Properties/Resources.resx	(.../Resources.resx)	(revision 79b1cdcf9dcdbe4c015f5fc6b42605a00386b120)
+++ Ringtoets/Demo/src/Ringtoets.Demo/Properties/Resources.resx	(.../Resources.resx)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -120,8 +120,8 @@
   <data name="Demo" xml:space="preserve">
     <value>Demo</value>
   </data>
-  <data name="DemoProject" xml:space="preserve">
-    <value>Demo project</value>
+  <data name="DemoDikeAssessmentSection" xml:space="preserve">
+    <value>Demo dijk traject</value>
   </data>
   <data name="ExampleData" xml:space="preserve">
     <value>Voorbeeld data</value>
Index: Ringtoets/Demo/src/Ringtoets.Demo/Ringtoets.Demo.csproj
===================================================================
diff -u -r31d7b5552adb7b89eaf1552855f88c5df887e4f9 -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Demo/src/Ringtoets.Demo/Ringtoets.Demo.csproj	(.../Ringtoets.Demo.csproj)	(revision 31d7b5552adb7b89eaf1552855f88c5df887e4f9)
+++ Ringtoets/Demo/src/Ringtoets.Demo/Ringtoets.Demo.csproj	(.../Ringtoets.Demo.csproj)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -124,6 +124,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml
===================================================================
diff -u -rfca19abd4b2c9638276f02f1a748874c5043d2e6 -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml	(.../RingtoetsDemoProjectRibbon.xaml)	(revision fca19abd4b2c9638276f02f1a748874c5043d2e6)
+++ Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml	(.../RingtoetsDemoProjectRibbon.xaml)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -13,7 +13,7 @@
     <fluent:Ribbon x:Name="RingtoetsDemoProjectRibbonControl" x:FieldModifier="private">
         <fluent:RibbonTabItem Header="{x:Static resx:Resources.Demo}" fluent:KeyTip.Keys="D">
             <fluent:RibbonGroupBox Header="{x:Static resx:Resources.ExampleData}" fluent:KeyTip.Keys="E" Height="Auto">
-                <fluent:Button x:Name="AddNewDemoProjectButton" LargeIcon="pack://application:,,,/Ringtoets.Demo;component/Resources/folder-horizontal_large.png" Icon="pack://application:,,,/Ringtoets.Demo;component/Resources/folder-horizontal.png" Header="{x:Static resx:Resources.DemoProject}" SizeDefinition="Large,Medium,Small" Margin="20,0" KeyTip="P" Click="AddNewRingtoetsDemoProjectButton_Click"/>
+                <fluent:Button x:Name="AddNewDemoProjectButton" LargeIcon="pack://application:,,,/Ringtoets.Demo;component/Resources/folder-horizontal_large.png" Icon="pack://application:,,,/Ringtoets.Demo;component/Resources/folder-horizontal.png" Header="{x:Static resx:Resources.DemoDikeAssessmentSection}" SizeDefinition="Large,Medium,Small" Margin="20,0" KeyTip="P" Click="AddNewRingtoetsDemoProjectButton_Click"/>
             </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
     </fluent:Ribbon>
Fisheye: Tag 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionNodePresenter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/DikeAssessmentSectionNodePresenter.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/DikeAssessmentSectionNodePresenter.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/DikeAssessmentSectionNodePresenter.cs	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -0,0 +1,111 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+using Core.Common.Base;
+using Core.Common.Controls;
+using Core.Common.Utils.Collections;
+
+using Ringtoets.Integration.Data;
+
+using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
+
+namespace Ringtoets.Integration.Forms.NodePresenters
+{
+    /// <summary>
+    /// Node presenter for <see cref="Ringtoets.Integration.Data.DikeAssessmentSection"/> items in the tree view.
+    /// </summary>
+    public class DikeAssessmentSectionNodePresenter : ITreeNodePresenter
+    {
+        public ITreeView TreeView { get; set; }
+
+        public Type NodeTagType
+        {
+            get
+            {
+                return typeof(DikeAssessmentSection);
+            }
+        }
+
+        public void UpdateNode(ITreeNode parentNode, ITreeNode node, object nodeData)
+        {
+            var assessmentSection = (DikeAssessmentSection)nodeData;
+            node.Text = assessmentSection.Name;
+            node.Image = RingtoetsFormsResources.AssessmentSectionFolderIcon;
+        }
+
+        public IEnumerable GetChildNodeObjects(object parentNodeData, ITreeNode node)
+        {
+            var assessmentSection = (DikeAssessmentSection)parentNodeData;
+            if (assessmentSection.PipingFailureMechanism != null)
+            {
+                yield return assessmentSection.PipingFailureMechanism;
+            }
+        }
+
+        public bool CanRenameNode(ITreeNode node)
+        {
+            return true;
+        }
+
+        public bool CanRenameNodeTo(ITreeNode node, string newName)
+        {
+            return true;
+        }
+
+        public void OnNodeRenamed(object nodeData, string newName)
+        {
+            var assessmentSection = (DikeAssessmentSection)nodeData;
+
+            assessmentSection.Name = newName;
+            assessmentSection.NotifyObservers();
+        }
+
+        public void OnNodeChecked(ITreeNode node) {}
+
+        public DragOperations CanDrag(object nodeData)
+        {
+            return DragOperations.None;
+        }
+
+        public DragOperations CanDrop(object item, ITreeNode sourceNode, ITreeNode targetNode, DragOperations validOperations)
+        {
+            return DragOperations.None;
+        }
+
+        public bool CanInsert(object item, ITreeNode sourceNode, ITreeNode targetNode)
+        {
+            return false;
+        }
+
+        public void OnDragDrop(object item, object sourceParentNodeData, object targetParentNodeData, DragOperations operation, int position) {}
+
+        public void OnNodeSelected(object nodeData) {}
+
+        public ContextMenuStrip GetContextMenu(ITreeNode sender, object nodeData)
+        {
+            return null;
+        }
+
+        public void OnPropertyChanged(object sender, ITreeNode node, PropertyChangedEventArgs e) {}
+
+        public void OnCollectionChanged(object sender, NotifyCollectionChangingEventArgs e) {}
+
+        public bool CanRemove(object parentNodeData, object nodeData)
+        {
+            return true;
+        }
+
+        public bool RemoveNodeData(object parentNodeData, object nodeData)
+        {
+            var parentProject = (Project) parentNodeData;
+            var assessmentSection = (DikeAssessmentSection) nodeData;
+
+            parentProject.Items.Remove(assessmentSection);
+            parentProject.NotifyObservers();
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -61,24 +61,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Naam van het toetstraject..
-        /// </summary>
-        internal static string AssessmentSection_Name_Description {
-            get {
-                return ResourceManager.GetString("AssessmentSection_Name_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Naam.
-        /// </summary>
-        internal static string AssessmentSection_Name_DisplayName {
-            get {
-                return ResourceManager.GetString("AssessmentSection_Name_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap AssessmentSectionFolderIcon {
@@ -89,52 +71,42 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Voeg piping faalmechanisme toe.
+        ///   Looks up a localized string similar to Algemeen.
         /// </summary>
-        internal static string AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism {
+        internal static string Categories_General {
             get {
-                return ResourceManager.GetString("AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism", resourceCulture);
+                return ResourceManager.GetString("Categories_General", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Start een nieuwe piping toetsing voor dit project..
+        ///   Looks up a localized string similar to Dijktraject.
         /// </summary>
-        internal static string AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip {
+        internal static string DikeAssessmentSection_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip", resourceCulture);
+                return ResourceManager.GetString("DikeAssessmentSection_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kan geen nieuwe piping toetsing starten, omdat er al een piping toetsing is gestart voor dit project..
+        ///   Looks up a localized string similar to Naam van het dijktraject..
         /// </summary>
-        internal static string AssessmentSectionNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_Tooltip {
+        internal static string DikeAssessmentSection_Name_Description {
             get {
-                return ResourceManager.GetString("AssessmentSectionNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_T" +
-                        "ooltip", resourceCulture);
+                return ResourceManager.GetString("DikeAssessmentSection_Name_Description", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Toetstraject.
+        ///   Looks up a localized string similar to Naam.
         /// </summary>
-        internal static string AssessmentSectionProperties_DisplayName {
+        internal static string DikeAssessmentSection_Name_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionProperties_DisplayName", resourceCulture);
+                return ResourceManager.GetString("DikeAssessmentSection_Name_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Algemeen.
-        /// </summary>
-        internal static string Categories_General {
-            get {
-                return ResourceManager.GetString("Categories_General", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap FailureMechanismIcon {
@@ -143,14 +115,5 @@
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Algemeen.
-        /// </summary>
-        internal static string Ringtoets_Category {
-            get {
-                return ResourceManager.GetString("Ringtoets_Category", resourceCulture);
-            }
-        }
     }
 }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -117,16 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Ringtoets_Category" xml:space="preserve">
-    <value>Algemeen</value>
+  <data name="DikeAssessmentSection_DisplayName" xml:space="preserve">
+    <value>Dijktraject</value>
   </data>
-  <data name="AssessmentSectionProperties_DisplayName" xml:space="preserve">
-    <value>Toetstraject</value>
+  <data name="DikeAssessmentSection_Name_Description" xml:space="preserve">
+    <value>Naam van het dijktraject.</value>
   </data>
-  <data name="AssessmentSection_Name_Description" xml:space="preserve">
-    <value>Naam van het toetstraject.</value>
-  </data>
-  <data name="AssessmentSection_Name_DisplayName" xml:space="preserve">
+  <data name="DikeAssessmentSection_Name_DisplayName" xml:space="preserve">
     <value>Naam</value>
   </data>
   <data name="Categories_General" xml:space="preserve">
@@ -136,15 +133,6 @@
   <data name="AssessmentSectionFolderIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism" xml:space="preserve">
-    <value>Voeg piping faalmechanisme toe</value>
-  </data>
-  <data name="AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip" xml:space="preserve">
-    <value>Start een nieuwe piping toetsing voor dit project.</value>
-  </data>
-  <data name="AssessmentSectionNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_Tooltip" xml:space="preserve">
-    <value>Kan geen nieuwe piping toetsing starten, omdat er al een piping toetsing is gestart voor dit project.</value>
-  </data>
   <data name="FailureMechanismIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\control_equalizer_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
Fisheye: Tag 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssessmentSectionProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DikeAssessmentSectionProperties.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DikeAssessmentSectionProperties.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DikeAssessmentSectionProperties.cs	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -0,0 +1,31 @@
+using Core.Common.Gui;
+using Core.Common.Utils;
+
+using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.Properties;
+
+namespace Ringtoets.Integration.Forms.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="DikeAssessmentSection"/> for properties panel.
+    /// </summary>
+    [ResourcesDisplayName(typeof(Resources), "DikeAssessmentSection_DisplayName")]
+    public class DikeAssessmentSectionProperties : ObjectProperties<DikeAssessmentSection>
+    {
+        [ResourcesCategory(typeof(Resources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "DikeAssessmentSection_Name_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "DikeAssessmentSection_Name_Description")]
+        public string Name
+        {
+            get
+            {
+                return data.Name;
+            }
+            set
+            {
+                data.Name = value;
+                data.NotifyObservers();
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r29573f70a58e541743a83a5c5c0d2d4febb7ff1c -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 29573f70a58e541743a83a5c5c0d2d4febb7ff1c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -54,14 +54,14 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="NodePresenters\AssessmentSectionNodePresenter.cs" />
+    <Compile Include="NodePresenters\DikeAssessmentSectionNodePresenter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="PropertyClasses\AssessmentSectionProperties.cs" />
+    <Compile Include="PropertyClasses\DikeAssessmentSectionProperties.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -97,6 +97,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -r29573f70a58e541743a83a5c5c0d2d4febb7ff1c -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision 29573f70a58e541743a83a5c5c0d2d4febb7ff1c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -40,11 +40,23 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Windows.Shell, Version=3.5.41019.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Microsoft.Windows.Shell.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -60,6 +72,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RingtoetsApplicationPlugin.cs" />
     <Compile Include="RingtoetsGuiPlugin.cs" />
+    <Compile Include="RingtoetsRibbon.xaml.cs">
+      <DependentUpon>RingtoetsRibbon.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -78,6 +93,10 @@
       <Project>{c90b77da-e421-43cc-b82e-529651bc21ac}</Project>
       <Name>Core.Common.Version</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Forms\Ringtoets.Common.Forms.csproj">
+      <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
+      <Name>Ringtoets.Common.Forms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Piping\src\Ringtoets.Piping.Data\Ringtoets.Piping.Data.csproj">
       <Project>{ce994cc9-6f6a-48ac-b4be-02c30a21f4db}</Project>
       <Name>Ringtoets.Piping.Data</Name>
@@ -103,6 +122,15 @@
       <Name>Ringtoets.Integration.Forms</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="RingtoetsRibbon.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsApplicationPlugin.cs
===================================================================
diff -u -r0d5ba527995a1b3de4041babb246d675e305d0c1 -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsApplicationPlugin.cs	(.../RingtoetsApplicationPlugin.cs)	(revision 0d5ba527995a1b3de4041babb246d675e305d0c1)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsApplicationPlugin.cs	(.../RingtoetsApplicationPlugin.cs)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -4,6 +4,7 @@
 
 using Ringtoets.Integration.Data;
 
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin
@@ -17,8 +18,8 @@
         {
             yield return new DataItemInfo<DikeAssessmentSection>
             {
-                Name = RingtoetsFormsResources.AssessmentSectionProperties_DisplayName,
-                Category = RingtoetsFormsResources.Ringtoets_Category,
+                Name = RingtoetsFormsResources.DikeAssessmentSection_DisplayName,
+                Category = RingtoetsCommonFormsResources.Ringtoets_Category,
                 Image = RingtoetsFormsResources.AssessmentSectionFolderIcon,
                 CreateData = owner => new DikeAssessmentSection()
             };
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r0d5ba527995a1b3de4041babb246d675e305d0c1 -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 0d5ba527995a1b3de4041babb246d675e305d0c1)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -7,7 +7,6 @@
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.NodePresenters;
 using Ringtoets.Integration.Forms.PropertyClasses;
-using Ringtoets.Piping.Plugin;
 
 namespace Ringtoets.Integration.Plugin
 {
@@ -20,18 +19,18 @@
         {
             get
             {
-                return new PipingRibbon();
+                return new RingtoetsRibbon();
             }
         }
 
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
-            yield return new PropertyInfo<DikeAssessmentSection, AssessmentSectionProperties>();
+            yield return new PropertyInfo<DikeAssessmentSection, DikeAssessmentSectionProperties>();
         }
 
         public override IEnumerable<ITreeNodePresenter> GetProjectTreeViewNodePresenters()
         {
-            yield return new AssessmentSectionNodePresenter();
+            yield return new DikeAssessmentSectionNodePresenter();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -0,0 +1,14 @@
+<UserControl x:Class="Ringtoets.Integration.Plugin.RingtoetsRibbon"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:fluent="clr-namespace:Fluent;assembly=Fluent"
+             mc:Ignorable="d" Width="686.4" Height="168" Background="White">
+    <UserControl.Resources>
+        <ResourceDictionary Source="/Fluent;Component/Themes/generic.xaml"/>
+    </UserControl.Resources>
+    <fluent:Ribbon x:Name="RingtoetsRibbonControl" x:FieldModifier="private">
+
+    </fluent:Ribbon>
+</UserControl>
Fisheye: Tag 47ddc19835a668e6c1c5edad4a7bec58e2200c10 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 47ddc19835a668e6c1c5edad4a7bec58e2200c10 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Plugin/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionNodePresenterTest.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionNodePresenterTest.cs	(.../AssessmentSectionNodePresenterTest.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionNodePresenterTest.cs	(.../AssessmentSectionNodePresenterTest.cs)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -22,7 +22,7 @@
         public void DefaultConstructor_ExpectedValues()
         {
             // Call
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Assert
             Assert.IsInstanceOf<ITreeNodePresenter>(nodePresenter);
@@ -40,7 +40,7 @@
             var projectNode = mocks.Stub<ITreeNode>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             var assessmentSection = new DikeAssessmentSection
             {
@@ -64,7 +64,7 @@
             var nodeMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             var assessmentSection = new DikeAssessmentSection();
 
@@ -85,7 +85,7 @@
             var nodeMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             var renameAllowed = nodePresenter.CanRenameNode(nodeMock);
@@ -103,7 +103,7 @@
             var nodeMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             var renameAllowed = nodePresenter.CanRenameNodeTo(nodeMock, "<Insert New Name Here>");
@@ -122,7 +122,7 @@
             assessmentSectionObserver.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             var assessmentSection = new DikeAssessmentSection();
             assessmentSection.Attach(assessmentSectionObserver);
@@ -144,7 +144,7 @@
             var nodeMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             nodePresenter.OnNodeChecked(nodeMock);
@@ -161,7 +161,7 @@
             var dataMock = mocks.StrictMock<object>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             DragOperations dragAllowed = nodePresenter.CanDrag(dataMock);
@@ -181,7 +181,7 @@
             var targetMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             DragOperations dropAllowed = nodePresenter.CanDrop(dataMock, sourceMock, targetMock, DragOperations.Move);
@@ -201,7 +201,7 @@
             var targetMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             bool insertionAllowed = nodePresenter.CanInsert(dataMock, sourceMock, targetMock);
@@ -221,7 +221,7 @@
             var targetParentNodeDataMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             nodePresenter.OnDragDrop(dataMock, sourceParentNodeMock, targetParentNodeDataMock, DragOperations.Move, 2);
@@ -238,7 +238,7 @@
             var dataMock = mocks.StrictMock<object>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             nodePresenter.OnNodeSelected(dataMock);
@@ -256,7 +256,7 @@
             var assessmentSection = new DikeAssessmentSection();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             var contextMenu = nodePresenter.GetContextMenu(nodeMock, assessmentSection);
@@ -276,7 +276,7 @@
             var eventArgsMock = mocks.StrictMock<PropertyChangedEventArgs>("");
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             nodePresenter.OnPropertyChanged(dataMock, nodeMock, eventArgsMock);
@@ -294,7 +294,7 @@
             var eventArgsMock = mocks.StrictMock<NotifyCollectionChangingEventArgs>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             nodePresenter.OnCollectionChanged(dataMock, eventArgsMock);
@@ -312,7 +312,7 @@
             var nodeMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             bool removalAllowed = nodePresenter.CanRemove(dataMock, nodeMock);
@@ -339,7 +339,7 @@
             project.Items.Add(assessmentSection);
             project.Attach(observerMock);
 
-            var nodePresenter = new AssessmentSectionNodePresenter();
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
 
             // Call
             bool removalSuccesful = nodePresenter.RemoveNodeData(project, assessmentSection);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs	(.../AssessmentSectionPropertiesTest.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs	(.../AssessmentSectionPropertiesTest.cs)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -17,7 +17,7 @@
         public void DefaultConstructor_ExpectedValues()
         {
             // Call
-            var properties = new AssessmentSectionProperties();
+            var properties = new DikeAssessmentSectionProperties();
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<DikeAssessmentSection>>(properties);
@@ -33,7 +33,7 @@
                 Name = "Test"
             };
 
-            var properties = new AssessmentSectionProperties
+            var properties = new DikeAssessmentSectionProperties
             {
                 Data = assessmentSection
             };
@@ -54,7 +54,7 @@
             var assessmentSection = new DikeAssessmentSection();
             assessmentSection.Attach(projectObserver);
 
-            var properties = new AssessmentSectionProperties
+            var properties = new DikeAssessmentSectionProperties
             {
                 Data = assessmentSection
             };
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -r29573f70a58e541743a83a5c5c0d2d4febb7ff1c -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 29573f70a58e541743a83a5c5c0d2d4febb7ff1c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -40,6 +40,14 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Windows.Shell, Version=3.5.41019.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Microsoft.Windows.Shell.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\..\lib\nunit.framework.dll</HintPath>
     </Reference>
@@ -51,6 +59,10 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -63,6 +75,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RingtoetsApplicationPluginTest.cs" />
     <Compile Include="RingtoetsGuiPluginTest.cs" />
+    <Compile Include="RingtoetsRibbonTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -114,6 +127,9 @@
       <Name>Ringtoets.Integration.Plugin</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsApplicationPluginTest.cs
===================================================================
diff -u -r0d5ba527995a1b3de4041babb246d675e305d0c1 -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsApplicationPluginTest.cs	(.../RingtoetsApplicationPluginTest.cs)	(revision 0d5ba527995a1b3de4041babb246d675e305d0c1)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsApplicationPluginTest.cs	(.../RingtoetsApplicationPluginTest.cs)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -35,7 +35,7 @@
             Assert.AreEqual(1, dataItemDefinitions.Length);
 
             DataItemInfo AssessmentSectionDataItemDefinition = dataItemDefinitions.Single(did => did.ValueType == typeof(DikeAssessmentSection));
-            Assert.AreEqual("Toetstraject", AssessmentSectionDataItemDefinition.Name);
+            Assert.AreEqual("Dijktraject", AssessmentSectionDataItemDefinition.Name);
             Assert.AreEqual("Algemeen", AssessmentSectionDataItemDefinition.Category);
             Assert.AreEqual(16, AssessmentSectionDataItemDefinition.Image.Width);
             Assert.AreEqual(16, AssessmentSectionDataItemDefinition.Image.Height);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs
===================================================================
diff -u -r0d5ba527995a1b3de4041babb246d675e305d0c1 -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 0d5ba527995a1b3de4041babb246d675e305d0c1)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -13,11 +13,6 @@
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.NodePresenters;
 using Ringtoets.Integration.Forms.PropertyClasses;
-using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Plugin;
-using Ringtoets.Piping.Forms.NodePresenters;
-using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.Forms.PropertyClasses;
 
 namespace Ringtoets.Integration.Plugin.Test
 {
@@ -33,7 +28,7 @@
             {
                 // assert
                 Assert.IsInstanceOf<GuiPlugin>(ringtoetsGuiPlugin);
-                Assert.IsInstanceOf<PipingRibbon>(ringtoetsGuiPlugin.RibbonCommandHandler);
+                Assert.IsInstanceOf<RingtoetsRibbon>(ringtoetsGuiPlugin.RibbonCommandHandler);
             }
         }
 
@@ -50,7 +45,7 @@
                 Assert.AreEqual(1, propertyInfos.Length);
 
                 var assessmentSectionProperties = propertyInfos.Single(pi => pi.ObjectType == typeof(DikeAssessmentSection));
-                Assert.AreEqual(typeof(AssessmentSectionProperties), assessmentSectionProperties.PropertyType);
+                Assert.AreEqual(typeof(DikeAssessmentSectionProperties), assessmentSectionProperties.PropertyType);
                 Assert.IsNull(assessmentSectionProperties.AdditionalDataCheck);
                 Assert.IsNull(assessmentSectionProperties.GetObjectPropertiesData);
                 Assert.IsNull(assessmentSectionProperties.AfterCreate);
@@ -78,7 +73,7 @@
 
                 // assert
                 Assert.AreEqual(1, nodePresenters.Length);
-                Assert.IsTrue(nodePresenters.Any(np => np is AssessmentSectionNodePresenter));
+                Assert.IsTrue(nodePresenters.Any(np => np is DikeAssessmentSectionNodePresenter));
             }
             mocks.VerifyAll();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsRibbonTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsRibbonTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsRibbonTest.cs	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -0,0 +1,54 @@
+using System;
+
+using Core.Common.Gui.Forms;
+
+using Fluent;
+
+using NUnit.Framework;
+
+namespace Ringtoets.Integration.Plugin.Test
+{
+    [TestFixture]
+    public class RingtoetsRibbonTest
+    {
+        [Test]
+        [STAThread] // Due to creating fluent ribbon
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // Call
+            var ribbon = new RingtoetsRibbon();
+
+            // Assert
+            Assert.IsInstanceOf<IRibbonCommandHandler>(ribbon);
+            CollectionAssert.IsEmpty(ribbon.Commands);
+        }
+
+        [Test]
+        [STAThread] // Due to creating fluent Ribbon
+        public void GetRibbonControl_Always_ReturnRibbon()
+        {
+            // Setup
+            var ribbon = new RingtoetsRibbon();
+
+            // Call
+            var control = ribbon.GetRibbonControl();
+
+            // Assert
+            Assert.IsInstanceOf<Ribbon>(control);
+        }
+
+        [Test]
+        [STAThread] // Due to creating fluent Ribbon
+        public void IsContextualTabVisible_Always_ReturnFalse()
+        {
+            // Setup
+            var ribbon = new RingtoetsRibbon();
+
+            // Call
+            var isVisible = ribbon.IsContextualTabVisible(null, null);
+
+            // Assert
+            Assert.IsFalse(isVisible);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/packages.config
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/packages.config	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/packages.config	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fluent.Ribbon" version="3.4.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: packages/repositories.config
===================================================================
diff -u -r79b1cdcf9dcdbe4c015f5fc6b42605a00386b120 -r1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc
--- packages/repositories.config	(.../repositories.config)	(revision 79b1cdcf9dcdbe4c015f5fc6b42605a00386b120)
+++ packages/repositories.config	(.../repositories.config)	(revision 1e08e4d88dc94cddaf7cbd38bdc2b42f263225bc)
@@ -7,7 +7,6 @@
   <repository path="..\Core\Common\src\Core.Common.Utils\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Base.Tests\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Integration.Tests\packages.config" />
-  <repository path="..\Core\Common\test\Core.Common.IntegrationTests\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Tests\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Utils.Tests\packages.config" />
   <repository path="..\Core\GIS\src\Core.GIS.NetTopologySuite.Extensions\packages.config" />
@@ -22,6 +21,8 @@
   <repository path="..\Core\Plugins\src\Core.Plugins.SharpMapGis.Gui\packages.config" />
   <repository path="..\Core\Plugins\src\Core.Plugins.SharpMapGis\packages.config" />
   <repository path="..\Ringtoets\Demo\src\Ringtoets.Demo\packages.config" />
+  <repository path="..\Ringtoets\Integration\src\Ringtoets.Integration.Plugin\packages.config" />
+  <repository path="..\Ringtoets\Integration\test\Ringtoets.Integration.Plugin.Test\packages.config" />
   <repository path="..\Ringtoets\Piping\src\Ringtoets.Piping.Calculation\packages.config" />
   <repository path="..\Ringtoets\Piping\src\Ringtoets.Piping.Data\packages.config" />
   <repository path="..\Ringtoets\Piping\src\Ringtoets.Piping.IO\packages.config" />