diff --git a/config/ckeditor.yml b/config/ckeditor.yml
index 96238bc..3c6952b 100644
--- a/config/ckeditor.yml
+++ b/config/ckeditor.yml
@@ -1,5 +1,6 @@
 # CKEditor configuration
 
+contentsCss: '/themes/circlepro/stylesheets/editor.css'
 allowedContent: true
 bodyClass: 'wiki'
 removePlugins: 'codemirror,div,flash,forms,iframe,copyformatting,elementspath'
diff --git a/public/themes/circlepro/stylesheets/application.css b/public/themes/circlepro/stylesheets/application.css
index fe7e6e8..f3956ec 100644
--- a/public/themes/circlepro/stylesheets/application.css
+++ b/public/themes/circlepro/stylesheets/application.css
@@ -1,33 +1,17 @@
 @import url(../../../stylesheets/application.css);
-@import url(//fonts.googleapis.com/css?family=Lato:300,400,700);
+@import url(editor.css);
 
 /* CirclePro Theme, based on Circle Theme by Kirill Bezrukov */
 
 /**********************************************************/
-/* COMMON */
+/* GLOBAL */
 /**********************************************************/
 
-body {
-	color: #3d454c;
-	font-size: 16px;
-	line-height: 1.42857em;
-	font-family: Lato,HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;
-	font-smoothing: antialiased;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	text-rendering: optimizeLegibility;
-}
-h1, h2, h3, h4, h5, h6, input, textarea, select {
-	font-family: Lato,HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;
-}
 input, textarea, select {
+	font-family: Lato,HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;
 	font-size: 12px;
 }
 
-a, a:link, a:visited {
-	color: #2996cc;
-}
-
 #wrapper-top-menu,
 #wrapper-header,
 #wrapper-main-menu,
@@ -58,9 +42,6 @@ div#content {
 	background-color: #fff;
 	border-right: 0;
 }
-div#content p {
-	word-wrap: break-word;
-}
 
 #footer {
 	height: 36px;
@@ -99,14 +80,6 @@ input[type="text"].questions-search.autocomplete {
 	padding-left: 30px !important;
 }
 
-h2 {
-	color: #f30;
-	font-size: 46px;
-	font-weight: 600;
-	line-height: 1em;
-	margin-top: 10px;
-}
-
 #sidebar a.selected {
 	background-color: #fafafa;
 	color: #3d454c;
@@ -515,20 +488,6 @@ div.flash.warning, .conflict {
 /* WIKI */
 /**********************************************************/
 
-.wiki h1, .wiki h2, .wiki h3 {
-	font-weight: normal;
-	color: #000;
-}
-.wiki h1 {
-	font-size: 28px;
-	margin-top: 10px;
-}
-.wiki h2 {
-	font-size: 20px;
-}
-.wiki h3 {
-	font-size: 16px;
-}
 .wiki.wiki-page {
 	color: #6A6E71;
 }
diff --git a/public/themes/circlepro/stylesheets/editor.css b/public/themes/circlepro/stylesheets/editor.css
new file mode 100644
index 0000000..7aa0b83
--- /dev/null
+++ b/public/themes/circlepro/stylesheets/editor.css
@@ -0,0 +1,82 @@
+@import url(//fonts.googleapis.com/css?family=Lato:300,400,700);
+
+body {
+	color: #3d454c;
+	font-size: 16px;
+	line-height: 1.42857em;
+	font-family: Lato,HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;
+	font-smoothing: antialiased;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	text-rendering: optimizeLegibility;
+}
+h1, h2, h3, h4, h5, h6 {
+	font-family: Lato,HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;
+}
+.wiki h1 {
+	font-size: 32px;
+}
+.wiki h2 {
+	font-size: 24px;
+}
+.wiki h3 {
+	font-size: 20px;
+}
+.wiki h4 {
+	font-size: 17px;
+	border-bottom: 1px dotted #bbb;
+}
+.wiki h5 {
+	font-size: 17px;
+}
+.wiki h6 {
+	font-size: 16px;
+}
+h1, h2, h3 {
+	color: #b40b51;
+}
+div#content div.wiki-page > a:first-child + h1, h2 {
+	color: #f30;
+	font-size: 46px;
+	font-weight: 600;
+	line-height: 1em;
+}
+div#content h1 {
+	color: #b40b51;	
+}
+.wiki h2 {
+	color: #b40b51;
+}
+
+a, a:link, a:visited {
+	color: #2996cc;
+	text-decoration: none;
+}
+
+body.ckeditor,
+div#content p {
+	text-align: justify;
+	word-wrap: break-word;
+}
+
+body.ckeditor table {
+	border: 1px solid #bbb;
+	border-collapse: collapse;
+} 
+body.ckeditor td, body.ckeditor th {
+	padding: 4px;
+} 
+
+blockquote { 
+	font-size: 22.5px;
+	line-height: 1.2em;
+	padding: 1px 12.5px;
+	border-left: 5px solid #eee;
+}
+
+hr {
+	width: 100%;
+	height: 1px;
+	background: #ccc;
+	border: 0;
+}