diff --git a/djangocms_youtube/__init__.py b/djangocms_youtube/__init__.py
index fc79d63..abeeedb 100644
--- a/djangocms_youtube/__init__.py
+++ b/djangocms_youtube/__init__.py
@@ -1 +1 @@
-__version__ = '0.2.1'
+__version__ = '0.4.0'
diff --git a/djangocms_youtube/migrations/0001_initial.py b/djangocms_youtube/migrations/0001_initial.py
index 560b339..8d9c24c 100644
--- a/djangocms_youtube/migrations/0001_initial.py
+++ b/djangocms_youtube/migrations/0001_initial.py
@@ -13,15 +13,18 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('filer', '__latest__'),
-        ('cms', '__latest__'),
+        ('filer', '0006_auto_20160623_1627'),
+        ('cms', '0014_auto_20160404_1908'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Youtube',
             fields=[
-                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
+                ('cmsplugin_ptr', models.OneToOneField(parent_link=True,
+                    auto_created=True, primary_key=True, serialize=False,
+                    to='cms.CMSPlugin',
+                    on_delete=django.db.models.deletion.CASCADE)),
                 ('title', models.CharField(max_length=150, verbose_name='Title', blank=True)),
                 ('video_url', models.URLField(help_text='Paste the URL of the YouTube video', verbose_name='Video URL')),
                 ('width', models.PositiveIntegerField(help_text='Sets the width of your player, used on some templates where applicable', null=True, verbose_name='Width', blank=True)),
diff --git a/djangocms_youtube/models.py b/djangocms_youtube/models.py
index ca8f811..bae7cb3 100644
--- a/djangocms_youtube/models.py
+++ b/djangocms_youtube/models.py
@@ -5,8 +5,7 @@
 
 from django.contrib.sites.models import Site
 from django.db import models
-from django.utils import six
-from django.utils.encoding import python_2_unicode_compatible
+from six import python_2_unicode_compatible, iteritems as six_iteritems
 from django.utils.translation import ugettext_lazy as _
 
 from cms.models import CMSPlugin
@@ -78,7 +77,7 @@ def video(self):
 
     def _generate_thumbnails(self):
         _thumbnails = {}
-        for name, opts in six.iteritems(settings.DJANGOCMS_YOUTUBE_THUMBNAIL_SIZES):
+        for name, opts in six_iteritems(settings.DJANGOCMS_YOUTUBE_THUMBNAIL_SIZES):
             try:
                 thumb_opts = {
                     'size': (int(opts['width']), int(opts['height'])),
@@ -135,7 +134,7 @@ def get_thumbnail(self):
 class Video(object):
 
     def __init__(self, *args, **kwargs):
-        for key, value in six.iteritems(kwargs):
+        for key, value in six_iteritems(kwargs):
             setattr(self, key, value)
 
     def get_id(self):
diff --git a/djangocms_youtube/static/admin/js/djangocms_youtube/changeform.js b/djangocms_youtube/static/admin/js/djangocms_youtube/changeform.js
index 18abb7a..bc8faaf 100644
--- a/djangocms_youtube/static/admin/js/djangocms_youtube/changeform.js
+++ b/djangocms_youtube/static/admin/js/djangocms_youtube/changeform.js
@@ -1,5 +1,5 @@
-(function($) {
-    $(function() {
+window.addEventListener("load", function() {
+    (function($) {
 
         var heightInput = $('input[name="height"]');
         var widthInput = $('input[name="width"]');
@@ -65,5 +65,5 @@
             }
         })
 
-    });
-})(django.jQuery);
+    })(django.jQuery);
+});
diff --git a/djangocms_youtube/templates/djangocms_youtube/default.html b/djangocms_youtube/templates/djangocms_youtube/default.html
index 10fd74c..b7000b8 100644
--- a/djangocms_youtube/templates/djangocms_youtube/default.html
+++ b/djangocms_youtube/templates/djangocms_youtube/default.html
@@ -1,4 +1,4 @@
-{% load thumbnail staticfiles sekizai_tags cms_tags %}
+{% load thumbnail static sekizai_tags cms_tags %}
 <div class="video-wrapper js-video-wrapper" itemprop="video" itemscope itemtype="http://schema.org/VideoObject" data-video-id="{{ instance.video.get_id }}" data-video-title="{{ instance.title }}">
     <meta itemprop="name" content="{{ instance.get_title }}" />
     <meta itemprop="duration" content="{{ instance.video.get_duration }}" />
diff --git a/djangocms_youtube/widgets.py b/djangocms_youtube/widgets.py
index e7edc0f..2b4cc43 100644
--- a/djangocms_youtube/widgets.py
+++ b/djangocms_youtube/widgets.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django import forms
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from .models import Youtube
 
@@ -10,7 +10,7 @@
 class YoutubeVideoURLWidget(forms.TextInput):
     model = Youtube
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         if attrs is None:
             attrs = {}
 
diff --git a/setup.py b/setup.py
index 7bf60fc..b223117 100755
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@
     long_description=readme,
     author='Mishbah Razzaque',
     author_email='mishbahx@gmail.com',
-    url='https://github.com/mishbahr/djangocms-youtube',
+    url='https://github.com/ketaro/djangocms-youtube',
     packages=[
         'djangocms_youtube',
     ],
@@ -42,6 +42,7 @@
         'isodate>=0.5.4',
         'jsonfield',
         'requests',
+        'six',
     ],
     license="BSD",
     zip_safe=False,
@@ -49,13 +50,11 @@
     classifiers=[
         'Development Status :: 4 - Beta',
         'Framework :: Django',
-        'Framework :: Django :: 1.6',
-        'Framework :: Django :: 1.7',
-        'Framework :: Django :: 1.8',
+        'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
     ],