diff --git a/requirements.in b/requirements.in
index a004b26..7d1571c 100644
--- a/requirements.in
+++ b/requirements.in
@@ -12,8 +12,8 @@ https://control.divio.com/api/v1/apps/serve/djangocms-text-ckeditor/3.6.0.0/28f3
 https://control.divio.com/api/v1/apps/serve/django-filer/1.3.2/a68cceeb-0373-47af-9cf6-01dbc9bead40/django-filer-1.3.2.tar.gz#egg=django-filer==1.3.2
 # </INSTALLED_ADDONS>
 Whoosh==2.7.4
-django-haystack==2.7.0
-aldryn-search==0.5.0
+django-haystack==2.8.1
+aldryn-search==1.0.0
 django-fontawesome==0.3.1
 mailchimp3==2.1.0
 django-image-cropping==1.1.0
diff --git a/settings.py b/settings.py
index ed95e15..3eba910 100644
--- a/settings.py
+++ b/settings.py
@@ -30,7 +30,6 @@ INSTALLED_APPS.extend([
     'fontawesome',
     'haystack',
     'aldryn_search',
-    'spurl',
     'image_cropping',
 ])
 
@@ -55,19 +54,23 @@ MAILCHIMP_LIST_ID = 'da4143acda'
 # ALDRYN_SEARCH_DEFAULT_LANGUAGE = 'de'
 ALDRYN_SEARCH_INDEX_BASE_CLASS = 'project.search.SearchIndex'
 
+ALDRYN_SEARCH_EXCLUDED_PLUGINS = [
+    'NewsletterSubscriptionPlugin', 'NewsletterArchivePlugin'
+]
+
 HAYSTACK_CUSTOM_HIGHLIGHTER = 'project.search.Highlighter'
 HAYSTACK_DEFAULT_OPERATOR = 'OR'
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
-        'PATH': os.path.join(os.path.dirname(__file__), 'data', 'whoosh', 'default'),
+        'PATH': os.path.join('/tmp/whoosh', 'default'),
     },
 }
 for lang_code, lang in LANGUAGES:
     HAYSTACK_CONNECTIONS[lang_code] = {}
     HAYSTACK_CONNECTIONS[lang_code].update({
         'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
-        'PATH': os.path.join(os.path.dirname(__file__), 'data', 'whoosh', lang_code),
+        'PATH': os.path.join('/tmp/whoosh', lang_code),
     })
 
 HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter', ]
@@ -218,4 +221,4 @@ FILER_STORAGES = {
             },
         },
     },
-}
\ No newline at end of file
+}
diff --git a/src/project/context_processors.py b/src/project/context_processors.py
index 395669b..e7596e5 100644
--- a/src/project/context_processors.py
+++ b/src/project/context_processors.py
@@ -5,15 +5,7 @@ from project.models import Notification
 
 
 def search_form(request):
-    egg_pages = (
-        (81, 'C', 1),
-        (83, 'R', 2),
-        (95, 'E', 3),
-        (105, 'D', 4),
-        (99, 'O', 5),
-    )
     return {
-        'egg_pages': egg_pages,
         'search_form': ModelSearchForm
     }
 
diff --git a/src/project/templates/project/content.html b/src/project/templates/project/content.html
index eaa3b3b..834b34b 100644
--- a/src/project/templates/project/content.html
+++ b/src/project/templates/project/content.html
@@ -30,28 +30,6 @@
                         {% block content_main %}
                             {% placeholder 'content' %}
                         {% endblock %}
-
-                        {% for page, letter, position in egg_pages %}
-                            {% if page == request.current_page.pk %}
-                                <a href="#" class="search__contest__item data_id_{{ forloop.counter }}">
-                                    <span class="letter">{{ letter }}</span>
-                                    <span class="position">{{ position }}</span>
-
-                                    <div class="flower petal{% cycle '5' '8' '10' %} {% cycle 'roundpetal' '' %}">
-                                        <div class="petal">
-                                            <div class="petal">
-                                                <div class="petal">
-                                                    <div class="petal">
-                                                        <div class="petal">
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </a>
-                            {% endif %}
-                        {% endfor %}
                     </div>
                 </div>
             </div>
diff --git a/static/djangocms_text_ckeditor/.aldryn-folder b/static/djangocms_text_ckeditor/.aldryn-folder
deleted file mode 100644
index e69de29..0000000