diff --git a/filebrowser/templates/filebrowser/append.html b/filebrowser/templates/filebrowser/append.html
index a96b3861..b5fc0248 100644
--- a/filebrowser/templates/filebrowser/append.html
+++ b/filebrowser/templates/filebrowser/append.html
@@ -4,9 +4,9 @@
     <table>
         <caption>{% trans "FileBrowser" %}</caption>
         <tr class="row2">
-            <th scope="row"><a href="{% url fb_browse %}">{% trans "FileBrowser" %}</a></th>
+            <th scope="row"><a href="{% url "fb_browse" %}">{% trans "FileBrowser" %}</a></th>
             <td> </td>
             <td> </td>
         </tr>
     </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/filebrowser/templates/filebrowser/custom_field.html b/filebrowser/templates/filebrowser/custom_field.html
index 7c17fb4c..61ed0f04 100644
--- a/filebrowser/templates/filebrowser/custom_field.html
+++ b/filebrowser/templates/filebrowser/custom_field.html
@@ -1,5 +1,5 @@
 {% load fb_versions %}
-<input id="{{ final_attrs.id }}" type="text" class="vFileBrowseField" name="{{ final_attrs.name }}" value="{{ value }}" /><a href="javascript:FileBrowser.show('{{ final_attrs.id }}', '{% url fb_browse %}?pop=1{% if final_attrs.directory %}&amp;dir={{ final_attrs.directory }}{% endif %}{% if final_attrs.format %}&amp;type={{ final_attrs.format }}{% endif %}');" class="fb_show">
+<input id="{{ final_attrs.id }}" type="text" class="vFileBrowseField" name="{{ final_attrs.name }}" value="{{ value }}" /><a href="javascript:FileBrowser.show('{{ final_attrs.id }}', '{% url "fb_browse" %}?pop=1{% if final_attrs.directory %}&amp;dir={{ final_attrs.directory }}{% endif %}{% if final_attrs.format %}&amp;type={{ final_attrs.format }}{% endif %}');" class="fb_show">
     <img src="{{ final_attrs.search_icon }}" alt="" />
 </a>
 {% ifequal value.filetype "Image" %}
diff --git a/filebrowser/templates/filebrowser/include/breadcrumbs.html b/filebrowser/templates/filebrowser/include/breadcrumbs.html
index c847e7be..82d30629 100644
--- a/filebrowser/templates/filebrowser/include/breadcrumbs.html
+++ b/filebrowser/templates/filebrowser/include/breadcrumbs.html
@@ -5,16 +5,16 @@
         <a href="../../">{% trans "Home" %}</a> &rsaquo;
     {% endif %}
     {% if breadcrumbs or breadcrumbs_title %}
-        <a href="{% url fb_browse %}{% query_string "" "dir,filename,p" %}">{% trans 'FileBrowser' %}</a> &rsaquo;
+        <a href="{% url "fb_browse" %}{% query_string "" "dir,filename,p" %}">{% trans 'FileBrowser' %}</a> &rsaquo;
     {% else %}
         {% trans 'FileBrowser' %}
     {% endif %}
     {% for item in breadcrumbs %}
         {% if not forloop.last %}
-            <a href="{% url fb_browse %}{% query_string "" "dir,filename,p" %}&amp;dir={{ item.1 }}">{{ item.0 }}</a> &rsaquo;
+            <a href="{% url "fb_browse" %}{% query_string "" "dir,filename,p" %}&amp;dir={{ item.1 }}">{{ item.0 }}</a> &rsaquo;
         {% else %}
             {% if breadcrumbs_title %}
-                <a href="{% url fb_browse %}{% query_string "" "dir,filename,p" %}&amp;dir={{ item.1 }}">{{ item.0 }}</a> &rsaquo;
+                <a href="{% url "fb_browse" %}{% query_string "" "dir,filename,p" %}&amp;dir={{ item.1 }}">{{ item.0 }}</a> &rsaquo;
             {% else %}
                 {{ item.0 }}
             {% endif %}
diff --git a/filebrowser/templates/filebrowser/include/filelisting.html b/filebrowser/templates/filebrowser/include/filelisting.html
index c8a04dea..243a24f1 100644
--- a/filebrowser/templates/filebrowser/include/filelisting.html
+++ b/filebrowser/templates/filebrowser/include/filelisting.html
@@ -1,4 +1,4 @@
-{% load i18n adminmedia fb_tags fb_versions %}
+{% load i18n static fb_tags fb_versions %}
 
 {% for file in page.object_list %}
     <tr class="{% cycle 'row1' 'row2' %}{% if file.filetype == "Folder" %} fb_folder{% endif %}">
@@ -53,7 +53,7 @@
         
         <!-- FILENAME/DIMENSIONS -->
         {% if file.filetype == "Folder" %}
