diff --git a/filebrowser/templates/filebrowser/append.html b/filebrowser/templates/filebrowser/append.html
index a96b386..b3ba19f 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 7c17fb4..bda8a1a 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 c847e7b..9b98743 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 c8a04de..186600e 100644
--- a/filebrowser/templates/filebrowser/include/filelisting.html
+++ b/filebrowser/templates/filebrowser/include/filelisting.html
@@ -1,8 +1,8 @@
-{% load i18n adminmedia fb_tags fb_versions %}
+{% load i18n fb_tags fb_versions static %}
 
 {% for file in page.object_list %}
     <tr class="{% cycle 'row1' 'row2' %}{% if file.filetype == "Folder" %} fb_folder{% endif %}">
-        
+
         <!-- FILESELECT FOR FILEBROWSEFIELD -->
         {% if query.pop == "1" and results_var.select_total %}
             <td class="fb_icon">
@@ -14,7 +14,7 @@
                 {% endif %}
             </td>
         {% endif %}
-        
+
         <!-- FILESELECT FOR RTE/TINYMCE -->
         {% if query.pop == "2" and results_var.select_total %}
             <td class="fb_icon">
@@ -26,7 +26,7 @@
                 {% endif %}
             </td>
         {% endif %}
-        
+
         <!-- FILESELECT FOR CKEDITOR (FORMER "FCKEDITOR") -->
         {% if query.pop == "3" and results_var.select_total %}
             <td class="fb_icon">
@@ -38,19 +38,19 @@
                 {% endif %}
             </td>
         {% endif %}
-        
+
         <!-- FILEICON -->
         <td>
             <img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_type_{{ file.filetype|lower }}.gif" />
         </td>
-        
+
         <!-- THUMBNAIL -->
         <td class="fb_thumbnail">
             {% if file.filetype == "Image" %}
                 <a href="{{ file.url_full }}" class="fb_viewlink"><img src="{% version file.path settings_var.ADMIN_THUMBNAIL %}" title="{% trans 'View Image' %}" /></a>
             {% endif %}
         </td>
-        
+
         <!-- 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>
@@ -74,10 +74,10 @@
             </td>
         {% endif %}
 
-          
+
         <!-- SIZE -->
         <td>{{ file.filesize|filesizeformat }}</td>
-        
+
         <!-- DATE -->
         <td>{{ file.datetime|date:"N j, Y" }}</td>
 
@@ -96,7 +96,7 @@
           {% endifnotequal %}
         </td>
         {% endif %}
-        
+
         <!-- DEBUG -->
         {% if settings_var.DEBUG %}
         <td>
@@ -125,8 +125,8 @@
             {% endif %}
         </td>
         {% endif %}
-        
+
     </tr>
 {% endfor %}
 
- 
+
diff --git a/filebrowser/templates/filebrowser/include/search.html b/filebrowser/templates/filebrowser/include/search.html
index 03c3ddb..d317949 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>
@@ -8,7 +8,7 @@ <h2 class="collapse-toggle collapse-open">{% trans 'Search' %}xx</h2>
 <div id="toolbar">
     <form id="changelist-search" action="." method="get">
         <div><!-- DIV needed for valid HTML -->
-        <label for="searchbar"><img src="{{ STATIC_URL }}filebrowser/img/icon-searchbox.png" alt="Search" /></label>
+        <label for="searchbar"><img src="{% static "filebrowser/img/icon-searchbox.png" %}" alt="Search" /></label>
         <input type="text" size="40" name="q" value="{{ q }}" id="searchbar" />
         {% if query.filter_type %}<input type="hidden" name="filter_type" value="{{ query.filter_type }}" />{% endif %}
         {% if query.filter_date %}<input type="hidden" name="filter_date" value="{{ query.filter_date }}" />{% endif %}
@@ -17,7 +17,7 @@ <h2 class="collapse-toggle collapse-open">{% trans 'Search' %}xx</h2>
         {% if query.pop %}<input type="hidden" name="pop" value="{{ query.pop }}" />{% endif %}
         {% if query.type %}<input type="hidden" name="type" value="{{ query.type }}" />{% endif %}
         <input type="submit" value="{% trans "Go" %}" />
-        
+
         <p class="help"><strong>Search for:</strong> Filename</p>
         {% if results_var.results_total %}
         {% if query.filter_type or query.filter_date or query.q %}
diff --git a/filebrowser/templates/filebrowser/include/toolbar.html b/filebrowser/templates/filebrowser/include/toolbar.html
index ed533a2..6501d0d 100644
--- a/filebrowser/templates/filebrowser/include/toolbar.html
+++ b/filebrowser/templates/filebrowser/include/toolbar.html
@@ -1,9 +1,9 @@
-{% load i18n adminmedia fb_tags %}
+{% load i18n static fb_tags %}
 
 <div id="toolbar">
   <form id="changelist-search" action="." method="get">
     <div><!-- DIV needed for valid HTML -->
-      <label for="searchbar"><img alt="Search" src="{{ STATIC_URL }}filebrowser/img/icon-searchbox.png"></label>
+      <label for="searchbar"><img alt="Search" src="{% static "filebrowser/img/icon-searchbox.png" %}"></label>
       <input type="text" name="q" value="{{ query.q }}" id="searchbar" />
       {% if query.filter_type %}<input type="hidden" name="filter_type" value="{{ query.filter_type }}" />{% endif %}
       {% if query.filter_date %}<input type="hidden" name="filter_date" value="{{ query.filter_date }}" />{% endif %}
