diff --git a/highcharts/highcharts/highcharts.py b/highcharts/highcharts/highcharts.py
index 59e093e..f3a9fd1 100644
--- a/highcharts/highcharts/highcharts.py
+++ b/highcharts/highcharts/highcharts.py
@@ -75,10 +75,7 @@ def __init__(self, **kwargs):
             ]
 
         # set CSS src
-        self.CSSsource = [
-                'https://www.highcharts.com/highslide/highslide.css',
-
-            ]
+        self.CSSsource = []
 
         self.offline = kwargs.get("offline", False)
 
@@ -340,7 +337,7 @@ def buildhtmlheader(self):
         """generate HTML header content"""
         
         if self.drilldown_flag:
-            self.add_JSsource('http://code.highcharts.com/modules/drilldown.js')
+            self.add_JSsource('https://code.highcharts.com/9/modules/drilldown.js')
 
 
 
diff --git a/highcharts/highmaps/highmaps.py b/highcharts/highmaps/highmaps.py
index 0d73afc..75bdee0 100644
--- a/highcharts/highmaps/highmaps.py
+++ b/highcharts/highmaps/highmaps.py
@@ -66,17 +66,15 @@ def __init__(self, **kwargs):
         # Set Javascript src
         self.JSsource = [
                 'https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js',
-                'https://code.highcharts.com/maps/6/highmaps.js',
-                'https://code.highcharts.com/6/highcharts.js',
-                'https://code.highcharts.com/maps/6/modules/map.js',
-                'https://code.highcharts.com/maps/6/modules/data.js',
-                'https://code.highcharts.com/maps/6/modules/exporting.js'
+                'https://code.highcharts.com/maps/9/highmaps.js',
+                'https://code.highcharts.com/9/highcharts.js',
+                'https://code.highcharts.com/maps/9/modules/map.js',
+                'https://code.highcharts.com/maps/9/modules/data.js',
+                'https://code.highcharts.com/maps/9/modules/exporting.js'
             ]
 
         # set CSS src
-        self.CSSsource = [
-                'https://www.highcharts.com/highslide/highslide.css',
-            ]
+        self.CSSsource = []
         # Set data
         self.data = []
         self.data_temp = []
@@ -380,7 +378,7 @@ def buildhtmlheader(self):
         #Highcharts lib/ needs to make sure it's up to date
         
         if self.drilldown_flag:
-            self.add_JSsource('https://code.highcharts.com/maps/modules/drilldown.js')
+            self.add_JSsource('https://code.highcharts.com/maps/9/modules/drilldown.js')
 
         self.header_css = [
             '<link href="%s" rel="stylesheet" />' % h for h in self.CSSsource
diff --git a/highcharts/highmaps/templates/content.html b/highcharts/highmaps/templates/content.html
index f0f6a95..bf7361a 100644
--- a/highcharts/highmaps/templates/content.html
+++ b/highcharts/highmaps/templates/content.html
@@ -26,7 +26,7 @@
             var option = {{chart.option}};
 
         {% if chart.mapdata_flag %}
-            var geojson = {{chart.mapdata}}
+            var geojson = $.parseJSON({{chart.mapdata}});
         {% endif %}
 
             var data = {{chart.data}};
diff --git a/highcharts/highstock/highstock.py b/highcharts/highstock/highstock.py
index ef8610d..942f2c8 100644
--- a/highcharts/highstock/highstock.py
+++ b/highcharts/highstock/highstock.py
@@ -68,10 +68,7 @@ def __init__(self, **kwargs):
             ]
 
         # set CSS src
-        self.CSSsource = [
-                'https://www.highcharts.com/highslide/highslide.css',
-
-            ]
+        self.CSSsource = []
         # set data
         self.data = []
         self.data_temp = []