Index: Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs
===================================================================
diff -u -rd1a8aeaa05c36dfe386de7586dd129819594ee97 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs	(.../IRibbonCommandHandler.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
+++ Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs	(.../IRibbonCommandHandler.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Core.Common.Controls;
 using Core.Common.Controls.Commands;
+using Fluent;
 
 namespace Core.Common.Gui.Forms
 {
@@ -17,7 +17,7 @@
         /// <summary>
         /// Gets Ribbon control implementation in the gui plugin. Gui will merge it with the existing ribbon.
         /// </summary>
-        object GetRibbonControl();
+        Ribbon GetRibbonControl();
 
         /// <summary>
         /// Called by the gui when ribbon items need to be validated (e.g. enable/disable).
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -rff2af71de67e7a35968e42ae0c0457ffcd76f78c -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision ff2af71de67e7a35968e42ae0c0457ffcd76f78c)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -23,7 +23,6 @@
 using Core.Common.Gui.Theme;
 using Core.Common.Utils;
 using Core.Common.Utils.Events;
-
 using Fluent;
 using log4net;
 using Microsoft.Win32;
@@ -889,7 +888,7 @@
 
             foreach (var ribbonExtension in ribbonCommandHandlers)
             {
-                var ribbonControl = (Ribbon) ribbonExtension.GetRibbonControl();
+                var ribbonControl = ribbonExtension.GetRibbonControl();
 
                 // fill contextual groups from plugins
                 foreach (var group in ribbonControl.ContextualGroups)
Index: Core/Common/src/Core.Common.Gui/IGui.cs
===================================================================
diff -u -rd1a8aeaa05c36dfe386de7586dd129819594ee97 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
+++ Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -172,6 +172,11 @@
         /// </summary>
         event EventHandler<SelectedItemChangedEventArgs> SelectionChanged;
 
+        /// <summary>
+        /// Fired when the active view in the document pane changes.
+        /// </summary>
+        event EventHandler<ActiveViewChangeEventArgs> ActiveViewChanged;
+
         #endregion
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -rd1a8aeaa05c36dfe386de7586dd129819594ee97 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -38,6 +38,7 @@
     public class RingtoetsGui : IGui, IContextMenuBuilderProvider
     {
         public event EventHandler<SelectedItemChangedEventArgs> SelectionChanged; // TODO: make it weak
+        public event EventHandler<ActiveViewChangeEventArgs> ActiveViewChanged;
 
         public event Action<Project> ProjectOpened;
         public event Action<Project> ProjectClosing;
@@ -842,8 +843,17 @@
             }
 
             mainWindow.ValidateItems();
+            FireActiveViewChanged(e);
         }
 
+        private void FireActiveViewChanged(ActiveViewChangeEventArgs e)
+        {
+            if (ActiveViewChanged != null)
+            {
+                ActiveViewChanged(null, e);
+            }
+        }
+
         private void UpdateViewName(IView view)
         {
             view.Text = DocumentViewsResolver.GetViewName(view);
Index: Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.Designer.cs
===================================================================
diff -u -rd616e06dd49f563130b2d571107e0e54f09b0bbb -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
+++ Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -1088,7 +1088,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Grafieken.
+        ///   Looks up a localized string similar to Oud Grafieken.
         /// </summary>
         public static string Ribbon_ContextualGroup_Charting {
             get {
@@ -1169,7 +1169,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Grafiek.
+        ///   Looks up a localized string similar to Oud Grafiek.
         /// </summary>
         public static string Ribbon_TabItem_Chart {
             get {
Index: Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.resx
===================================================================
diff -u -rd616e06dd49f563130b2d571107e0e54f09b0bbb -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.resx	(.../Resources.resx)	(revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
+++ Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.resx	(.../Resources.resx)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -434,7 +434,7 @@
     <value>..\Resources\category.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Ribbon_ContextualGroup_Charting" xml:space="preserve">
-    <value>Grafieken</value>
+    <value>Oud Grafieken</value>
   </data>
   <data name="Ribbon_GroupBox_Show_Hide" xml:space="preserve">
     <value>Weergeven/Verbergen</value>
@@ -443,7 +443,7 @@
     <value>Beeld</value>
   </data>
   <data name="Ribbon_TabItem_Chart" xml:space="preserve">
-    <value>Grafiek</value>
+    <value>Oud Grafiek</value>
   </data>
   <data name="Ribbon_GroupBox_Export" xml:space="preserve">
     <value>Exporteren</value>
Index: Core/Plugins/src/Core.Plugins.Charting/Ribbon.xaml.cs
===================================================================
diff -u -r7662009f258eaafc23e33c92dcd4312f7e6e7b58 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/src/Core.Plugins.Charting/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 7662009f258eaafc23e33c92dcd4312f7e6e7b58)
+++ Core/Plugins/src/Core.Plugins.Charting/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -56,7 +56,7 @@
             return tabGroupName == chartingContextualGroup.Name && tabName == chartTab.Name && exportAsImageCommand.Enabled;
         }
 
-        public object GetRibbonControl()
+        public Fluent.Ribbon GetRibbonControl()
         {
             return RibbonControl;
         }
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -0,0 +1,28 @@
+<UserControl x:Class="Core.Plugins.OxyPlot.ChartingRibbon"
+             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"
+             xmlns:gui="clr-namespace:Core.Common.Gui;assembly=Core.Common.Gui"
+             xmlns:p="clr-namespace:Core.Plugins.OxyPlot.Properties"
+             mc:Ignorable="d" Width="686.4" Height="168" Background="White">
+    <UserControl.Resources>
+        <gui:PngToIconConverter x:Key="IconConverter"/>
+    </UserControl.Resources>
+    <fluent:Ribbon x:Name="RibbonControl" x:FieldModifier="private">
+
+        <fluent:Ribbon.ContextualGroups>
+            <fluent:RibbonContextualTabGroup Header="{x:Static p:Resources.Ribbon_ContextualGroup_Charting}" Visibility="Visible" x:Name="ChartingContextualGroup" Background="MediumPurple" BorderBrush="MediumPurple" />
+        </fluent:Ribbon.ContextualGroups>
+        
+        <fluent:RibbonTabItem Header="{x:Static p:Resources.Ribbon_Demo_Header}" fluent:KeyTip.Keys="D">
+            <fluent:RibbonGroupBox Header="{x:Static p:Resources.Ribbon_Chart}" fluent:KeyTip.Keys="C">
+                <fluent:Button Header="{x:Static p:Resources.Ribbon_Chart}" ToolTip="{x:Static p:Resources.OpenChartView_ToolTip}" LargeIcon="{Binding Source={x:Static p:Resources.DocumentIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenChartView_Click"/>
+            </fluent:RibbonGroupBox>
+        </fluent:RibbonTabItem>
+
+        <fluent:RibbonTabItem Header="{x:Static p:Resources.Ribbon_Chart}" Group="{Binding Source={x:Reference ChartingContextualGroup}}">
+        </fluent:RibbonTabItem>
+    </fluent:Ribbon>
+</UserControl>
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -0,0 +1,62 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Windows;
+using Core.Common.Controls.Commands;
+using Core.Common.Gui.Forms;
+using Fluent;
+
+namespace Core.Plugins.OxyPlot
+{
+    /// <summary>
+    /// Interaction logic for ribbon.xaml
+    /// </summary>
+    public partial class ChartingRibbon : IRibbonCommandHandler
+    {
+        private readonly ICommand openChartViewCommand;
+
+        public ChartingRibbon()
+        {
+            InitializeComponent();
+            openChartViewCommand = new OpenChartViewCommand();
+        }
+
+        public IEnumerable<ICommand> Commands
+        {
+            get
+            {
+                yield return openChartViewCommand;
+            }
+        }
+
+        public Ribbon GetRibbonControl()
+        {
+            return RibbonControl;
+        }
+
+        public void ValidateItems()
+        {
+        }
+
+        public bool IsContextualTabVisible(string tabGroupName, string tabName)
+        {
+            return tabGroupName == ChartingContextualGroup.Name;
+        }
+
+        private void ButtonOpenChartView_Click(object sender, RoutedEventArgs e)
+        {
+            openChartViewCommand.Execute();
+        }
+
+        public void ShowChartingTab()
+        {
+            ChartingContextualGroup.Visibility = Visibility.Visible;
+        }
+
+        public void HideChartingTab()
+        {
+            ChartingContextualGroup.Visibility = Visibility.Collapsed;
+        }
+    }
+}
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj
===================================================================
diff -u -rcb23ee4b169979c1862a394cea470b46cc0866e4 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj	(.../Core.Plugins.OxyPlot.csproj)	(revision cb23ee4b169979c1862a394cea470b46cc0866e4)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj	(.../Core.Plugins.OxyPlot.csproj)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -73,9 +73,13 @@
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="ChartingRibbon.xaml.cs">
+      <DependentUpon>ChartingRibbon.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Forms\ChartDataView.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="Forms\IChartView.cs" />
     <Compile Include="OpenChartViewCommand.cs" />
     <Compile Include="OxyPlotGuiPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -84,9 +88,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Ribbon.xaml.cs">
-      <DependentUpon>Ribbon.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
@@ -111,9 +112,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Ribbon.xaml">
-      <SubType>Designer</SubType>
+    <Page Include="ChartingRibbon.xaml">
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
   <ItemGroup>
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Forms/ChartDataView.cs
===================================================================
diff -u -r4ea1323ca52ee52133113dbc01bae0429946d0d4 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/src/Core.Plugins.OxyPlot/Forms/ChartDataView.cs	(.../ChartDataView.cs)	(revision 4ea1323ca52ee52133113dbc01bae0429946d0d4)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Forms/ChartDataView.cs	(.../ChartDataView.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -8,7 +8,7 @@
     /// <summary>
     /// This class represents a simple view with a chart, to which data can be added.
     /// </summary>
-    public class ChartDataView : UserControl, IView
+    public class ChartDataView : UserControl, IChartView
     {
         private readonly BaseChart baseChart;
         private IChartData data;
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Forms/IChartView.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Forms/IChartView.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Forms/IChartView.cs	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -0,0 +1,9 @@
+using Core.Common.Controls.Views;
+
+namespace Core.Plugins.OxyPlot.Forms
+{
+    public interface IChartView : IView
+    {
+         
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs
===================================================================
diff -u -r4ea1323ca52ee52133113dbc01bae0429946d0d4 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision 4ea1323ca52ee52133113dbc01bae0429946d0d4)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -10,16 +10,34 @@
 {
     public class OxyPlotGuiPlugin : GuiPlugin
     {
-        private IRibbonCommandHandler ribbon = new Ribbon();
+        private ChartingRibbon chartingRibbon;
 
         public override IRibbonCommandHandler RibbonCommandHandler
         {
             get
             {
-                return ribbon;
+                return chartingRibbon;
             }
         }
 
+        public override void Activate()
+        {
+            chartingRibbon = new ChartingRibbon();
+            Gui.ActiveViewChanged += GuiOnActiveViewChanged;
+        }
+
+        private void GuiOnActiveViewChanged(object sender, ActiveViewChangeEventArgs activeViewChangeEventArgs)
+        {
+            if (activeViewChangeEventArgs.View is IChartView)
+            {
+                chartingRibbon.ShowChartingTab();
+            }
+            else
+            {
+                chartingRibbon.HideChartingTab();
+            }
+        }
+
         public override IEnumerable<ViewInfo> GetViewInfoObjects()
         {
             yield return new ViewInfo<IChartData, ChartDataView>
Fisheye: Tag d04111eb30246d9958c80b0ddc10e9192fd8136a refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.OxyPlot/Ribbon.xaml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d04111eb30246d9958c80b0ddc10e9192fd8136a refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.OxyPlot/Ribbon.xaml.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs
===================================================================
diff -u -rd1a8aeaa05c36dfe386de7586dd129819594ee97 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -39,7 +39,7 @@
             return false;
         }
 
-        public object GetRibbonControl()
+        public Fluent.Ribbon GetRibbonControl()
         {
             return RibbonControl;
         }
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs
===================================================================
diff -u -rd1a8aeaa05c36dfe386de7586dd129819594ee97 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -153,7 +153,7 @@
             return tabGroupName == geospatialContextualGroup.Name && tabName == mapTab.Name && IsActiveViewMapView();
         }
 
-        public object GetRibbonControl()
+        public Fluent.Ribbon GetRibbonControl()
         {
             return RibbonControl;
         }
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj
===================================================================
diff -u -r307d9f9ef20f6d38919cec957280212806a8e123 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj	(.../Core.Plugins.OxyPlot.Test.csproj)	(revision 307d9f9ef20f6d38919cec957280212806a8e123)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj	(.../Core.Plugins.OxyPlot.Test.csproj)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -39,6 +39,10 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
@@ -58,6 +62,9 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.6.1.236\lib\net40\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs
===================================================================
diff -u -raddc36850416d2fc02e5d393d62416c211fb3040 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision addc36850416d2fc02e5d393d62416c211fb3040)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -1,8 +1,10 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Core.Common.Gui;
 using Core.Components.OxyPlot.Data;
 using Core.Plugins.OxyPlot.Forms;
 using NUnit.Framework;
+using Rhino.Mocks;
 
 namespace Core.Plugins.OxyPlot.Test
 {
@@ -11,14 +13,50 @@
     {
         [Test]
         [RequiresSTA]
-        public void DefaultConstructor_Always_RibbonCommandHandlerAssigned()
+        public void DefaultConstructor_Always_NoRibbonCommandHandlerSet()
         {
             // Call
             var plugin = new OxyPlotGuiPlugin();
 
             // Assert
             Assert.IsInstanceOf<GuiPlugin>(plugin);
+            Assert.IsNull(plugin.RibbonCommandHandler);
+        }
+
+        [Test]
+        [RequiresSTA]
+        public void Activate_WithoutGui_ThrowsNullReferenceException()
+        {
+            // Setup
+            var plugin = new OxyPlotGuiPlugin();
+
+            // Call
+            TestDelegate test = () => plugin.Activate();
+
+            // Assert
+            Assert.Throws<NullReferenceException>(test);
+        }
+        [Test]
+        [RequiresSTA]
+        public void Activate_WithGui_SetsRibbonCommandHandlerAndBindsActiveViewChanged()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var plugin = new OxyPlotGuiPlugin();
+            var gui = mocks.StrictMock<IGui>();
+            gui.Expect(g => g.ActiveViewChanged += null).IgnoreArguments();
+
+            mocks.ReplayAll();
+
+            plugin.Gui = gui;
+
+            // Call
+            plugin.Activate();
+
+            // Assert
+            Assert.IsInstanceOf<GuiPlugin>(plugin);
             Assert.NotNull(plugin.RibbonCommandHandler);
+            mocks.VerifyAll();
         }
 
         [Test]
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/RibbonTest.cs
===================================================================
diff -u -raddc36850416d2fc02e5d393d62416c211fb3040 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/RibbonTest.cs	(.../RibbonTest.cs)	(revision addc36850416d2fc02e5d393d62416c211fb3040)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/RibbonTest.cs	(.../RibbonTest.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -11,7 +11,7 @@
         public void Commands_Always_ReturnsOpenChartViewCommand()
         {
             // Setup
-            var ribbon = new Ribbon();
+            var ribbon = new ChartingRibbon();
 
             // Call
             var commands = ribbon.Commands.ToArray();
@@ -26,7 +26,7 @@
         public void RibbonControl_Always_ReturnsRibbonControl()
         {
             // Setup
-            var ribbon = new Ribbon();
+            var ribbon = new ChartingRibbon();
 
             // Call & Assert
             Assert.IsInstanceOf<System.Windows.Controls.Control>(ribbon.GetRibbonControl());
@@ -37,7 +37,7 @@
         public void IsContextualTabVisible_Always_ReturnsFalse()
         {
             // Setup
-            var ribbon = new Ribbon();
+            var ribbon = new ChartingRibbon();
 
             // Call & Assert
             Assert.IsFalse(ribbon.IsContextualTabVisible(null,null));
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/packages.config
===================================================================
diff -u -raddc36850416d2fc02e5d393d62416c211fb3040 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/packages.config	(.../packages.config)	(revision addc36850416d2fc02e5d393d62416c211fb3040)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/packages.config	(.../packages.config)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Fluent.Ribbon" version="3.4.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
   <package id="OxyPlot.Core" version="1.0.0-unstable1953" targetFramework="net40" />
   <package id="OxyPlot.WindowsForms" version="1.0.0-unstable1953" targetFramework="net40" />
Index: Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs
===================================================================
diff -u -rd1a8aeaa05c36dfe386de7586dd129819594ee97 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
+++ Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -4,7 +4,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
-
+using Fluent;
 using Ringtoets.Demo.Commands;
 
 using DemoResources = Ringtoets.Demo.Properties.Resources;
@@ -35,7 +35,7 @@
             }
         }
 
-        public object GetRibbonControl()
+        public Ribbon GetRibbonControl()
         {
             return RingtoetsDemoProjectRibbonControl;
         }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs
===================================================================
diff -u -rd1a8aeaa05c36dfe386de7586dd129819594ee97 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs	(.../RingtoetsRibbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs	(.../RingtoetsRibbon.xaml.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -3,6 +3,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
+using Fluent;
 
 namespace Ringtoets.Integration.Plugin
 {
@@ -27,7 +28,7 @@
             }
         }
 
-        public object GetRibbonControl()
+        public Ribbon GetRibbonControl()
         {
             return RingtoetsRibbonControl;
         }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs
===================================================================
diff -u -rd1a8aeaa05c36dfe386de7586dd129819594ee97 -rd04111eb30246d9958c80b0ddc10e9192fd8136a
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs	(.../PipingRibbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs	(.../PipingRibbon.xaml.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
@@ -2,6 +2,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
+using Fluent;
 
 namespace Ringtoets.Piping.Plugin
 {
@@ -23,7 +24,7 @@
             }
         }
 
-        public object GetRibbonControl()
+        public Ribbon GetRibbonControl()
         {
             return RingtoetsRibbonControl;
         }