diff --git a/beat/web/libraries/views.py b/beat/web/libraries/views.py
index 38ce49142a28690e2e91b5296bda90620d2daf2b..79b3af4402372e611954a9e03c966c916fe29d6b 100644
--- a/beat/web/libraries/views.py
+++ b/beat/web/libraries/views.py
@@ -27,8 +27,7 @@
 
 from django.http import Http404, HttpResponseForbidden
 from django.shortcuts import get_object_or_404
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 from django.views.decorators.csrf import csrf_protect
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
@@ -55,14 +54,13 @@ def create(request):
     visible_libraries = Library.objects.from_author_and_public(request.user,
                                                                request.user.username).order_by('-creation_date')
 
-    return render_to_response('libraries/edition.html',
-                              dict(
-                                  op="new",
-                                  texts=Messages,
-                                  visible_libraries=visible_libraries,
-                              ),
-                              context_instance=RequestContext(request)
-    )
+    return render(request,
+                  'libraries/edition.html',
+                  dict(
+                      op="new",
+                      texts=Messages,
+                      visible_libraries=visible_libraries,
+                  ))
 
 
 @csrf_protect
@@ -81,15 +79,14 @@ def new_version(request, name):
     visible_libraries = Library.objects.from_author_and_public(request.user,
                                                                request.user.username).order_by('-creation_date')
 
-    return render_to_response('libraries/edition.html',
-                              dict(
-                                  op="new-version",
-                                  texts=Messages,
-                                  library=previous_version[0],
-                                  visible_libraries=visible_libraries,
-                              ),
-                              context_instance=RequestContext(request)
-    )
+    return render(request,
+                  'libraries/edition.html',
+                  dict(
+                      op="new-version",
+                      texts=Messages,
+                      library=previous_version[0],
+                      visible_libraries=visible_libraries,
+                  ))
 
 
 @csrf_protect
@@ -119,14 +116,14 @@ def fork(request, author_name, name, version):
     visible_libraries = Library.objects.from_author_and_public(request.user,
                                                                request.user.username).order_by('-creation_date')
 
-    return render_to_response('libraries/edition.html',
-                              dict(
-                                  op="fork",
-                                  texts=Messages,
-                                  library=fork_of,
-                                  visible_libraries=visible_libraries,
-                              ),
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'libraries/edition.html',
+                  dict(
+                      op="fork",
+                      texts=Messages,
+                      library=fork_of,
+                      visible_libraries=visible_libraries,
+                  ))
 
 
 #----------------------------------------------------------
@@ -153,14 +150,14 @@ def edit(request, author_name, name, version):
     visible_libraries = Library.objects.from_author_and_public(request.user,
                                                                request.user.username).exclude(id=library.id).order_by('-creation_date')
 
-    return render_to_response('libraries/edition.html',
-                              dict(
-                                  op="edit",
-                                  texts=Messages,
-                                  library=library,
-                                  visible_libraries=visible_libraries,
-                              ),
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'libraries/edition.html',
+                  dict(
+                      op="edit",
+                      texts=Messages,
+                      library=library,
+                      visible_libraries=visible_libraries,
+                  ))
 
 
 #----------------------------------------------------------
@@ -195,14 +192,14 @@ def view(request, author_name, name, version=None):
     users = User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username')
 
     # Render the page
-    return render_to_response('libraries/view.html',
-                              {
-                                  'library': library,
-                                  'owner': owner,
-                                  'users': users,
-                                  'teams': Team.objects.all(),
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'libraries/view.html',
+                  {
+                      'library': library,
+                      'owner': owner,
+                      'users': users,
+                      'teams': Team.objects.all(),
+                  })
 
 
 #----------------------------------------------------------
@@ -218,15 +215,15 @@ def diff(request, author1, name1, version1, author2, name2, version2):
 
     """
 
-    return render_to_response('libraries/diff.html',
-                              {'library1_author':  author1,
-                               'library1_name':    name1,
-                               'library1_version': version1,
-                               'library2_author':  author2,
-                               'library2_name':    name2,
-                               'library2_version': version2,
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'libraries/diff.html',
+                  {'library1_author':  author1,
+                   'library1_name':    name1,
+                   'library1_version': version1,
+                   'library2_author':  author2,
+                   'library2_name':    name2,
+                   'library2_version': version2,
+                  })
 
 
 #----------------------------------------------------------
@@ -245,14 +242,13 @@ def ls(request, author_name):
                                                      author_name).order_by('-creation_date')
     objects = Library.filter_latest_versions(objects)
 
-    return render_to_response('libraries/list.html',
-                              dict(
-                                  objects=objects,
-                                  author=author,
-                                  owner=(request.user==author),
-                              ),
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'libraries/list.html',
+                  dict(
+                      objects=objects,
+                      author=author,
+                      owner=(request.user==author),
+                  ))
 
 
 #----------------------------------------------------------
@@ -265,11 +261,10 @@ def public_ls(request):
     objects = Library.objects.public().order_by('-creation_date')
     objects = Library.filter_latest_versions(objects)
 
-    return render_to_response('libraries/list.html',
-                              dict(
-                                  objects=objects,
-                                  author=request.user, #anonymous
-                                  owner=False,
-                              ),
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'libraries/list.html',
+                  dict(
+                      objects=objects,
+                      author=request.user, #anonymous
+                      owner=False,
+                  ))