diff --git a/FancyCandles/CandleChartPropertiesWindow.xaml b/FancyCandles/CandleChartPropertiesWindow.xaml
index c6b9a58..8a30a9d 100644
--- a/FancyCandles/CandleChartPropertiesWindow.xaml
+++ b/FancyCandles/CandleChartPropertiesWindow.xaml
@@ -25,7 +25,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:FancyCandles"
         xmlns:localIndicators="clr-namespace:FancyCandles.Indicators"
-        xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+        xmlns:i="clr-namespace:Microsoft.Xaml.Behaviors;assembly=Microsoft.Xaml.Behaviors"
         xmlns:fp="clr-namespace:FancyPrimitives;assembly=FancyPrimitives"
         mc:Ignorable="d"
         ResizeMode="NoResize"
diff --git a/FancyCandles/CandleChartPropertiesWindow.xaml.cs b/FancyCandles/CandleChartPropertiesWindow.xaml.cs
index 0ca76b9..a1f94c2 100644
--- a/FancyCandles/CandleChartPropertiesWindow.xaml.cs
+++ b/FancyCandles/CandleChartPropertiesWindow.xaml.cs
@@ -158,7 +158,7 @@ private void ListOverlayIndicators_SelectionChanged(object sender, SelectionChan
                 ParserContext context = new ParserContext();
                 context.XmlnsDictionary.Add("", "http://schemas.microsoft.com/winfx/2006/xaml/presentation");
                 context.XmlnsDictionary.Add("x", "http://schemas.microsoft.com/winfx/2006/xaml");
-                context.XmlnsDictionary.Add("i", "clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity");
+                context.XmlnsDictionary.Add("i", "clr-namespace:Microsoft.Xaml.Behaviors;assembly=Microsoft.Xaml.Behaviors");
                 context.XmlnsDictionary.Add("local", "clr-namespace:FancyCandles;assembly=FancyCandles");
                 context.XmlnsDictionary.Add("fp", "clr-namespace:FancyPrimitives;assembly=FancyPrimitives");
                 UIElement indicatorEditorElement = (UIElement)XamlReader.Load(new MemoryStream(b), context);
diff --git a/FancyCandles/FancyCandles.csproj b/FancyCandles/FancyCandles.csproj
index 53c19d6..16632b1 100644
--- a/FancyCandles/FancyCandles.csproj
+++ b/FancyCandles/FancyCandles.csproj
@@ -36,8 +36,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>C:\Users\DDD\.nuget\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>
+    <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>C:\Users\DDD\.nuget\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -46,9 +46,6 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>C:\Users\DDD\.nuget\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
diff --git a/FancyCandles/packages.config b/FancyCandles/packages.config
index b4dae45..28d4d27 100644
--- a/FancyCandles/packages.config
+++ b/FancyCandles/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
-  <package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net472" />
 </packages>
\ No newline at end of file