diff --git a/ckanext/mapviews/plugin.py b/ckanext/mapviews/plugin.py
index 6b0a050..2bdaaec 100644
--- a/ckanext/mapviews/plugin.py
+++ b/ckanext/mapviews/plugin.py
@@ -1,7 +1,7 @@
-import urlparse
+from urllib.parse import urlparse
 
 import ckan.plugins as p
-import pylons.config as config
+config = p.toolkit.config
 
 Invalid = p.toolkit.Invalid
 _ = p.toolkit._
@@ -11,8 +11,8 @@
 
 
 def url_is_relative_or_in_same_domain(url):
-    site_url = urlparse.urlparse(config.get('ckan.site_url', ''))
-    parsed_url = urlparse.urlparse(url)
+    site_url = urlparse(config.get('ckan.site_url', ''))
+    parsed_url = urlparse(url)
 
     is_relative = (parsed_url.netloc == '')
     is_in_same_domain = (parsed_url.netloc == site_url.netloc)
diff --git a/ckanext/mapviews/theme/public/resource.config b/ckanext/mapviews/theme/public/resource.config
deleted file mode 100644
index f09567b..0000000
--- a/ckanext/mapviews/theme/public/resource.config
+++ /dev/null
@@ -1,26 +0,0 @@
-[IE conditional]
-
-lte IE 8 =
-    vendor/excanvas.js
-
-[depends]
-
-main = base/main
-
-[groups]
-
-main =
-    vendor/leaflet.js
-    vendor/leaflet.css
-    vendor/leaflet.label.js
-    vendor/leaflet.label.css
-    vendor/d3.scale.quantize.js
-    vendor/backend.ckan.js
-    vendor/queryStringToJSON.js
-    ckan_map_modules.js
-
-    navigablemap.js
-    navigablemap.css
-
-    choroplethmap.js
-    choroplethmap.css
diff --git a/ckanext/mapviews/theme/public/webassets.yml b/ckanext/mapviews/theme/public/webassets.yml
new file mode 100644
index 0000000..25d3adb
--- /dev/null
+++ b/ckanext/mapviews/theme/public/webassets.yml
@@ -0,0 +1,25 @@
+main-css:
+  output: ckanext-mapviews/main.css
+  extra:
+    preload:
+      - base/main
+  contents:
+    - vendor/leaflet.css
+    - vendor/leaflet.label.css
+    - navigablemap.css
+    - choroplethmap.css
+
+main:
+  output: ckanext-mapviews/main.js
+  extra:
+    preload:
+      - base/main
+  contents:
+    - vendor/leaflet.js
+    - vendor/leaflet.label.js
+    - vendor/d3.scale.quantize.js
+    - vendor/backend.ckan.js
+    - vendor/queryStringToJSON.js
+    - ckan_map_modules.js
+    - navigablemap.js
+    - choroplethmap.js
\ No newline at end of file
diff --git a/ckanext/mapviews/theme/templates/base.html b/ckanext/mapviews/theme/templates/base.html
new file mode 100644
index 0000000..e0bc374
--- /dev/null
+++ b/ckanext/mapviews/theme/templates/base.html
@@ -0,0 +1,6 @@
+{% ckan_extends %}
+
+{% block styles %}
+    {{ super() }}
+    {% asset 'mapviews/main-css' %}
+{% endblock %}
diff --git a/ckanext/mapviews/theme/templates/choroplethmap_view.html b/ckanext/mapviews/theme/templates/choroplethmap_view.html
index 99cd809..6013536 100644
--- a/ckanext/mapviews/theme/templates/choroplethmap_view.html
+++ b/ckanext/mapviews/theme/templates/choroplethmap_view.html
@@ -1,4 +1,4 @@
-{% resource "mapviews/main" %}
+{% asset "mapviews/main" %}
 
 <div
   data-module = "choroplethmap"
diff --git a/ckanext/mapviews/theme/templates/navigablemap_form.html b/ckanext/mapviews/theme/templates/navigablemap_form.html
index 1d658fb..1747533 100644
--- a/ckanext/mapviews/theme/templates/navigablemap_form.html
+++ b/ckanext/mapviews/theme/templates/navigablemap_form.html
@@ -1,4 +1,4 @@
-{% resource 'mapviews/main' %}
+{% asset 'mapviews/main' %}
 {% import 'macros/form.html' as form %}
 
 {% macro filterFields(name, label='', options='', error='', fields={}, classes=[], attrs={}, is_required=false) %}
diff --git a/ckanext/mapviews/theme/templates/navigablemap_view.html b/ckanext/mapviews/theme/templates/navigablemap_view.html
index 7a5ea41..43d5157 100644
--- a/ckanext/mapviews/theme/templates/navigablemap_view.html
+++ b/ckanext/mapviews/theme/templates/navigablemap_view.html
@@ -1,4 +1,4 @@
-{% resource "mapviews/main" %}
+{% asset "mapviews/main" %}
 
 <div
   data-module = "navigablemap"
diff --git a/ckanext/mapviews/theme/templates/page.html b/ckanext/mapviews/theme/templates/page.html
new file mode 100644
index 0000000..b2f7ba6
--- /dev/null
+++ b/ckanext/mapviews/theme/templates/page.html
@@ -0,0 +1,9 @@
+{% ckan_extends %}
+
+{%- block scripts %}
+
+  {{ super() }}
+  {% asset 'mapviews/main' %}
+
+{% endblock -%}
+