-            <td><a href="{% url fb_browse %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
+            <td><a href="{% url "fb_browse" %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
         {% else %}
             <td>
                 <b><a href="{{ file.url_full }}">{{ file.filename }}</a></b>
@@ -69,7 +69,7 @@
                 {% endif %}
                 {% endcomment %}
                 {% if results_var.images_total and settings_var.ADMIN_VERSIONS and file.filetype == "Image" %}
-                    <a class="internal fb_showversions" href="{% url fb_versions %}{% query_string "" "p" %}&amp;filename={{ file.filename }}" title="{% trans 'Versions' %}">{% trans 'Versions' %}</a>
+                    <a class="internal fb_showversions" href="{% url "fb_versions" %}{% query_string "" "p" %}&amp;filename={{ file.filename }}" title="{% trans 'Versions' %}">{% trans 'Versions' %}</a>
                 {% endif %}
             </td>
         {% endif %}
@@ -82,16 +82,16 @@
         <td>{{ file.datetime|date:"N j, Y" }}</td>
 
         <!-- RENAME -->
-        <td class="fb_icon"><a href="{% url fb_rename %}{% query_string %}&amp;filename={{ file.filename }}" class="fb_renamelink" title="{% trans 'Rename' %}"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_rename.gif" /></a></td>
+        <td class="fb_icon"><a href="{% url "fb_rename" %}{% query_string %}&amp;filename={{ file.filename }}" class="fb_renamelink" title="{% trans 'Rename' %}"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_rename.gif" /></a></td>
 
         <!-- DELETE -->
         {% if results_var.delete_total %}
         <td class="fb_icon">
           {% ifnotequal file.filetype 'Folder' %}
-          <a href="{% url fb_delete %}{% query_string %}&amp;filename={{ file.filename }}&amp;filetype={{ file.filetype }}" class="fb_deletelink" onclick="return confirm('{% trans "Are you sure you want to delete this file?" %}');" title="{% trans 'Delete File' %}"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_delete.gif" /></a>
+          <a href="{% url "fb_delete" %}{% query_string %}&amp;filename={{ file.filename }}&amp;filetype={{ file.filetype }}" class="fb_deletelink" onclick="return confirm('{% trans "Are you sure you want to delete this file?" %}');" title="{% trans 'Delete File' %}"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_delete.gif" /></a>
           {% else %}
           {% if file.is_empty %}
-          <a href="{% url fb_delete %}{% query_string %}&amp;filename={{ file.filename }}&amp;filetype={{ file.filetype }}" class="fb_deletelink" onclick="return confirm('{% trans "Are you sure you want to delete this Folder?" %}');" title="{% trans 'Delete Folder' %}"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_delete.gif" /></a>
+          <a href="{% url "fb_delete" %}{% query_string %}&amp;filename={{ file.filename }}&amp;filetype={{ file.filetype }}" class="fb_deletelink" onclick="return confirm('{% trans "Are you sure you want to delete this Folder?" %}');" title="{% trans 'Delete Folder' %}"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_delete.gif" /></a>
           {% endif %}
           {% endifnotequal %}
         </td>
diff --git a/filebrowser/templates/filebrowser/include/search.html b/filebrowser/templates/filebrowser/include/search.html
index 03c3ddbf..3a147b13 100644
--- a/filebrowser/templates/filebrowser/include/search.html
+++ b/filebrowser/templates/filebrowser/include/search.html
@@ -1,4 +1,4 @@
-{% load i18n adminmedia fb_tags %}
+{% load i18n static fb_tags %}
 <div class="search-results">
     <p>{% blocktrans count cl.result_count as counter %}1 result{% plural %}{{ counter }} results{% endblocktrans %}</p>
     <span class="quiet">{% blocktrans with cl.full_result_count as full_result_count %}{{ full_result_count }} total{% endblocktrans %}</span>
diff --git a/filebrowser/templates/filebrowser/include/toolbar.html b/filebrowser/templates/filebrowser/include/toolbar.html
index ed533a2f..8bd3f647 100644
--- a/filebrowser/templates/filebrowser/include/toolbar.html
+++ b/filebrowser/templates/filebrowser/include/toolbar.html
@@ -1,4 +1,4 @@
-{% load i18n adminmedia fb_tags %}
+{% load i18n static fb_tags %}
 
 <div id="toolbar">
   <form id="changelist-search" action="." method="get">
diff --git a/filebrowser/templates/filebrowser/index.html b/filebrowser/templates/filebrowser/index.html
index 7ca9382f..b4beeaf5 100644
--- a/filebrowser/templates/filebrowser/index.html
+++ b/filebrowser/templates/filebrowser/index.html
@@ -1,12 +1,12 @@
 {% extends "admin/base_site.html" %}
 
 <!-- LOADING -->
-{% load i18n adminmedia fb_tags fb_pagination %}
+{% load i18n static fb_tags fb_pagination %}
 
 <!-- STYLESHEETS -->
 {% block extrastyle %}
     {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/changelists.css" />
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}admin/css/changelists.css" />
     <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
 {% endblock %}
 
