diff --git a/config/settings/common.py b/config/settings/common.py
index 76f5cee..4ffa3a4 100644
--- a/config/settings/common.py
+++ b/config/settings/common.py
@@ -83,7 +83,7 @@ THIRD_PARTY_APPS = (
     'stdimage',
     'rest_framework',
     'django_filters',
-    'draceditor',
+    'martor',
     'haystack',
     'djconfig',
 
@@ -300,9 +300,9 @@ STATICFILES_FINDERS = (
 # ------------------------------------------------------------------------------
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#media-root
 MEDIA_ROOT = str(APPS_DIR('media'))
-DRACEDITOR_UPLOAD_PATH = 'images/uploads/{}'.format(time.strftime("%Y/%m/%d/"))
-DRACEDITOR_UPLOAD_URL = '/api/uploader/'  # change to local uploader
-DRACEDITOR_MARKDOWN_BASE_EMOJI_URL = '/static/images/emojis/'
+MARTOR_UPLOAD_PATH = 'images/uploads/{}'.format(time.strftime("%Y/%m/%d/"))
+MARTOR_UPLOAD_URL = '/api/uploader/'  # change to local uploader
+MARTOR_MARKDOWN_BASE_EMOJI_URL = '/static/images/emojis/'
 MAX_IMAGE_UPLOAD_SIZE = 5242880  # 5MB
 
 
@@ -367,8 +367,9 @@ SOCIALACCOUNT_QUERY_EMAIL = True
 # Select the correct user model
 AUTH_USER_MODEL = 'users.User'
 LOGIN_REDIRECT_URL = 'users:redirect'
-LOGIN_URL = 'account_login'
-
+#LOGIN_URL = 'account_login'
+WIKI_SIGNUP_URL = 'account_login'
+#WIKI_EDITOR = 'wiki.editors.martor.Martor'
 # SLUGLIFIER
 AUTOSLUG_SLUGIFY_FUNCTION = 'slugify.slugify'
 
diff --git a/config/urls.py b/config/urls.py
index a2c437b..78628a4 100644
--- a/config/urls.py
+++ b/config/urls.py
@@ -57,7 +57,7 @@ urlpatterns = [
     url(r'^discuss/', include('spirit.urls')),
     url(r'^api/v1/', include(router.urls, namespace='v1')),
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
-    url(r'^draceditor/', include('draceditor.urls')),
+    url(r'^martor/', include('martor.urls')),
     url(
         r'^api/uploader/$',
         markdown_uploader, name='markdown_uploader_page'
diff --git a/mhackspace/base/management/commands/fetch_emojii.py b/mhackspace/base/management/commands/fetch_emojii.py
index 1268b90..99ae35d 100644
--- a/mhackspace/base/management/commands/fetch_emojii.py
+++ b/mhackspace/base/management/commands/fetch_emojii.py
@@ -18,7 +18,7 @@ class Command(BaseCommand):
             # python3
             from urllib.request import urlretrieve
 
-        from draceditor.extensions.emoji import EMOJIS
+        from martor.extensions.emoji import EMOJIS
 
         emoji_path = 'mhackspace/static/images/emojis/' # create this folder first
         base_url = 'https://assets-cdn.github.com/images/icons/emoji/'
diff --git a/mhackspace/base/management/commands/generate_test_data.py b/mhackspace/base/management/commands/generate_test_data.py
index 6665e7d..4033ef1 100644
--- a/mhackspace/base/management/commands/generate_test_data.py
+++ b/mhackspace/base/management/commands/generate_test_data.py
@@ -42,7 +42,7 @@ class Command(BaseCommand):
         feed = AutoFixture(Feed)
         feed.create(10)
 
-        post = AutoFixture(Post)
+        post = AutoFixture(Post, follow_fk=True)
         post.create(10)
 
         categorys = AutoFixture(Category)
diff --git a/mhackspace/base/views.py b/mhackspace/base/views.py
index 55ecc24..971219e 100644
--- a/mhackspace/base/views.py
+++ b/mhackspace/base/views.py
@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import login_required
 from django.core.files.storage import default_storage
 from django.core.files.base import ContentFile
 
-from draceditor.utils import LazyEncoder
+from martor.utils import LazyEncoder
 
 
 @login_required
@@ -43,7 +43,7 @@ def markdown_uploader(request):
                     data, content_type='application/json', status=405)
 
             img_uuid = "{0}-{1}".format(uuid.uuid4().hex[:10], image.name.replace(' ', '-'))
-            tmp_file = os.path.join(settings.DRACEDITOR_UPLOAD_PATH, img_uuid)
+            tmp_file = os.path.join(settings.MARTOR_UPLOAD_PATH, img_uuid)
             def_path = default_storage.save(tmp_file, ContentFile(image.read()))
             img_url = os.path.join(settings.MEDIA_URL, def_path)
 
diff --git a/mhackspace/blog/admin.py b/mhackspace/blog/admin.py
index 7450bc2..cb0b2fa 100644
--- a/mhackspace/blog/admin.py
+++ b/mhackspace/blog/admin.py
@@ -1,8 +1,8 @@
 from django.contrib import admin
 from django.db import models
 from django.contrib.admin import ModelAdmin
-from draceditor.widgets import AdminDraceditorWidget
-from draceditor.models import DraceditorField
+from martor.widgets import AdminMartorWidget
+from martor.models import MartorField
 
 from mhackspace.blog.models import Post, Category
 
@@ -16,7 +16,7 @@ class PostAdmin(ModelAdmin):
     filter_horizontal = ('categories',)
     prepopulated_fields = {"slug": ("title",)}
     formfield_overrides = {
-        DraceditorField: {'widget': AdminDraceditorWidget},
+        MartorField: {'widget': AdminMartorWidget},
     }
 
 
diff --git a/mhackspace/blog/migrations/0004_auto_20170228_2210.py b/mhackspace/blog/migrations/0004_auto_20170228_2210.py
index 7d7c464..b9aa35a 100644
--- a/mhackspace/blog/migrations/0004_auto_20170228_2210.py
+++ b/mhackspace/blog/migrations/0004_auto_20170228_2210.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-import draceditor.models
+import martor.models
 
 
 class Migration(migrations.Migration):
@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='post',
             name='description',
-            field=draceditor.models.DraceditorField(),
+            field=martor.models.MartorField(),
         ),
     ]
diff --git a/mhackspace/blog/models.py b/mhackspace/blog/models.py
index f731c28..418a853 100644
--- a/mhackspace/blog/models.py
+++ b/mhackspace/blog/models.py
@@ -2,7 +2,7 @@ from django.db import models
 from django.utils import timezone
 from django.urls import reverse
 
-from draceditor.models import DraceditorField
+from martor.models import MartorField
 from stdimage.validators import MinSizeValidator
 from stdimage.models import StdImageField
 from stdimage.utils import UploadToAutoSlugClassNameDir
@@ -51,7 +51,7 @@ class Post(models.Model):
         validators=[
             MinSizeValidator(730, 410)])
 
