diff --git a/template/create-template.php b/template/create-template.php
index e70581d..be99977 100644
--- a/template/create-template.php
+++ b/template/create-template.php
@@ -1,3 +1,6 @@
+<script src="<?php echo get_app_info('path');?>/js/ckeditor/ckeditor.js?7"></script>
+<script src="<?php echo get_app_info('path');?>/js/create/editor.js?7"></script>
+
 <div class="row-fluid">
 	<h2>Create Templates</h2><br/>
     		<form action="<?php echo get_app_info('path')?>/template/save-template.php?i=<?php echo get_app_info('app')?>" method="POST" accept-charset="utf-8" class="form-vertical" id="create-template" enctype="multipart/form-data">
@@ -15,36 +18,6 @@
 			    </div>   
 			    <div class="span9">
 			    	<p>
-				    	<label class="control-label" for="html"><?php echo _('HTML code');?></label>
-				    	<div class="btn-group">
-				    	<span class="wysiwyg-note">The HTML may look odd in this editor, open it in the campaign to see how it actually looks.</span>
-						<script type="text/javascript">
-							$("#toggle-wysiwyg").click(function(e){
-								e.preventDefault();
-								
-								$('<input>').attr({
-								    type: 'hidden',
-								    id: 'wysiwyg',
-								    name: 'wysiwyg',
-								    value: '0',
-								}).appendTo("#edit-form");
-								
-								$('<input>').attr({
-								    type: 'hidden',
-								    id: 'w_clicked',
-								    name: 'w_clicked',
-								    value: '1',
-								}).appendTo("#edit-form");
-								
-								$("#subject").rules("remove");
-								$("#html").rules("remove");
-								if($("#subject").val()=="") $("#subject").val("Untitled");
-								
-								$("#edit-form").submit();
-							});
-						</script>
-						</div>
-						<br/>
 			            <div class="control-group">
 					    	<div class="controls">
 				              <textarea class="input-xlarge" id="html" name="html" rows="10" placeholder="Email content"></textarea>
diff --git a/template/edit-template.php b/template/edit-template.php
index 99f8cec..87083fe 100644
--- a/template/edit-template.php
+++ b/template/edit-template.php
@@ -35,8 +35,6 @@
 			    </div>   
 			    <div class="span9">
 			    	<p>
-				    	<label class="control-label" for="html"><?php echo _('HTML code');?></label>
-						<br/>
 			            <div class="control-group">
 					    	<div class="controls">
 				              <textarea class="input-xlarge" id="html" name="html" rows="10" placeholder="Email content"><?php echo $tbody; ?></textarea>
diff --git a/template_create.php b/template_create.php
index c113274..7f3539d 100644
--- a/template_create.php
+++ b/template_create.php
@@ -24,13 +24,8 @@
 	}
 ?>
 
-<script src="<?php echo get_app_info('path');?>/js/redactor/redactor.min.js?5"></script>
-<script src="<?php echo get_app_info('path');?>/js/redactor/fontcolor.js?5"></script>
-<script src="<?php echo get_app_info('path');?>/js/redactor/fontsize.js?5"></script>
-<script src="<?php echo get_app_info('path');?>/js/redactor/fontfamily.js?5"></script>
-<script src="<?php echo get_app_info('path');?>/js/redactor/personalizationtags.js?5"></script>
-<link rel="stylesheet" href="<?php echo get_app_info('path');?>/js/redactor/redactor.css?5" />
-<script src="<?php echo get_app_info('path');?>/js/create/editor.js?2"></script>
+<script src="<?php echo get_app_info('path');?>/js/ckeditor/ckeditor.js?7"></script>
+<script src="<?php echo get_app_info('path');?>/js/create/editor.js?7"></script>
 
 <!-- Validation -->
 <script type="text/javascript" src="<?php echo get_app_info('path');?>/js/validate.js"></script>