diff --git a/filebrowser/templates/filebrowser/index.html b/filebrowser/templates/filebrowser/index.html
index 7ca9382..50a9323 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 "admin/css/changelists.css" %}" />
     <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
 {% endblock %}
 
@@ -25,7 +25,7 @@
     <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_CKEditor.js"></script>
     {% endifequal %}
     {{ media }}
-    
+
     {% if not actions_on_top and not actions_on_bottom %}
     <style>
         #changelist table thead th:first-child { width: inherit; }
@@ -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 4dd4bbe..0f27d03 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 "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 37cad83..d4d51d9 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 "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 17fc025..8cc2d28 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 "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 "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 "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 42a529e..c4b89ec 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 "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">
@@ -18,24 +18,24 @@
 <!-- JAVASCRIPTS -->
 {% block extrahead %}
     {{ block.super }}
-    
+
     {% ifequal query.pop '1' %}
     <!-- FileBrowseField -->
     <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_FileBrowseField.js"></script>
     {% endifequal %}
-    
+
     {% ifequal query.pop '2' %}
     <!-- TinyMCE -->
     <script language="javascript" type="text/javascript" src="{{ settings_var.URL_TINYMCE }}tiny_mce_popup.js"></script>
     <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_TinyMCE.js"></script>
     {% if query.mce_rdomain %}<script language="javascript">document.domain = "{{ query.mce_rdomain }}"</script>{% endif %}
     {% endifequal %}
-    
+
     {% ifequal query.pop '3' %}
     <!-- CKeditor (former "FCKeditor") -->
     <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_CKEditor.js"></script>
     {% endifequal %}
-    
+
     {{ media }}
 {% endblock %}
 
@@ -53,28 +53,28 @@
         <table cellspacing="0">
             <thead>
                 <tr>
-                
+
                 <!-- Select -->
                 {% ifequal query.pop '1' %}<th></th>{% endifequal %}
                 {% ifequal query.pop '2' %}<th></th>{% endifequal %}
                 {% ifequal query.pop '3' %}<th></th>{% endifequal %}
-                
+
                 <!-- Filename/Dimensions  -->
                 <th>{% trans 'Name' %}</th>
-                
+
                 <!-- Version -->
                 <th>{% trans 'Image Version' %}</th>
-                
+
                 <!-- Debug -->
                 {% if settings_var.DEBUG %}<th>{% trans "Debug" %}</th>{% endif %}
-                
+
                 </tr>
             </thead>
             <tbody>
             {% for version in settings_var.ADMIN_VERSIONS %}
                 {% version_object original version as image_version %}
                 <tr class="{% cycle 'row1' 'row2' %}">
-                
+
                 <!-- Fileselect for FileBrowseField -->
                 {% ifequal query.pop '1' %}
                 <td class="fb_icon">
@@ -86,7 +86,7 @@
                     {% endif %}
                 </td>
                 {% endifequal %}
-                
+
                 <!-- Fileselect for RTE/TinyMCE -->
                 {% ifequal query.pop '2' %}
                 <td class="fb_icon">
@@ -98,7 +98,7 @@
                     {% endif %}
                 </td>
                 {% endifequal %}
-                
+
                 <!-- Fileselect for CKeditor (former "FCKeditor") -->
                 {% ifequal query.pop '3' %}
                 <td class="fb_icon">
@@ -110,7 +110,7 @@
                     {% endif %}
                 </td>
                 {% endifequal %}
-                
+
                 <!-- Filename / Dimensions  -->
                 <td>
                     {% version_setting version %}
@@ -118,10 +118,10 @@
                     {% if version_setting.width %}{% trans "Width" %}: {{ version_setting.width }}px<br />{% endif %}
                     {% if version_setting.height %}{% trans "Height" %}: {{ version_setting.height }}px{% endif %}
                 </td>
-                
+
                 <!-- Version -->
                 <th><img src="{{ image_version.url_full }}" /></th>
-                
+
                 <!-- Debug -->
                 {% if settings_var.DEBUG %}
                 <td>
@@ -131,22 +131,22 @@
                     <strong>Extension</strong> {{ image_version.extension }}<br />
                     <strong>Date</strong> {{ image_version.date }}<br />
                     <strong>Datetime Object</strong> {{ image_version.datetime }}<br /><br />
-                    
+
                     <strong>Relative Path</strong> {{ image_version.path_relative }}<br />
                     <strong>Full Path</strong> {{ image_version.path_full }}<br />
                     <strong>Relative URL</strong> {{ image_version.url_relative }}<br />
                     <strong>Full URL</strong> {{ image_version.url_full }}<br /><br />
-                    
+
                     <strong>URL for FileBrowseField</strong> {{ image_version.url_save }}<br />
                     <strong>Thumbnail URL</strong> {{ image_version.url_thumbnail }}<br /><br />
-                    
+
                     <strong>Dimensions</strong> {{ image_version.dimensions }}<br />
                     <strong>Width</strong> {{ image_version.width }}<br />
                     <strong>Height</strong> {{ image_version.height }}<br />
                     <strong>Orientation</strong> {{ image_version.orientation }}
                 </td>
                 {% endif %}
-                
+
                 </tr>
             {% endfor %}
             </tbody>