diff --git a/Logic/CommitEdge.cs b/Logic/CommitEdge.cs
index 4044de8..7ec51f9 100644
--- a/Logic/CommitEdge.cs
+++ b/Logic/CommitEdge.cs
@@ -1,4 +1,4 @@
-using QuickGraph;
+using QuikGraph;
 
 namespace GitViz.Logic
 {
diff --git a/Logic/CommitGraph.cs b/Logic/CommitGraph.cs
index afa6b4d..ad63b12 100644
--- a/Logic/CommitGraph.cs
+++ b/Logic/CommitGraph.cs
@@ -1,4 +1,4 @@
-using QuickGraph;
+using QuikGraph;
 
 namespace GitViz.Logic
 {
diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj
index 25284cf..ea52ffa 100644
--- a/Logic/Logic.csproj
+++ b/Logic/Logic.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -30,23 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GraphSharp">
-      <HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="GraphSharp.Controls">
-      <HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.Controls.dll</HintPath>
-    </Reference>
-    <Reference Include="QuickGraph">
-      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
-    </Reference>
-    <Reference Include="QuickGraph.Data">
-      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="QuickGraph.Graphviz">
-      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
-    </Reference>
-    <Reference Include="QuickGraph.Serialization">
-      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
+    <Reference Include="QuikGraph">
+      <HintPath>..\packages\QuikGraph.2.2.0\lib\net45\QuikGraph.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Logic/packages.config b/Logic/packages.config
index 2082388..8c6e6e2 100644
--- a/Logic/packages.config
+++ b/Logic/packages.config
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GraphSharp" version="1.1.0.0" targetFramework="net45" />
-  <package id="QuickGraph" version="3.6.61119.7" targetFramework="net45" />
+  <package id="QuikGraph" version="2.2.0" targetFramework="net45" />
   <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
   <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
diff --git a/README.md b/README.md
index 2e3ac56..18c5735 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ This is not a day-to-day visualizing tool for big, active repositories. It's opt
 
 ### How it works
 
-Shells out to `git.exe`, and then renders it with the excellent [GraphSharp](http://graphsharp.codeplex.com).
+Shells out to `git.exe`, and then renders it with the excellent [GraphShape](https://github.com/KeRNeLith/GraphShape).
 
 ### FAQ
 #### How can I remove dangling commits?
diff --git a/UI/CommitGraphLayout.cs b/UI/CommitGraphLayout.cs
index 62ab56d..dba96b0 100644
--- a/UI/CommitGraphLayout.cs
+++ b/UI/CommitGraphLayout.cs
@@ -1,5 +1,5 @@
-using GitViz.Logic;
-using GraphSharp.Controls;
+using GitViz.Logic;
+using GraphShape.Controls;
 
 namespace UI
 {
diff --git a/UI/MainWindow.xaml b/UI/MainWindow.xaml
index 93cd468..da3d26e 100644
--- a/UI/MainWindow.xaml
+++ b/UI/MainWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:logic="clr-namespace:GitViz.Logic;assembly=GitViz.Logic"
         xmlns:ui="clr-namespace:UI"
-        xmlns:graphsharp="clr-namespace:GraphSharp.Controls;assembly=GraphSharp.Controls"
+        xmlns:graphshape="clr-namespace:GraphShape.Controls;assembly=GraphShape.Controls"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         mc:Ignorable="d" d:DesignHeight="600" d:DesignWidth="400"
@@ -46,10 +46,10 @@
             x:Key="VertexTemplateSelector"
             CommitTemplate="{StaticResource CommitTemplate}"
             ReferenceTemplate="{StaticResource ReferenceTemplate}" />
-        <Style TargetType="{x:Type graphsharp:VertexControl}">
+        <Style TargetType="{x:Type graphshape:VertexControl}">
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type graphsharp:VertexControl}">
+                    <ControlTemplate TargetType="{x:Type graphshape:VertexControl}">
                         <ContentPresenter Content="{TemplateBinding Vertex}" ContentTemplateSelector="{StaticResource VertexTemplateSelector}" />
                     </ControlTemplate>
                 </Setter.Value>
@@ -72,7 +72,7 @@
         <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
             <ui:CommitGraphLayout x:Name="graph"
                 Graph="{Binding Path=Graph}"
-                LayoutAlgorithmType="EfficientSugiyama"
+                LayoutAlgorithmType="Sugiyama"
                 OverlapRemovalAlgorithmType="FSA"
                 HighlightAlgorithmType="Simple"
                 Margin="20"
diff --git a/UI/UI.csproj b/UI/UI.csproj
index 11b7b57..7a679fa 100644
--- a/UI/UI.csproj
+++ b/UI/UI.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -37,23 +37,14 @@
     <ApplicationIcon>readify.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GraphSharp">
-      <HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.dll</HintPath>
+    <Reference Include="GraphShape">
+      <HintPath>..\packages\GraphShape.1.1.0\lib\net45\GraphShape.dll</HintPath>
     </Reference>
-    <Reference Include="GraphSharp.Controls">
-      <HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.Controls.dll</HintPath>
+    <Reference Include="GraphShape.Controls">
+      <HintPath>..\packages\GraphShape.Controls.1.1.0\lib\net45\GraphShape.Controls.dll</HintPath>
     </Reference>
-    <Reference Include="QuickGraph">
-      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
-    </Reference>
-    <Reference Include="QuickGraph.Data">
-      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="QuickGraph.Graphviz">
-      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
-    </Reference>
-    <Reference Include="QuickGraph.Serialization">
-      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
+    <Reference Include="QuikGraph">
+      <HintPath>..\packages\QuikGraph.2.2.0\lib\net45\QuikGraph.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/UI/packages.config b/UI/packages.config
index 25b8440..0e87617 100644
--- a/UI/packages.config
+++ b/UI/packages.config
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GraphSharp" version="1.1.0.0" targetFramework="net45" />
-  <package id="QuickGraph" version="3.6.61119.7" targetFramework="net45" />
+  <package id="GraphShape" version="1.1.0" targetFramework="net45" />
+  <package id="GraphShape.Controls" version="1.1.0" targetFramework="net45" />
+  <package id="QuikGraph" version="2.2.0" targetFramework="net45" />
   <package id="WPFExtensions" version="1.0.0" targetFramework="net45" />
 </packages>
\ No newline at end of file