diff --git a/config/development/local_settings.py b/config/development/local_settings.py
index 5d762c9..9539818 100644
--- a/config/development/local_settings.py
+++ b/config/development/local_settings.py
@@ -10,5 +10,3 @@ DATABASES = {
         'NAME': 'dev_ddbb.sqlite',
     }
 }
-
-JINGO_EXCLUDE_APPS = ('debug_toolbar',)
diff --git a/minecraftcodex/herobrine/settings.py b/minecraftcodex/herobrine/settings.py
index 332da06..54a3e7b 100644
--- a/minecraftcodex/herobrine/settings.py
+++ b/minecraftcodex/herobrine/settings.py
@@ -93,7 +93,7 @@ TEMPLATE_LOADERS = (
 #     'django.template.loaders.eggs.Loader',
 )
 
-JINGO_INCLUDE_PATTERN = r'\.jinja2'
+JINGO_INCLUDE_PATTERN = r'\.html'
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
@@ -132,6 +132,16 @@ INSTALLED_APPS = (
 GRAPPELLI_ADMIN_TITLE = 'Minecraft Codex'
 AUTOCOMPLETE_LIMIT = 10
 
+# Jingo
+EXCLUDE_APPS = (
+    'admin',
+    'debug_toolbar', # If installed
+)
+JINJA_CONFIG = {
+    'autoescape': True
+}
+#from herobrine import filters
+
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.