diff --git a/src/Extensions/LostPasswordHandlerExtension.php b/src/Extensions/LostPasswordHandlerExtension.php
index 1115ba7..6c6c618 100755
--- a/src/Extensions/LostPasswordHandlerExtension.php
+++ b/src/Extensions/LostPasswordHandlerExtension.php
@@ -8,8 +8,6 @@
 
 namespace A2nt\CMSNiceties\Extensions;
 
-use Sheadawson\Linkable\Forms\LinkField;
-use Sheadawson\Linkable\Models\Link;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\TextField;
diff --git a/src/Extensions/OpenningHoursExtension.php b/src/Extensions/OpenningHoursExtension.php
index 82f6a2b..0ad5b64 100755
--- a/src/Extensions/OpenningHoursExtension.php
+++ b/src/Extensions/OpenningHoursExtension.php
@@ -4,8 +4,6 @@ namespace A2nt\CMSNiceties\Extensions;
 
 use Dynamic\Elements\Blog\Elements\ElementBlogPosts;
 use Innoweb\Sitemap\Pages\SitemapPage;
-use Sheadawson\Linkable\Forms\LinkField;
-use Sheadawson\Linkable\Models\Link;
 use SilverStripe\AssetAdmin\Forms\UploadField;
 use SilverStripe\Assets\Image;
 use SilverStripe\Forms\CheckboxField;
diff --git a/src/Extensions/SocialExtension.php b/src/Extensions/SocialExtension.php
index 95424d5..b05f937 100755
--- a/src/Extensions/SocialExtension.php
+++ b/src/Extensions/SocialExtension.php
@@ -8,8 +8,8 @@
 
 namespace A2nt\CMSNiceties\Extensions;
 
-use Sheadawson\Linkable\Forms\LinkField;
-use Sheadawson\Linkable\Models\Link;
+use gorriecoe\Link\Models\Link;
+use gorriecoe\LinkField\LinkField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\DataExtension;
@@ -57,26 +57,34 @@ class SocialExtension extends DataExtension
     {
         parent::updateCMSFields($fields);
 
-        $linkFields = [
-            LinkField::create('FacebookID', 'Facebook'),
-            LinkField::create('LinkedInID', 'LinkedIn'),
-            LinkField::create('PinterestID', 'Pinterest'),
-            LinkField::create('InstagramID', 'Instagram'),
-            LinkField::create('TwitterID', 'Twitter'),
-            LinkField::create('YouTubeID', 'YouTube'),
+        $cfg = [
+            'types' => [
+                'URL',
+            ],
         ];
 
-        foreach ($linkFields as $field) {
-            $field->setAllowedTypes(['URL']);
-        }
+        $linkFields = [
+            LinkField::create('Facebook', 'Facebook', $this->owner, $cfg),
+            LinkField::create('LinkedIn', 'LinkedIn', $this->owner, $cfg),
+            LinkField::create('Pinterest', 'Pinterest', $this->owner, $cfg),
+            LinkField::create('Instagram', 'Instagram', $this->owner, $cfg),
+            LinkField::create('Twitter', 'Twitter', $this->owner, $cfg),
+            LinkField::create('YouTube', 'YouTube', $this->owner, $cfg),
+        ];
 
         $fields->findOrMakeTab('Root.Social');
 
         $fields->addFieldsToTab('Root.Social', [
-            LinkField::create('PublicEmailID', 'Public Email')
-                ->setAllowedTypes(['Email']),
-            LinkField::create('PhoneNumberID', 'Phone Number')
-                ->setAllowedTypes(['Phone']),
+            LinkField::create('PublicEmail', 'Public Email', $this->owner, [
+                'types' => [
+                    'Email',
+                ],
+            ]),
+            LinkField::create('PhoneNumber', 'Phone Number', $this->owner, [
+                'types' => [
+                    'Phone',
+                ],
+            ]),
         ]);
 
         $fields->addFieldsToTab('Root.Social', $linkFields);
diff --git a/src/Models/Holiday.php b/src/Models/Holiday.php
index 0515f59..4b430e9 100755
--- a/src/Models/Holiday.php
+++ b/src/Models/Holiday.php
@@ -9,8 +9,6 @@
 namespace A2nt\CMSNiceties\Models;
 
 use Dynamic\FlexSlider\Model\SlideImage;
-use Sheadawson\Linkable\Forms\LinkField;
-use Sheadawson\Linkable\Models\Link;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\ValidationResult;
 use SilverStripe\SiteConfig\SiteConfig;
diff --git a/src/Models/Notification.php b/src/Models/Notification.php
index 633ecc7..7d8f7af 100755
--- a/src/Models/Notification.php
+++ b/src/Models/Notification.php
@@ -8,8 +8,8 @@
 
 namespace A2nt\CMSNiceties\Models;
 
-use Sheadawson\Linkable\Forms\LinkField;
-use Sheadawson\Linkable\Models\Link;
+use gorriecoe\Link\Models\Link;
+use gorriecoe\LinkField\LinkField;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\ValidationResult;
 use SilverStripe\SiteConfig\SiteConfig;
@@ -63,7 +63,7 @@ class Notification extends DataObject
         $fields = parent::getCMSFields();
 
         $fields->addFieldsToTab('Root.Main', [
-            LinkField::create('TargetLinkID', 'Link'),
+            LinkField::create('TargetLink', 'Link', $this),
         ]);
 
         return $fields;
diff --git a/src/Widgets/BannerWidget.php b/src/Widgets/BannerWidget.php
index 76c6b3b..e0f3db2 100755
--- a/src/Widgets/BannerWidget.php
+++ b/src/Widgets/BannerWidget.php
@@ -3,8 +3,8 @@
 
 namespace A2nt\CMSNiceties\Widgets;
 
-use Sheadawson\Linkable\Forms\LinkField;
-use Sheadawson\Linkable\Models\Link;
+use gorriecoe\Link\Models\Link;
+use gorriecoe\LinkField\LinkField;
 use SilverStripe\AssetAdmin\Forms\UploadField;
 use SilverStripe\Assets\Image;
 use SilverStripe\Widgets\Model\Widget;
@@ -46,7 +46,7 @@ class BannerWidget extends Widget
         $fields->push(UploadField::create('Image', 'Image (minimal width 301px)')
                 ->setAllowedFileCategories(['image/supported']));
 
-        $fields->push(LinkField::create('LinkID', 'Link'));
+        $fields->push(LinkField::create('Link', 'Link', $this));
 
         return $fields;
     }
diff --git a/src/Widgets/ContentWidget.php b/src/Widgets/ContentWidget.php
index 29036bd..da203be 100755
--- a/src/Widgets/ContentWidget.php
+++ b/src/Widgets/ContentWidget.php
@@ -3,8 +3,6 @@
 
 namespace A2nt\CMSNiceties\Widgets;
 
-use Sheadawson\Linkable\Forms\LinkField;
-use Sheadawson\Linkable\Models\Link;
 use SilverStripe\AssetAdmin\Forms\UploadField;
 use SilverStripe\Assets\Image;
 use SilverStripe\Forms\HTMLEditor\HTMLEditorField;