diff --git a/addons/djangocms-snippet/addon.json b/addons/djangocms-snippet/addon.json
new file mode 100644
index 0000000..2bee667
--- /dev/null
+++ b/addons/djangocms-snippet/addon.json
@@ -0,0 +1,6 @@
+{
+    "installed-apps": [
+        "djangocms_snippet"
+    ], 
+    "package-name": "djangocms-snippet"
+}
\ No newline at end of file
diff --git a/addons/djangocms-snippet/aldryn_config.py b/addons/djangocms-snippet/aldryn_config.py
new file mode 100644
index 0000000..d43852c
--- /dev/null
+++ b/addons/djangocms-snippet/aldryn_config.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from aldryn_client import forms
+
+
+class Form(forms.BaseForm):
+    editor_theme = forms.CharField(
+        'Custom editor theme, (e.g. "twilight", default: "github")',
+        required=False,
+    )
+    editor_mode = forms.CharField(
+        'Custom editor mode (e.g. "javascript", default: "html")',
+        required=False,
+    )
+    enable_search = forms.CheckboxField(
+        'Enable snippet content to be searchable.',
+        required=False,
+        initial=False,
+    )
+
+    def to_settings(self, data, settings):
+        if data['editor_theme']:
+            settings['DJANGOCMS_SNIPPET_THEME'] = data['editor_theme']
+        if data['editor_mode']:
+            settings['DJANGOCMS_SNIPPET_MODE'] = data['editor_mode']
+        if data['enable_search']:
+            settings['DJANGOCMS_SNIPPET_SEARCH'] = data['enable_search']
+        return settings
diff --git a/addons/djangocms-snippet/settings.json b/addons/djangocms-snippet/settings.json
new file mode 100644
index 0000000..e5c022b
--- /dev/null
+++ b/addons/djangocms-snippet/settings.json
@@ -0,0 +1,5 @@
+{
+    "editor_mode": null, 
+    "editor_theme": null, 
+    "enable_search": false
+}
\ No newline at end of file
diff --git a/requirements.in b/requirements.in
index b5b32c6..fb89b22 100644
--- a/requirements.in
+++ b/requirements.in
@@ -3,6 +3,7 @@ https://control.divio.com/api/v1/apps/serve/aldryn-addons/1.0.2/24f5d1c8-66fe-43
 https://control.divio.com/api/v1/apps/serve/aldryn-django/1.8.19.1/5dfa4420-e075-4377-a4b7-9feeaa3f5efb/aldryn-django-1.8.19.1.tar.gz#egg=aldryn-django==1.8.19.1
 https://control.divio.com/api/v1/apps/serve/aldryn-sso/1.1.16/dbe0c45a-c981-4beb-8624-b0d2c4196aa0/aldryn-sso-1.1.16.tar.gz#egg=aldryn-sso==1.1.16
 https://control.divio.com/api/v1/apps/serve/djangocms-link/2.1.2/35b986c1-fafb-46ee-b665-aa36603f233a/djangocms-link-2.1.2.tar.gz#egg=djangocms-link==2.1.2
+https://control.divio.com/api/v1/apps/serve/djangocms-snippet/2.0.0/03734ae6-5d3e-44aa-8641-8f764dbced64/djangocms-snippet-2.0.0.tar.gz#egg=djangocms-snippet==2.0.0
 https://control.divio.com/api/v1/apps/serve/djangocms-text-ckeditor/3.5.3/a7b5179f-cea5-4af8-b235-6b7f709c4e6a/djangocms-text-ckeditor-3.5.3.tar.gz#egg=djangocms-text-ckeditor==3.5.3
 https://control.divio.com/api/v1/apps/serve/django-filer/1.3.0.1/bcb7d25b-6922-48a9-a252-9bc165f6403e/django-filer-1.3.0.1.tar.gz#egg=django-filer==1.3.0.1
 # </INSTALLED_ADDONS>
diff --git a/settings.py b/settings.py
index 2a87ec0..b3de204 100644
--- a/settings.py
+++ b/settings.py
@@ -6,6 +6,7 @@ INSTALLED_ADDONS = [
     'aldryn-django',
     'aldryn-sso',
     'djangocms-link',
+    'djangocms-snippet',
     'djangocms-text-ckeditor',
     'django-filer',
     # </INSTALLED_ADDONS>