diff --git a/fabfile.py b/fabfile.py
index ab5477cd..f1cc1ee7 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -254,6 +254,7 @@ def collect_remote_statics():
         'leaflet': "git://github.com/CloudMade/Leaflet.git",
         'draw': "git://github.com/jacobtoye/Leaflet.draw.git",
         'hash': "git://github.com/mlevans/leaflet-hash.git",
+        'storage': 'git://github.com/yohanboniface/leaflet-storage.git',
     }
     with cd(remote_static_dir):
         for subdir, repository in remote_repositories.iteritems():
diff --git a/youmap/templates/base.html b/youmap/templates/base.html
index be247987..db3cb955 100644
--- a/youmap/templates/base.html
+++ b/youmap/templates/base.html
@@ -41,7 +41,7 @@
     {% block bottom_js %}
     <script type="text/javascript">
         $(document).foundationAlerts();
-        L.Chickpea.on('modal_ready', function (e) {
+        L.Storage.on('modal_ready', function (e) {
             var $div = $('#reveal-container');
             // reset class
             $div.attr("class", "");
@@ -53,13 +53,13 @@
             $div.unbind('.reveal');
             return $div.empty().html(e.data.html).append('<a class="close-reveal-modal">&#215;</a>').reveal();
         });
-        L.Chickpea.on('modal_close', function (e) {
+        L.Storage.on('modal_close', function (e) {
             var $div = $('#reveal-container')
             if ($div) {
                 $div.trigger('reveal:close');
             }
         });
-        L.Chickpea.on('alert', function (e) {
+        L.Storage.on('alert', function (e) {
             var level_class = e.level && e.level == "info"? "success": "alert";
             $div = $('<div>').addClass('alert-box global').addClass(level_class).html(e.content);
             $div.append('<a href="#" class="close">&times;</a>');
@@ -68,7 +68,7 @@
         $('a.reveal').click(function(e) {
           e.preventDefault();
           var $this = $(this);
-          L.Util.Xhr.get($this.attr('href'));
+          L.Storage.Xhr.get($this.attr('href'));
         });
     </script>
     {% endblock %}
diff --git a/youmap/templates/chickpea/map_form.html b/youmap/templates/chickpea/map_form.html
index c293d9a8..14277e05 100644
--- a/youmap/templates/chickpea/map_form.html
+++ b/youmap/templates/chickpea/map_form.html
@@ -19,5 +19,5 @@
 </form>
 
 <script type="text/javascript">
-    L.Util.Xhr.listen_form('map_edit');
+    L.Storage.Xhr.listen_form('map_edit');
 </script>
\ No newline at end of file
diff --git a/youmap/templates/chickpea/map_update_tilelayers.html b/youmap/templates/chickpea/map_update_tilelayers.html
index 592b78f3..deed9ee0 100644
--- a/youmap/templates/chickpea/map_update_tilelayers.html
+++ b/youmap/templates/chickpea/map_update_tilelayers.html
@@ -19,5 +19,5 @@
 </form>
 
 <script type="text/javascript">
-    L.Util.Xhr.listen_form('map_edit');
+    L.Storage.Xhr.listen_form('map_edit');
 </script>
\ No newline at end of file
diff --git a/youmap/templates/youmap/home.html b/youmap/templates/youmap/home.html
index 48ccd200..be8d94e1 100644
--- a/youmap/templates/youmap/home.html
+++ b/youmap/templates/youmap/home.html
@@ -127,14 +127,14 @@
       $('a.login_button').click(function (e) {
         e.preventDefault();
         var $this = $(this);
-        L.Util.Xhr.login({"login_required": $this.attr('href')});
+        L.Storage.Xhr.login({"login_required": $this.attr('href')});
       });
     });
     $(document).ready(function(e){
       $('a.logout_button').click(function (e) {
         e.preventDefault();
         var $this = $(this);
-        L.Util.Xhr.logout($this.attr('href'));
+        L.Storage.Xhr.logout($this.attr('href'));
       });
     });
   </script>