diff --git a/system/admin/views/add-content.html.php b/system/admin/views/add-content.html.php
index 25aa1f3..e0517fc 100644
--- a/system/admin/views/add-content.html.php
+++ b/system/admin/views/add-content.html.php
@@ -29,12 +29,8 @@ $images = get_gallery();
 
 ?>
 
-<link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
 <script src="<?php echo site_url() ?>system/resources/js/jquery-ui.min.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Editor.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Extra.js"></script>
+<link rel="stylesheet" href="<?php echo site_url() ?>system/admin/editor.md/css/editormd.css" />
 <link rel="stylesheet" href="<?php echo site_url() ?>system/resources/css/jquery-ui.css">
 <script>
 $( function() {
@@ -49,7 +45,7 @@ $( function() {
     function extractLast( term ) {
       return split( term ).pop();
     }
- 
+
     $( "#pTag" )
       // don't navigate away from the field on tab when selecting an item
       .on( "keydown", function( event ) {
@@ -110,7 +106,7 @@ $( function() {
                     <textarea id="pMeta" class="form-control" name="description" rows="3" cols="20" placeholder="<?php echo i18n('If_leave_empty_we_will_excerpt_it_from_the_content_below');?>"><?php if (isset($p->description)) { echo $p->description;} ?></textarea>
                     <br>
                 </div>
-                    
+
                 <div class="col-sm-6">
                     <div class="form-row">
                         <div class="col">
@@ -127,7 +123,7 @@ $( function() {
                     <label for="pURL"><?php echo i18n('Slug');?> (<?php echo i18n('optional');?>)</label>
                     <input type="text" class="form-control text" id="pURL" name="url" value="<?php if (isset($postUrl)) { echo $postUrl;} ?>" placeholder="<?php echo i18n('If_the_url_leave_empty_we_will_use_the_post_title');?>"/>
                     <br>
-                    
+
                     <?php if ($type == 'is_audio'):?>
                     <label for="pAudio"><?php echo i18n('Featured_Audio');?> <span class="required">*</span> (e.g Soundcloud)</label>
                     <textarea rows="2" cols="20" class="media-uploader form-control text <?php if (isset($postAudio)) { if (empty($postAudio)) { echo 'error';} } ?>" id="pAudio" name="audio"><?php if (isset($postAudio)) { echo $postAudio;} ?></textarea>
@@ -179,16 +175,22 @@ $( function() {
                 <div class="col-sm-6">
                     <div>
                         <label for="wmd-input"><?php echo i18n('Content');?></label>
-                        <div id="wmd-button-bar" class="wmd-button-bar"></div>
-                        <textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error'; } } ?>" name="content" cols="20" rows="15"><?php if (isset($postContent)) { echo $postContent;} ?></textarea><br>
-                        <input type="submit" name="publish" class="btn btn-primary submit" value="<?php echo i18n('Publish');?>"/> <input type="submit" name="draft" class="btn btn-primary draft" value="<?php echo i18n('Save_as_draft');?>"/>
-                        <br><br>
                     </div>
                 </div>
                 <div class="col-sm-6">
                     <label><?php echo i18n('Preview');?></label>
-                    <br>
-                    <div id="wmd-preview" class="wmd-panel wmd-preview" style="width:100%;overflow:auto;"></div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div id="htmly-editormd" >
+                        <textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error'; } } ?>" name="content" style="display:none;"><?php if (isset($postContent)) { echo $postContent;} ?></textarea>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <input type="submit" name="publish" class="btn btn-primary submit" value="<?php echo i18n('Publish');?>"/> <input type="submit" name="draft" class="btn btn-primary draft" value="<?php echo i18n('Save_as_draft');?>"/>
                 </div>
             </div>
         </form>
@@ -298,12 +300,11 @@ $( function() {
         </div>
     </div>
     <?php endif;?>
-    
+
 </div>
 
 <!-- Declare the base path. Important -->
 <script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/editor.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/resources/js/media.uploader.js"></script>
 <script>
   $('.the-img').click(function(e) {
@@ -311,3 +312,19 @@ $( function() {
     $('#insertImageDialogURL').val($(e.target).attr('src'));
   });
 </script>
+<script src="<?php echo site_url() ?>system/admin/editor.md/editormd.min.js"></script>
+<script type="text/javascript">
+    var htmlyEditor;
+    $(function() {
+        htmlyEditor = editormd("htmly-editormd", {
+            width   : "100%",
+            height  : 640,
+            syncScrolling : "single",
+            path    : "<?php echo site_url() ?>system/admin/editor.md/lib/",
+            imageUpload : true,
+            imageFormats : ['jpg', 'jpeg', 'jfif', 'pjpeg', 'pjp', 'png', 'gif'],
+            imageUploadURL : "<?php echo site_url() ?>system/admin/editor.md/upload.php",
+        });
+    });
+</script>
+<script src="<?php echo site_url() ?>system/admin/editor.md/languages/en.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/add-page.html.php b/system/admin/views/add-page.html.php
index 656282a..bbd61ed 100644
--- a/system/admin/views/add-page.html.php
+++ b/system/admin/views/add-page.html.php
@@ -1,12 +1,8 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
 <?php $images = get_gallery(); ?>
-<link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
 <script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script>
 <script src="<?php echo site_url() ?>system/resources/js/jquery-ui.min.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Editor.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Extra.js"></script>
+<link rel="stylesheet" href="<?php echo site_url() ?>system/admin/editor.md/css/editormd.css" />
 <link rel="stylesheet" href="<?php echo site_url() ?>system/resources/css/jquery-ui.css">
 
 <?php if (isset($error)) { ?>
@@ -33,13 +29,25 @@
                     <?php endif;?>
                 </div>
             </div>
-            
             <div class="row">
                 <div class="col-sm-6">
-                    <label for="wmd-input"><?php echo i18n('Content');?></label>
-                    <div id="wmd-button-bar" class="wmd-button-bar"></div>
-                    <textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) {if (empty($postContent)) {echo 'error';}} ?>" name="content" cols="20" rows="10"><?php if (isset($postContent)) {echo $postContent;} ?></textarea>
-                    <br>
+                    <div>
+                        <label for="wmd-input"><?php echo i18n('Content');?></label>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <label><?php echo i18n('Preview');?></label>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div id="htmly-editormd" >
+                        <textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error'; } } ?>" name="content" style="display:none;"><?php if (isset($postContent)) { echo $postContent;} ?></textarea>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
                     <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
                     <?php if ($type == 'is_page') :?>
                     <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Publish');?>"/>
@@ -48,15 +56,10 @@
                         <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Add_category');?>"/>
                     <?php endif;?>
                 </div>
-                <div class="col-sm-6">
-                    <label><?php echo i18n('Preview');?></label>
-                    <br>
-                    <div id="wmd-preview" class="wmd-panel wmd-preview" style="width:100%;overflow:auto;"></div>
-                </div>
             </div>
         </form>
     </div>
-    
+
 <style>
 .wmd-prompt-background {z-index:10!important;}
 #wmd-preview img {max-width:100%;}
@@ -123,9 +126,24 @@
 </div>
 <!-- Declare the base path. Important -->
 <script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/editor.js"></script>
 <script>
   $('.the-img').click(function(e) {
     $('#insertImageDialogURL').val($(e.target).attr('src'));
   });
 </script>
+<script src="<?php echo site_url() ?>system/admin/editor.md/editormd.min.js"></script>
+<script type="text/javascript">
+    var htmlyEditor;
+    $(function() {
+        htmlyEditor = editormd("htmly-editormd", {
+            width   : "100%",
+            height  : 640,
+            syncScrolling : "single",
+            path    : "<?php echo site_url() ?>system/admin/editor.md/lib/",
+            imageUpload : true,
+            imageFormats : ['jpg', 'jpeg', 'jfif', 'pjpeg', 'pjp', 'png', 'gif'],
+            imageUploadURL : "<?php echo site_url() ?>system/admin/editor.md/upload.php",
+        });
+    });
+</script>
+<script src="<?php echo site_url() ?>system/admin/editor.md/languages/en.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-content.html.php b/system/admin/views/edit-content.html.php
index 8442c23..3c9a39c 100644
--- a/system/admin/views/edit-content.html.php
+++ b/system/admin/views/edit-content.html.php
@@ -77,13 +77,9 @@ if (file_exists($tagslang)) {
 $images = get_gallery();
 
 ?>
-<link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
 <script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script>
 <script src="<?php echo site_url() ?>system/resources/js/jquery-ui.min.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Editor.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Extra.js"></script>
+<link rel="stylesheet" href="<?php echo site_url() ?>system/admin/editor.md/css/editormd.css" />
 <link rel="stylesheet" href="<?php echo site_url() ?>system/resources/css/jquery-ui.css">
 <script>
 $( function() {
@@ -98,7 +94,7 @@ $( function() {
     function extractLast( term ) {
       return split( term ).pop();
     }
- 
+
     $( "#pTag" )
       // don't navigate away from the field on tab when selecting an item
       .on( "keydown", function( event ) {
@@ -160,7 +156,7 @@ $( function() {
                     <textarea id="pMeta" class="form-control" name="description" rows="3" cols="20" placeholder="<?php echo i18n('If_leave_empty_we_will_excerpt_it_from_the_content_below');?>"><?php if (isset($p->description)) { echo $p->description; } else { echo $olddescription;} ?></textarea>
                     <br>
                 </div>
-                
+
                 <div class="col-sm-6">
                     <div class="form-row">
                         <div class="col">
@@ -230,20 +226,26 @@ $( function() {
                 <div class="col-sm-6">
                     <div>
                         <label for="wmd-input"><?php echo i18n('Content');?></label>
-                        <div id="wmd-button-bar" class="wmd-button-bar"></div>
-                        <textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error'; } } ?>" name="content" cols="20" rows="15"><?php echo $oldcontent ?></textarea><br>
-                        <?php if ($isdraft[4] == 'draft') { ?>
-                            <input type="submit" name="publishdraft" class="btn btn-primary submit" value="<?php echo i18n('Publish_draft');?>"/> <input type="submit" name="updatedraft" class="btn btn-primary draft" value="<?php echo i18n('Update_draft');?>"/> <a class="btn btn-danger" href="<?php echo $delete ?>"><?php echo i18n('Delete');?></a>
-                        <?php } else { ?>
-                            <input type="submit" name="updatepost" class="btn btn-primary submit" value="<?php echo i18n('Update_post');?>"/> <input type="submit" name="revertpost" class="btn btn-primary revert" value="<?php echo i18n('Revert_to_draft');?>"/> <a class="btn btn-danger" href="<?php echo $delete ?>"><?php echo i18n('Delete');?></a>
-                        <?php }?>
-                        <br><br>
                     </div>
                 </div>
                 <div class="col-sm-6">
                     <label><?php echo i18n('Preview');?></label>
-                    <br>
-                    <div id="wmd-preview" class="wmd-panel wmd-preview" style="width:100%;overflow:auto;"></div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div id="htmly-editormd" >
+                        <textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error'; } } ?>" name="content" style="display:none;"><?php echo $oldcontent ?></textarea>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                <?php if ($isdraft[4] == 'draft') { ?>
+                    <input type="submit" name="publishdraft" class="btn btn-primary submit" value="<?php echo i18n('Publish_draft');?>"/> <input type="submit" name="updatedraft" class="btn btn-primary draft" value="<?php echo i18n('Update_draft');?>"/> <a class="btn btn-danger" href="<?php echo $delete ?>"><?php echo i18n('Delete');?></a>
+                <?php } else { ?>
+                    <input type="submit" name="updatepost" class="btn btn-primary submit" value="<?php echo i18n('Update_post');?>"/> <input type="submit" name="revertpost" class="btn btn-primary revert" value="<?php echo i18n('Revert_to_draft');?>"/> <a class="btn btn-danger" href="<?php echo $delete ?>"><?php echo i18n('Delete');?></a>
+                <?php }?>
                 </div>
             </div>
         </form>
@@ -353,11 +355,10 @@ $( function() {
         </div>
     </div>
     <?php endif;?>
-    
+
 </div>
 <!-- Declare the base path. Important -->
 <script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/editor.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/resources/js/media.uploader.js"></script>
 <script>
   $('.the-img').click(function(e) {
@@ -365,3 +366,19 @@ $( function() {
     $('#insertImageDialogURL').val($(e.target).attr('src'));
   });
 </script>
+<script src="<?php echo site_url() ?>system/admin/editor.md/editormd.min.js"></script>
+<script type="text/javascript">
+    var htmlyEditor;
+    $(function() {
+        htmlyEditor = editormd("htmly-editormd", {
+            width   : "100%",
+            height  : 640,
+            syncScrolling : "single",
+            path    : "<?php echo site_url() ?>system/admin/editor.md/lib/",
+            imageUpload : true,
+            imageFormats : ['jpg', 'jpeg', 'jfif', 'pjpeg', 'pjp', 'png', 'gif'],
+            imageUploadURL : "<?php echo site_url() ?>system/admin/editor.md/upload.php",
+        });
+    });
+</script>
+<script src="<?php echo site_url() ?>system/admin/editor.md/languages/en.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-page.html.php b/system/admin/views/edit-page.html.php
index 8828e8f..7a7dda0 100644
--- a/system/admin/views/edit-page.html.php
+++ b/system/admin/views/edit-page.html.php
@@ -66,13 +66,9 @@ if ($type == 'is_frontpage') {
 $images = get_gallery();
 
 ?>
-<link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
 <script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script>
 <script src="<?php echo site_url() ?>system/resources/js/jquery-ui.min.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Editor.js"></script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Extra.js"></script>
+<link rel="stylesheet" href="<?php echo site_url() ?>system/admin/editor.md/css/editormd.css" />
 <link rel="stylesheet" href="<?php echo site_url() ?>system/resources/css/jquery-ui.css">
 
 <?php if (isset($error)) { ?>
@@ -103,33 +99,41 @@ $images = get_gallery();
                     <?php } ?>
                 </div>
             </div>
-            
+
             <div class="row">
                 <div class="col-sm-6">
-                    <label for="wmd-input"><?php echo i18n('Content');?></label>
-                    <div id="wmd-button-bar" class="wmd-button-bar"></div>
-                    <textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) {if (empty($postContent)) {echo 'error';}} ?>" name="content" cols="20" rows="10"><?php echo $oldcontent ?></textarea>
-                    <br>
-                    <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
-                    <?php if($type == 'is_frontpage' || $type == 'is_profile') { ?>
-                        <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save');?>"/>
-                    <?php } elseif ($type == 'is_category') {?>
-                        <input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
-                        <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save_category');?>"/>
-                    <?php } else {?>
-                        <input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
-                        <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save');?>"/> <a class="btn btn-danger" href="<?php echo $delete ?>"><?php echo i18n('Delete');?></a>
-                    <?php } ?>
+                    <div>
+                        <label for="wmd-input"><?php echo i18n('Content');?></label>
+                    </div>
                 </div>
                 <div class="col-sm-6">
                     <label><?php echo i18n('Preview');?></label>
-                    <br>
-                    <div id="wmd-preview" class="wmd-panel wmd-preview" style="width:100%;overflow:auto;"></div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div id="htmly-editormd" >
+                        <textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error'; } } ?>" name="content" style="display:none;"><?php echo $oldcontent ?></textarea>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
+                <?php if($type == 'is_frontpage' || $type == 'is_profile') { ?>
+                    <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save');?>"/>
+                <?php } elseif ($type == 'is_category') {?>
+                    <input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
+                    <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save_category');?>"/>
+                <?php } else {?>
+                    <input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
+                    <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save');?>"/> <a class="btn btn-danger" href="<?php echo $delete ?>"><?php echo i18n('Delete');?></a>
+                <?php } ?>
                 </div>
             </div>
         </form>
     </div>
-        
+
 <style>
 .wmd-prompt-background {z-index:10!important;}
 #wmd-preview img {max-width:100%;}
@@ -196,9 +200,24 @@ $images = get_gallery();
 </div>
 <!-- Declare the base path. Important -->
 <script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/editor.js"></script>
 <script>
   $('.the-img').click(function(e) {
     $('#insertImageDialogURL').val($(e.target).attr('src'));
   });
-</script>
\ No newline at end of file
+</script>
+<script src="<?php echo site_url() ?>system/admin/editor.md/editormd.min.js"></script>
+<script type="text/javascript">
+    var htmlyEditor;
+    $(function() {
+        htmlyEditor = editormd("htmly-editormd", {
+            width   : "100%",
+            height  : 640,
+            syncScrolling : "single",
+            path    : "<?php echo site_url() ?>system/admin/editor.md/lib/",
+            imageUpload : true,
+            imageFormats : ['jpg', 'jpeg', 'jfif', 'pjpeg', 'pjp', 'png', 'gif'],
+            imageUploadURL : "<?php echo site_url() ?>system/admin/editor.md/upload.php",
+        });
+    });
+</script>
+<script src="<?php echo site_url() ?>system/admin/editor.md/languages/en.js"></script>
\ No newline at end of file