-    description = DraceditorField()
+    description = MartorField()
     excerpt = models.TextField(blank=True, null=True)
     published_date = models.DateTimeField(default=timezone.now)
     updated_date = models.DateTimeField(default=timezone.now)
diff --git a/mhackspace/requests/admin.py b/mhackspace/requests/admin.py
index 946c28c..5204c36 100644
--- a/mhackspace/requests/admin.py
+++ b/mhackspace/requests/admin.py
@@ -2,8 +2,8 @@
 from django.contrib import admin
 from django.db import models
 from django.contrib.admin import ModelAdmin
-from draceditor.widgets import AdminDraceditorWidget
-from draceditor.models import DraceditorField
+from martor.widgets import AdminMartorWidget
+from martor.models import MartorField
 
 from mhackspace.requests.models import UserRequests
 
diff --git a/mhackspace/templates/blog/post_detail.html b/mhackspace/templates/blog/post_detail.html
index c9ddbb5..e9029af 100644
--- a/mhackspace/templates/blog/post_detail.html
+++ b/mhackspace/templates/blog/post_detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load dractags blog %}
+{% load martortags blog %}
 {% block title %}{{ post.title }}{% endblock %}
 
 {% block content %}
diff --git a/mhackspace/templates/blog/post_list.html b/mhackspace/templates/blog/post_list.html
index 2d5644c..5b7514c 100644
--- a/mhackspace/templates/blog/post_list.html
+++ b/mhackspace/templates/blog/post_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load dractags blog %}
+{% load martortags blog %}
 {% block title %}Blog Posts{% endblock %}
 
 {% block content %}
diff --git a/requirements/base.txt b/requirements/base.txt
index 16cd70a..7ded03b 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -59,7 +59,6 @@ django-autofixture==0.12.1
 
 git+https://github.com/olymk2/scaffold.git
 git+git://github.com/olymk2/django-wiki.git
-# git+git://github.com/django-wiki/django-wiki.git
 
 djangorestframework==3.6.3
 djangorestframework-jwt
@@ -67,7 +66,8 @@ django-filter==1.0.2
 coreapi
 # api libraries end
 
-draceditor==1.1.8
+#martor==1.1.8
+martor==1.2.5
 # django-spirit
 django-djconfig
 django-haystack