diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8311786
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+# FILES IGNORED BY GIT
+
+# OS generated files 
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# PHPStorm files
+.idea/
+# Cache files
+cms/cache/*
diff --git a/cms/templates/admin/main.tpl b/cms/templates/admin/main.tpl
index 7d8085f..b6b5ae8 100644
--- a/cms/templates/admin/main.tpl
+++ b/cms/templates/admin/main.tpl
@@ -49,7 +49,40 @@
 <script src="<?php echo JQUERY; ?>"></script>
 <script src="<?php echo JQUERY_UI; ?>"></script>
 <script src="<?php echo BOOTSTRAP; ?>"></script>
-<?php if (isset($wysiwyg)): ?>
+
+<?php if (!isset($wysiwyg)): ?>
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/ace.js"></script>
+    <script src="http://nightwing.github.io/emmet-core/emmet.js"></script>
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/ext-emmet.js"></script>
+
+    <script>
+        var textarea = $('#content');
+        textarea.before('<div id="ace-editor"></div>').hide();
+        $('#ace-editor').height(textarea.height()).width(textarea.width());
+
+        $(window).resize(function() {
+            $('#ace-editor').height(textarea.height()).width(textarea.width());
+        });
+
+        var editor = ace.edit("ace-editor");
+        // Settings
+        editor.getSession().setMode("ace/mode/html");
+        editor.setTheme("ace/theme/monokai");
+        editor.getSession().setUseSoftTabs(true);
+        editor.getSession().setUseWrapMode(true);
+        editor.setShowPrintMargin(false);
+        editor.setOption("enableEmmet", true);
+
+        editor.getSession().setValue(textarea.val());
+
+        $('form:first').submit(function() {
+            textarea.val(editor.getSession().getValue());
+        });
+
+    </script>
+
+<?php else: ?>
+
     <script src="<?php echo WYSIWYG_EDITOR; ?>"></script>
     <script src="<?php echo WYSIWYG_EDITOR_INIT; ?>"></script>
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/edit.inc.tpl b/cms/templates/admin/subtemplates/edit.inc.tpl
index 9686e83..cf20cbd 100644
--- a/cms/templates/admin/subtemplates/edit.inc.tpl
+++ b/cms/templates/admin/subtemplates/edit.inc.tpl
@@ -88,15 +88,15 @@
             <div class="form-group">
                 <div class="col-lg-12">
                     <a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_image"
-                       data-toggle="modal" data-target="#modal_image" data-insert="#content"
+                       data-toggle="modal" data-target="#modal_image" data-insert="ace-editor"
                        title="<?php echo $lang['insert_image_label']; ?>"><span
                             class="glyphicon glyphicon-picture"></span></a>
                     <a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_thumbnail"
-                       data-toggle="modal" data-target="#modal_thumbnail" data-insert="#content"
+                       data-toggle="modal" data-target="#modal_thumbnail" data-insert="ace-editor"
                        title="<?php echo $lang['insert_thumbnail_label']; ?>"><span
                             class="glyphicon glyphicon-hand-left"></span></a>
                     <a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_gallery"
-                       data-toggle="modal" data-target="#modal_gallery" data-insert="#content"
+                       data-toggle="modal" data-target="#modal_gallery" data-insert="ace-editor"
                        title="<?php echo $lang['insert_gallery_label']; ?>"><span class="glyphicon glyphicon-th"></span></a>
                 </div>
             </div>
diff --git a/static/js/admin_backend.js b/static/js/admin_backend.js
index d46eb1d..33cb656 100644
--- a/static/js/admin_backend.js
+++ b/static/js/admin_backend.js
@@ -1,16 +1,6 @@
 $.fn.extend({
 insertAtCaret: function(myValue){
-var obj;
-if( typeof this[0].name !='undefined' ) obj = this[0];
-else obj = this;
-var startPos = obj.selectionStart;
-var endPos = obj.selectionEnd;
-var scrollTop = obj.scrollTop;
-obj.value = obj.value.substring(0, startPos)+myValue+obj.value.substring(endPos,obj.value.length);
-obj.focus();
-obj.selectionStart = startPos + myValue.length;
-obj.selectionEnd = startPos + myValue.length;
-obj.scrollTop = scrollTop;
+editor.insert(myValue);
 }
 });