diff --git a/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js b/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js
index 85ad9df0b..17ea9c85a 100644
--- a/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js
+++ b/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js
@@ -42,7 +42,8 @@ xinha_config.formatblock =
 	      "Normal"   : "p"
 	  };
 
-xinha_config.pageStyleSheets=[_editor_url+"examples/full_example.css"];
+//xinha_config.pageStyleSheets=[_editor_url+"examples/full_example.css"];
+xinha_config.pageStyleSheets=[_editor_url + "editor.css"];
 xinha_editors=Xinha.makeEditors(xinha_editors,xinha_config,xinha_plugins);
 Xinha.startEditors(xinha_editors);
 };
diff --git a/ccm-cms/web/assets/xinha/editor.css b/ccm-cms/web/assets/xinha/editor.css
new file mode 100644
index 000000000..e81e7aa7e
--- /dev/null
+++ b/ccm-cms/web/assets/xinha/editor.css
@@ -0,0 +1,32 @@
+div.image {
+    border: 1px solid #999;
+
+    margin-bottom: 0.5em;
+}
+
+div.image span.caption {
+    display: block;
+}
+
+div.image.left {
+    float: left;
+
+    margin-right: 1em;
+}
+
+div.image.right {
+    float: right;
+
+    margin-left: 1em;
+}
+
+.wysiwg div.image.center {
+    text-align: center;    
+}
+
+.wysiwg div.image.center span.caption {
+    margin-left: auto;
+    margin-right: auto;
+
+    text-align: left;
+}
diff --git a/ccm-core/web/themes/foundry/foundry/styles/admin.css b/ccm-core/web/themes/foundry/foundry/styles/admin.css
index abf323039..8ada0da67 100644
--- a/ccm-core/web/themes/foundry/foundry/styles/admin.css
+++ b/ccm-core/web/themes/foundry/foundry/styles/admin.css
@@ -1806,4 +1806,37 @@ span#quickLinksCascade {
 
 .wysiwyg ul {
     list-style: disc inside;
-}
\ No newline at end of file
+}
+
+.wysiwyg div.image {
+    border: 1px solid #999;
+
+    margin-bottom: 0.5em;
+}
+
+.wysiwyg div.image span.caption {
+    display: block;
+}
+
+.wysiwyg div.image.left {
+    float: left;
+
+    margin-right: 1em;
+}
+
+.wysiwyg div.image.right {
+    float: right;
+
+    margin-left: 1em;
+}
+
+.wysiwg div.image.center {
+    text-align: center;    
+}
+
+.wysiwg div.image.center span.caption {
+    margin-left: auto;
+    margin-right: auto;
+
+    text-align: left;
+}