@@ -45,8 +45,8 @@
 <div id="content-main">
     {% block object-tools %}
     <ul class="object-tools">
-        <li><a href="{% url fb_mkdir %}{% query_string '' 'p' %}">{% trans "New Folder" %}</a></li>
-        <li><a href="{% url fb_upload %}{% query_string '' 'p' %}" class="focus">{% trans "Upload" %}</a></li>
+        <li><a href="{% url "fb_mkdir" %}{% query_string '' 'p' %}">{% trans "New Folder" %}</a></li>
+        <li><a href="{% url "fb_upload" %}{% query_string '' 'p' %}" class="focus">{% trans "Upload" %}</a></li>
     </ul>
     {% endblock %}
     <div class="module filtered" id="changelist">
diff --git a/filebrowser/templates/filebrowser/makedir.html b/filebrowser/templates/filebrowser/makedir.html
index 4dd4bbea..725d4840 100644
--- a/filebrowser/templates/filebrowser/makedir.html
+++ b/filebrowser/templates/filebrowser/makedir.html
@@ -1,12 +1,12 @@
 {% extends "admin/base_site.html" %}
 
 <!-- LOADING -->
-{% load i18n adminmedia fb_tags fb_csrf %}
+{% load i18n static fb_tags fb_csrf %}
 
 <!-- STYLESHEETS -->
 {% block extrastyle %}
     {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/forms.css" />
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}admin/css/forms.css" />
     <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
 {% endblock %}
 
diff --git a/filebrowser/templates/filebrowser/rename.html b/filebrowser/templates/filebrowser/rename.html
index 37cad835..7e6d1b43 100644
--- a/filebrowser/templates/filebrowser/rename.html
+++ b/filebrowser/templates/filebrowser/rename.html
@@ -1,12 +1,12 @@
 {% extends "admin/base_site.html" %}
 
 <!-- LOADING -->
-{% load i18n adminmedia fb_tags fb_csrf %}
+{% load i18n static fb_tags fb_csrf %}
 
 <!-- STYLESHEETS -->
 {% block extrastyle %}
     {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/forms.css" />
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}admin/css/forms.css" />
     <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
 {% endblock %}
 
diff --git a/filebrowser/templates/filebrowser/upload.html b/filebrowser/templates/filebrowser/upload.html
index 17fc025e..a3fc2109 100644
--- a/filebrowser/templates/filebrowser/upload.html
+++ b/filebrowser/templates/filebrowser/upload.html
@@ -1,12 +1,12 @@
 {% extends "admin/base_site.html" %}
 
 <!-- LOADING -->
-{% load i18n adminmedia fb_tags %}
+{% load i18n static fb_tags %}
 
 <!-- STYLESHEETS -->
 {% block extrastyle %}
     {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/forms.css" />
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}admin/css/forms.css" />
     <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
     <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/uploadify.css" />
 {% endblock %}
@@ -15,20 +15,20 @@
 {% block extrahead %}
     {{ block.super }}
     <script type="text/javascript" src="../../jsi18n/"></script>
-    <script type="text/javascript" src="{% custom_admin_media_prefix %}js/core.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}admin/js/core.js"></script>
 
     <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/jquery-1.3.2.min.js"></script>
     <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/jquery.uploadify.v2.1.0.js"></script>
     <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/swfobject.js"></script>
-    <script type="text/javascript" src="{% custom_admin_media_prefix %}js/admin/CollapsedFieldsets.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}admin/js/admin/CollapsedFieldsets.js"></script>
     <script type="text/javascript">
     (function($){
         $(document).ready(function() {
             $('#id_file').uploadify({
                 'uploader'          : '{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/uploadify.swf',
-                'script'            : '{% url fb_do_upload %}',
+                'script'            : '{% url "fb_do_upload" %}',
                 'scriptData'        : {'session_key': '{{session_key}}'},
-                'checkScript'       : '{% url fb_check %}',
+                'checkScript'       : '{% url "fb_check" %}',
                 'cancelImg'         : '{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/cancel.png',
                 'auto'              : false,
                 'folder'            : '{{ query.dir }}',
diff --git a/filebrowser/templates/filebrowser/versions.html b/filebrowser/templates/filebrowser/versions.html
index 42a529e0..79962bd1 100644
--- a/filebrowser/templates/filebrowser/versions.html
+++ b/filebrowser/templates/filebrowser/versions.html
@@ -1,12 +1,12 @@
 {% extends "admin/base_site.html" %}
 
 <!-- LOADING -->
-{% load i18n adminmedia fb_tags fb_versions %}
+{% load i18n static fb_tags fb_versions %}
 
 <!-- STYLESHEETS -->
 {% block extrastyle %}
     {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/changelists.css" />
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}admin/css/changelists.css" />
     <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
     {% if query.pop %}
     <style type="text/css">