Index: /CKEditor/branches/features/kama/_source/plugins/button/plugin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/button/plugin.js	(revision 3546)
+++ /CKEditor/branches/features/kama/_source/plugins/button/plugin.js	(revision 3547)
@@ -58,4 +58,6 @@
 CKEDITOR.ui.button.prototype =
 {
+	canGroup : true,
+
 	/**
 	 * Renders the button.
Index: /CKEditor/branches/features/kama/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/dialog/plugin.js	(revision 3546)
+++ /CKEditor/branches/features/kama/_source/plugins/dialog/plugin.js	(revision 3547)
@@ -1025,4 +1025,5 @@
 						type : 'button',
 						label : editor.lang.common.ok,
+						'class' : 'cke_dialog_ui_button_ok',
 						onClick : function( evt )
 						{
@@ -1058,4 +1059,5 @@
 						type : 'button',
 						label : editor.lang.common.cancel,
+						'class' : 'cke_dialog_ui_button_cancel',
 						onClick : function( evt )
 						{
Index: /CKEditor/branches/features/kama/_source/skins/kama/dialog.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/dialog.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/dialog.css	(revision 3547)
@@ -0,0 +1,613 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/* Restore the dialog visibility */
+body .cke_dialog
+{
+	visibility: visible;
+}
+
+.cke_skin_kama .cke_dialog_body
+{
+	position: relative;
+	z-index: 1;
+	border: solid 1px #ddd;
+	padding: 5px;
+	background-color: #fff;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+}
+
+.cke_skin_kama .cke_dialog_tl,
+.cke_skin_kama .cke_dialog_tr,
+.cke_skin_kama .cke_dialog_tc,
+.cke_skin_kama .cke_dialog_bl,
+.cke_skin_kama .cke_dialog_br,
+.cke_skin_kama .cke_dialog_bc,
+.cke_skin_kama .cke_dialog_ml,
+.cke_skin_kama .cke_dialog_mr
+{
+	display:none;
+}
+
+.cke_skin_kama .cke_dialog_title
+{
+	font-weight: bold;
+	font-size: 14px;
+	padding: 3px 3px 8px;
+	cursor: move;
+	position: relative;
+	border-bottom: 1px solid #eee;
+}
+
+.cke_skin_kama .cke_browser_iequirks .cke_dialog_title,
+.cke_skin_kama .cke_browser_ie6 .cke_dialog_title
+{
+	margin-bottom: 22px;
+}
+
+.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_title
+{
+	position: static !important;
+}
+
+.cke_skin_kama .cke_dialog_contents
+{
+	background-color: #ebebeb;
+	border: solid 1px #fff;
+	border-bottom: none;
+	overflow: auto;
+	padding: 17px 10px 5px 10px;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+	margin-top: 22px;
+}
+
+.cke_skin_kama .cke_dialog_footer
+{
+	text-align: right;
+	background-color: #ebebeb;
+	border: solid 1px #fff;
+	border-bottom: none;
+	-moz-border-radius-bottomleft: 5px;
+	-moz-border-radius-bottomright: 5px;
+	-webkit-border-bottom-left-radius: 5px;
+	-webkit-border-bottom-right-radius: 5px;
+	border-bottom-left-radius: 5px;
+	border-bottom-right-radius: 5px;
+}
+
+.cke_skin_kama .cke_rtl .cke_dialog_footer
+{
+	text-align: left;
+}
+
+/* tabs */
+
+.cke_skin_kama .cke_dialog_tabs
+{
+	height: 23px;
+	display: inline-block;
+	_display: block;
+	margin-left:10px;
+	margin-right:10px;
+	margin-top: 11px;
+	position: absolute;
+	z-index: 2;
+}
+
+.cke_skin_kama .cke_browser_iequirks .cke_dialog_tabs,
+.cke_skin_kama .cke_browser_ie6 .cke_dialog_tabs
+{
+	top: 33px;
+}
+
+.cke_skin_kama .cke_rtl .cke_dialog_tabs
+{
+	right: 10px;
+}
+
+.cke_skin_kama a.cke_dialog_tab,
+.cke_skin_kama a:link.cke_dialog_tab,
+.cke_skin_kama a:active.cke_dialog_tab,
+.cke_skin_kama a:hover.cke_dialog_tab,
+.cke_skin_kama a:visited.cke_dialog_tab
+{
+	background-image: url(sprites.png);
+	background-repeat: repeat-x;
+	background-position: 0 -1323px;
+
+	background-color: #ebebeb;
+	height: 14px;
+	padding: 4px 8px;
+	display: inline-block;
+	cursor: pointer;
+	
+}
+
+/* Gecko 1.8 layout workaround. */
+.cke_skin_kama .cke_browser_gecko18 a.cke_dialog_tab,
+.cke_skin_kama .cke_browser_gecko18 a:link.cke_dialog_tab,
+.cke_skin_kama .cke_browser_gecko18 a:active.cke_dialog_tab,
+.cke_skin_kama .cke_browser_gecko18 a:hover.cke_dialog_tab,
+.cke_skin_kama .cke_browser_gecko18 a:visited.cke_dialog_tab
+{
+	display: inline;
+	position: relative;
+	top: 6px;
+}
+
+.cke_skin_kama a:hover.cke_dialog_tab
+{
+	background-color: #f1f1e3;
+}
+
+.cke_skin_kama a.cke_dialog_tab_selected,
+.cke_skin_kama a:link.cke_dialog_tab_selected,
+.cke_skin_kama a:active.cke_dialog_tab_selected,
+.cke_skin_kama a:hover.cke_dialog_tab_selected,
+.cke_skin_kama a:visited.cke_dialog_tab_selected
+{
+	background-position: 0 -1279px;
+	cursor: default;
+}
+
+/* single_page */
+
+.cke_skin_kama .cke_single_page .cke_dialog_tabs
+{
+	display: none;
+}
+
+.cke_skin_kama .cke_single_page .cke_dialog_contents
+{
+	padding-top: 5px;
+	margin-top: 10px;
+}
+
+.cke_skin_kama .cke_dialog_ui_vbox table,
+.cke_skin_kama .cke_dialog_ui_hbox table
+{
+	margin: auto;
+}
+
+.cke_skin_kama .cke_dialog_ui_vbox_child
+{
+	padding: 5px 0px;
+}
+
+.cke_skin_kama input.cke_dialog_ui_input_text,
+.cke_skin_kama input.cke_dialog_ui_input_password
+{
+	background-color: white;
+	border: none;
+	padding: 0px;
+	width: 100%;
+	height: 14px;
+}
+
+.cke_skin_kama div.cke_dialog_ui_input_text,
+.cke_skin_kama div.cke_dialog_ui_input_password
+{
+	background-color: white;
+	border: 1px solid #a0a0a0;
+	padding: 1px 0px;
+}
+
+.cke_skin_kama textarea.cke_dialog_ui_input_textarea
+{
+	background-color: white;
+	border: none;
+	padding: 0px;
+	width: 100%;
+	/*
+	 * IE6 BUG: Scrollbars in textareas can overflow even if the outer DIV is set to overflow:hidden.
+	 * So leave 1% width for the scrollbar. In most situations the 1% isn't noticeable by users.
+	 */
+	_width: 99%;
+	overflow: auto;
+}
+
+.cke_skin_kama div.cke_dialog_ui_input_textarea
+{
+	background-color: white;
+	border: 1px solid #a0a0a0;
+	padding: 1px 0px;
+}
+
+.cke_skin_kama .cke_dialog_ui_hbox
+{
+	width: 100%;
+}
+
+.cke_skin_kama .cke_dialog_ui_hbox_first,
+.cke_skin_kama .cke_dialog_ui_hbox_child,
+.cke_skin_kama .cke_dialog_ui_hbox_last
+{
+	vertical-align: top;
+}
+
+.cke_skin_kama .cke_ltr .cke_dialog_ui_hbox_first,
+.cke_skin_kama .cke_ltr .cke_dialog_ui_hbox_child
+{
+	padding-right: 10px;
+}
+
+.cke_skin_kama .cke_rtl .cke_dialog_ui_hbox_first,
+.cke_skin_kama .cke_rtl .cke_dialog_ui_hbox_child
+{
+	padding-left: 10px;
+}
+
+/* button */
+
+.cke_skin_kama a.cke_dialog_ui_button
+{
+	border-collapse: separate;
+	cursor: default;
+
+	-moz-border-radius: 5px;
+	background: transparent url(sprites.png) repeat-x scroll 0 -1069px;
+	_background: none;
+	padding: 5px 0;
+}
+
+/* IE6 buttons. */
+.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button span,
+.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button span
+{
+	border: #737357 1px solid;
+	padding: 2px 10px;
+	text-align: center;
+	color: #3b3b1f;
+	background: #ebebeb none;
+	display: inline-block;
+	cursor: default;
+}
+
+.cke_skin_kama a.cke_dialog_ui_button_ok
+{
+	background-position: 0 -1143px;
+	text-align: left;
+}
+
+.cke_skin_kama a.cke_dialog_ui_button_ok span
+{
+	background: transparent url(sprites.png) no-repeat scroll right -1219px;
+	min-width: 60px;
+	padding-right: 20px;
+	text-align: left;
+}
+
+.cke_skin_kama a.cke_dialog_ui_button_cancel
+{
+	background-position: 0 -1104px;
+}
+
+.cke_skin_kama a.cke_dialog_ui_button_cancel span
+{
+	background: transparent url(sprites.png) no-repeat scroll right -1245px;
+	padding-right: 20px;
+}
+
+.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_cancel span,
+.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_cancel span,
+.cke_skin_kama .cke_browser_iequirks a.cke_dialog_ui_button_ok span,
+.cke_skin_kama .cke_browser_ie6 a.cke_dialog_ui_button_ok span
+{
+	background-image: none;
+	padding-right: 10px;
+}
+
+.cke_skin_kama span.cke_dialog_ui_button
+{
+	padding: 2px 10px;
+	text-align: center;
+	color: #222;
+	display: inline-block;
+	cursor: default;
+}
+
+/* Gecko 1.8 does not support display: inline-block */
+.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button
+{
+	display: block;
+}
+
+.cke_skin_kama a.cke_dialog_ui_button span.cke_disabled
+{
+	border: #898980 1px solid;
+	color: #5e5e55;
+	background-color: #c5c5b3;
+}
+
+.cke_skin_kama a:hover.cke_dialog_ui_button,
+.cke_skin_kama a:focus.cke_dialog_ui_button,
+.cke_skin_kama a:active.cke_dialog_ui_button
+{
+	background-position: 0 -1179px;
+}
+
+/* Skip hover effect on IE6 */
+.cke_skin_kama .cke_browser_iequirks a:hover.cke_dialog_ui_button span,
+.cke_skin_kama .cke_browser_iequirks a:focus.cke_dialog_ui_button span,
+.cke_skin_kama .cke_browser_iequirks a:active.cke_dialog_ui_button span,
+.cke_skin_kama .cke_browser_ie6 a:hover.cke_dialog_ui_button span,
+.cke_skin_kama .cke_browser_ie6 a:focus.cke_dialog_ui_button span,
+.cke_skin_kama .cke_browser_ie6 a:active.cke_dialog_ui_button span
+{
+	background-image: none;
+	background: #F4F4F4;
+}
+
+.cke_skin_kama .cke_dialog_footer_buttons
+{
+	display: inline-table;
+	margin-right: 12px;
+	margin-left: 12px;
+	width: auto;
+	position: relative;
+}
+
+/* Gecko 1.8 does not support for display: inline-table */
+.cke_skin_kama .cke_browser_gecko18 .cke_dialog_footer_buttons
+{
+	display: inline;
+}
+
+.cke_skin_kama .cke_dialog_footer_buttons span.cke_dialog_ui_button
+{
+	margin: 7px 0;
+	text-align: center;
+}
+
+.cke_skin_kama strong
+{
+	font-weight: bold;
+}
+
+/* close_button */
+
+.cke_skin_kama .cke_dialog_close_button
+{
+	background-image: url(sprites.png);
+	background-repeat: no-repeat;
+	background-position: 0 -1022px;
+	position: absolute;
+	cursor: pointer;
+	text-align: center;
+	height: 20px;
+	width: 20px;
+	top: 5px;
+}
+
+.cke_skin_kama .cke_dialog_close_button span
+{
+	display: none;
+}
+
+.cke_skin_kama .cke_dialog_close_button:hover
+{
+	background-position: 0 -1045px;
+}
+
+.cke_skin_kama .cke_ltr .cke_dialog_close_button
+{
+	right: 10px;
+	_right: 22px;
+}
+
+.cke_skin_kama .cke_rtl .cke_dialog_close_button
+{
+	left: 10px;
+	_left: 22px;
+}
+
+.cke_skin_kama .cke_browser_ie6.cke_rtl .cke_dialog_close_button
+{
+	position: relative;
+	float: left;
+	margin-top: -55px;
+	margin-left: -7px;
+}
+
+.cke_skin_kama .cke_browser_iequirks.cke_rtl.cke_single_page .cke_dialog_close_button
+{
+	margin-top: -32px;
+}
+
+.cke_skin_kama .cke_browser_iequirks.cke_ltr .cke_dialog_close_button
+{
+	margin-top: 0;
+}
+
+.cke_skin_kama .cke_dialog_ui_input_select
+{
+	border: 1px solid #a0a0a0;
+	background-color: white;
+}
+
+.cke_skin_kama iframe.cke_dialog_ui_input_file
+{
+	width: 100%;
+	height: 25px;
+}
+
+/*
+ * Some utility CSS classes for dialog authors.
+ */
+.cke_skin_kama .cke_dialog .dark_background
+{
+	background-color: #eaead1;
+}
+
+.cke_skin_kama .cke_dialog .hand
+{
+	cursor: pointer;
+}
+
+.cke_skin_kama .cke_dialog .centered
+{
+	text-align: center;
+}
+
+.cke_skin_kama .cke_dialog .cke_btn_reset
+{
+	float: right;
+	background-position: 0 -32px;
+	background-image: url(images/mini.gif);
+	width: 16px;
+	height: 16px;
+	background-repeat: no-repeat;
+	border: 1px none;
+	font-size: 1px;
+}
+
+.cke_skin_kama .cke_rtl .cke_dialog .cke_btn_reset
+{
+	float: left;
+}
+
+.cke_skin_kama .cke_dialog .cke_btn_locked,
+.cke_skin_kama .cke_dialog .cke_btn_unlocked
+{
+	float: left;
+	background-position: 0 0;
+	background-image: url(images/mini.gif);
+	width: 16px;
+	height: 16px;
+	background-repeat: no-repeat;
+	border: none 1px;
+	font-size: 1px;
+}
+
+.cke_skin_kama .cke_dialog .cke_btn_locked,
+.cke_skin_kama .cke_dialog .cke_btn_unlocked
+{
+	float: right;
+}
+
+.cke_skin_kama .cke_dialog .cke_btn_unlocked
+{
+	background-position: 0 -16px;
+	background-image: url(images/mini.gif);
+}
+
+.cke_skin_kama .cke_dialog .cke_btn_over
+{
+	border: outset 1px;
+	cursor: pointer;
+	cursor: hand;
+}
+
+.cke_skin_kama .cke_dialog  #ImagePreviewBox
+{
+	white-space : normal;
+	border : 2px ridge black;
+	overflow : scroll;
+	height : 160px;
+	width : 230px;
+	padding : 2px;
+	background-color : white;
+}
+.cke_skin_kama .cke_dialog  #ImagePreviewLoader
+{
+	position: absolute;
+	white-space : normal;
+	overflow : hidden;
+	height : 160px;
+	width : 230px;
+	margin : 2px;
+	padding : 2px;
+	opacity : 0.9;
+	filter : alpha(opacity=90);
+
+	background-color : #e4e4e4;
+}
+
+.cke_skin_kama .cke_dialog  #FlashPreviewBox
+{
+	white-space : normal;
+	border : 2px ridge black;
+	overflow : auto;
+	height : 160px;
+	width : 390px;
+	padding : 2px;
+	background-color : white;
+}
+
+.cke_skin_kama .cke_dialog .cke_dark_background
+{
+	text-align : center;
+	background-color: #eaead1;
+	font-size : 14px;
+}
+
+.cke_skin_kama .cke_dialog .cke_light_background
+{
+	text-align : center;
+	background-color: #ffffbe;
+}
+
+.cke_skin_kama .cke_dialog .cke_hand
+{
+	cursor: pointer;
+	cursor: hand;
+}
+
+.cke_skin_kama .disabled
+{
+	color: #a0a0a0;
+}
+
+
+/* High Contrast Mode */
+
+.cke_skin_kama .cke_hc .cke_dialog_title,
+.cke_skin_kama .cke_hc .cke_dialog_tabs,
+.cke_skin_kama .cke_hc .cke_dialog_contents,
+.cke_skin_kama .cke_hc .cke_dialog_footer
+{
+	border-left: 1px solid;
+	border-right: 1px solid;
+}
+
+.cke_skin_kama .cke_hc .cke_dialog_title
+{
+	border-top: 1px solid;
+}
+
+.cke_skin_kama .cke_hc .cke_dialog_footer
+{
+	border-bottom: 1px solid;
+}
+
+.cke_skin_kama .cke_hc .cke_dialog_close_button span
+{
+	display: inline;
+	cursor: pointer;
+	cursor: hand;
+	font-weight: bold;
+	position: relative;
+	top: 3px;
+}
+
+.cke_skin_kama a.cke_smile img
+{
+	/* IE6 does not support transparent borders */
+	border: 2px solid #eaead1;
+}
+
+.cke_skin_kama a.cke_smile:focus img,
+.cke_skin_kama a.cke_smile:active img,
+.cke_skin_kama a.cke_smile:hover img
+{
+	border-color: #C7C78F;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/editor.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/editor.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/editor.css	(revision 3547)
@@ -0,0 +1,21 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+@import url("reset.css");
+@import url("mainui.css");
+@import url("panel.css");
+@import url("toolbar.css");
+@import url("menu.css");
+@import url("richcombo.css");
+@import url("elementspath.css");
+@import url("icons.css");
+@import url("presets.css");
+
+/* Restore the container visibility */
+html .cke_skin_kama,
+html.cke_skin_kama_container
+{
+	visibility: visible;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/elementspath.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/elementspath.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/elementspath.css	(revision 3547)
@@ -0,0 +1,61 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+@media print
+{
+	.cke_path
+	{
+		display: none;
+	}
+}
+
+.cke_skin_kama .cke_path
+{
+	padding: 0 5px;
+	display: block;
+	float: left; 
+}
+
+.cke_skin_v2 .cke_rtl .cke_path
+{
+	float: right;
+}
+
+.cke_skin_kama .cke_path a,
+.cke_skin_kama .cke_rtl .cke_path .cke_empty
+{
+	display: block;
+	float: left;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	padding-left: 4px;
+	padding-right: 4px;
+	margin-bottom : 3px;
+	color: #60676a;
+}
+
+.cke_skin_kama .cke_path .cke_empty
+{
+	visibility: hidden;
+}
+
+.cke_skin_kama .cke_rtl .cke_path a,
+.cke_skin_kama .cke_path .cke_empty
+{
+	float: right;
+}
+
+.cke_skin_kama .cke_path a:hover,
+.cke_skin_kama .cke_path a:focus,
+.cke_skin_kama .cke_path a:active	/* IE */
+{
+	background-color: #dff1ff;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	padding-left: 4px;
+	padding-right: 4px;
+	outline: none;
+	color : #000;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/icons.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/icons.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/icons.css	(revision 3547)
@@ -0,0 +1,309 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_kama .cke_button_source .cke_icon
+{
+	background-position: 0 0;
+}
+
+.cke_skin_kama .cke_button_newpage .cke_icon
+{
+	background-position: 0 -48px;
+}
+
+.cke_skin_kama .cke_button_preview .cke_icon
+{
+	background-position: 0 -64px;
+}
+
+.cke_skin_kama .cke_button_cut .cke_icon
+{
+	background-position: 0 -96px;
+}
+
+.cke_skin_kama .cke_button_copy .cke_icon
+{
+	background-position: 0 -112px;
+}
+
+.cke_skin_kama .cke_button_paste .cke_icon
+{
+	background-position: 0 -128px;
+}
+
+.cke_skin_kama .cke_button_pastetext .cke_icon
+{
+	background-position: 0 -144px;
+}
+
+.cke_skin_kama .cke_button_find .cke_icon
+{
+	background-position: 0 -240px;
+}
+
+.cke_skin_kama .cke_button_replace .cke_icon
+{
+	background-position: 0 -256px;
+}
+
+.cke_skin_kama .cke_button_selectAll .cke_icon
+{
+	background-position: 0 -272px;
+}
+
+.cke_skin_kama .cke_button_removeFormat .cke_icon
+{
+	background-position: 0 -288px;
+}
+
+.cke_skin_kama .cke_button_bold .cke_icon
+{
+	background-position: 0 -304px;
+}
+
+.cke_skin_kama .cke_button_italic .cke_icon
+{
+	background-position: 0 -320px;
+}
+
+.cke_skin_kama .cke_button_underline .cke_icon
+{
+	background-position: 0 -336px;
+}
+
+.cke_skin_kama .cke_button_strike .cke_icon
+{
+	background-position: 0 -352px;
+}
+
+.cke_skin_kama .cke_button_subscript .cke_icon
+{
+	background-position: 0 -368px;
+}
+
+.cke_skin_kama .cke_button_superscript .cke_icon
+{
+	background-position: 0 -384px;
+}
+
+.cke_skin_kama .cke_button_table .cke_icon
+{
+	background-position: 0 -608px;
+}
+
+.cke_skin_kama .cke_button_horizontalrule .cke_icon
+{
+	background-position: 0 -624px;
+}
+
+.cke_skin_kama .cke_button_smiley .cke_icon
+{
+	background-position: 0 -640px;
+}
+
+.cke_skin_kama .cke_button_link .cke_icon
+{
+	background-position: 0 -528px;
+}
+
+.cke_skin_kama .cke_button_unlink .cke_icon
+{
+	background-position: 0 -544px;
+}
+
+.cke_skin_kama .cke_button_anchor .cke_icon
+{
+	background-position: 0 -560px;
+}
+
+.cke_skin_kama .cke_button_image .cke_icon
+{
+	background-position: 0 -576px;
+}
+
+.cke_skin_kama .cke_button_flash .cke_icon
+{
+	background-position: 0 -592px;
+}
+
+.cke_skin_kama .cke_button_specialchar .cke_icon
+{
+	background-position: 0 -656px;
+}
+
+.cke_skin_kama .cke_button_pagebreak .cke_icon
+{
+	background-position: 0 -672px;
+}
+
+.cke_skin_kama .cke_button_print .cke_icon
+{
+	background-position: 0 -176px;
+}
+
+.cke_skin_kama .cke_button_checkspell .cke_icon,
+.cke_skin_kama .cke_button_scayt .cke_icon
+{
+	background-position: 0 -192px;
+}
+
+.cke_skin_kama .cke_button_pagebreak .cke_icon
+{
+	background-position: 0 -672px;
+}
+
+.cke_skin_kama .cke_button_textcolor .cke_icon
+{
+	background-position: 0 -704px;
+}
+
+.cke_skin_kama .cke_button_bgcolor .cke_icon
+{
+	background-position: 0 -720px;
+}
+
+.cke_skin_kama .cke_button_form .cke_icon
+{
+	background-position: 0 -752px;
+}
+
+.cke_skin_kama .cke_button_checkbox .cke_icon
+{
+	background-position: 0 -768px;
+}
+
+.cke_skin_kama .cke_button_radio .cke_icon
+{
+	background-position: 0 -784px;
+}
+
+.cke_skin_kama .cke_button_textfield .cke_icon
+{
+	background-position: 0 -800px;
+}
+
+.cke_skin_kama .cke_button_textarea .cke_icon
+{
+	background-position: 0 -816px;
+}
+.cke_skin_kama .cke_button_showblocks .cke_icon
+{
+	background-position: 0 -1136px;
+}
+
+.cke_skin_kama .cke_button_select .cke_icon
+{
+	background-position: 0 -832px;
+}
+
+.cke_skin_kama .cke_button_button .cke_icon
+{
+	background-position: 0 -848px;
+}
+
+.cke_skin_kama .cke_button_imagebutton .cke_icon
+{
+	background-position: 0 -864px;
+}
+
+.cke_skin_kama .cke_button_hiddenfield .cke_icon
+{
+	background-position: 0 -880px;
+}
+
+.cke_skin_kama .cke_button_undo .cke_icon
+{
+	background-position: 0 -208px;
+}
+
+.cke_skin_kama .cke_rtl .cke_button_undo .cke_icon
+{
+	background-position: 0 -224px;
+}
+
+.cke_skin_kama .cke_button_redo .cke_icon
+{
+	background-position: 0 -224px;
+}
+
+.cke_skin_kama .cke_rtl .cke_button_redo .cke_icon
+{
+	background-position: 0 -208px;
+}
+
+.cke_skin_kama .cke_button_templates .cke_icon
+{
+	background-position: 0 -80px;
+}
+
+.cke_skin_kama .cke_button_numberedlist .cke_icon
+{
+	background-position: 0 -400px;
+}
+
+.cke_skin_kama .cke_button_bulletedlist .cke_icon
+{
+	background-position: 0 -416px;
+}
+
+.cke_skin_kama .cke_button_outdent .cke_icon
+{
+	background-position: 0 -432px;
+}
+
+.cke_skin_kama .cke_button_indent .cke_icon
+{
+	background-position: 0 -448px;
+}
+
+.cke_skin_kama .cke_button_justifyleft .cke_icon
+{
+	background-position: 0 -464px;
+}
+
+.cke_skin_kama .cke_button_justifycenter .cke_icon
+{
+	background-position: 0 -480px;
+}
+
+.cke_skin_kama .cke_button_justifyright .cke_icon
+{
+	background-position: 0 -496px;
+}
+
+.cke_skin_kama .cke_button_justifyblock .cke_icon
+{
+	background-position: 0 -512px;
+}
+
+.cke_skin_kama .cke_button_blockquote .cke_icon
+{
+	background-position: 0 -1152px;
+}
+
+.cke_skin_kama .cke_button_flash .cke_icon
+{
+	background-position: 0 -592px;
+}
+
+.cke_skin_kama .cke_button_pastefromword .cke_icon
+{
+	background-position: 0 -160px;
+}
+
+.cke_skin_kama .cke_button_save .cke_icon
+{
+	background-position: 0 -32px;
+}
+
+.cke_skin_kama .cke_button_about .cke_icon
+{
+	background-position: 0 -736px;
+}
+
+.cke_skin_kama .cke_button_maximize .cke_icon
+{
+	background-position: 0 -1040px;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/mainui.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/mainui.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/mainui.css	(revision 3547)
@@ -0,0 +1,95 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_kama
+{
+	display: block;
+}
+
+/* Main editor only settings. */
+span.cke_skin_kama
+{
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	border: 1px solid #D3D3D3;
+	padding: 5px;
+}
+
+.cke_skin_kama .cke_wrapper
+{
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	background-color: #d3d3d3;
+	background-image: url(sprites.png);
+	background-repeat: repeat-x;
+	background-position: 0 -1950px;
+	display: block;
+
+	/*background-color: Red;*/
+}
+
+.cke_skin_kama .cke_browser_ie6 .cke_wrapper,
+.cke_skin_kama .cke_browser_iequirks .cke_wrapper
+{
+	background-image: none;
+}
+
+.cke_skin_kama .cke_editor
+{
+/*
+	border: solid 1px #dcdcdc;
+*/
+	display: inline-table;
+}
+
+.cke_skin_kama .cke_browser_opera .cke_editor
+{
+	display: table;
+}
+
+.cke_skin_kama .cke_contents
+{
+	margin: 5px;
+	padding: 0 5px 5px;
+}
+
+.cke_skin_kama .cke_focus
+{
+	outline: auto 5px -webkit-focus-ring-color;
+}
+
+.cke_skin_kama textarea.cke_source
+{
+	font-family: 'Courier New' , Monospace;
+	font-size: small;
+	background-color: #fff;
+	white-space: pre;
+}
+
+.cke_skin_kama .cke_browser_iequirks textarea.cke_source
+{
+	/* For IE6+Quirks only */
+	_white-space: normal;
+}
+
+.cke_skin_kama .cke_resizer
+{
+	width: 12px;
+	height: 12px;
+	margin-top: 12px;
+	display: block;
+	float: right;
+	background-image: url(images/resizer.gif);
+	cursor: se-resize;
+}
+
+.cke_skin_kama .cke_rtl .cke_resizer
+{
+	cursor: sw-resize;
+	background-image: url(images/resizer_rtl.gif);
+	float: left;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/menu.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/menu.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/menu.css	(revision 3547)
@@ -0,0 +1,142 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_kama .cke_contextmenu
+{
+	padding: 2px;
+}
+
+.cke_skin_kama .cke_menuitem a
+{
+	display:block;
+}
+
+.cke_skin_kama .cke_menuitem span
+{
+	cursor: default;
+}
+
+.cke_skin_kama .cke_menuitem a:hover,
+.cke_skin_kama .cke_menuitem a:focus,
+.cke_skin_kama .cke_menuitem a:active
+{
+	background-color: #D3D3D3;
+	display:block;
+}
+
+.cke_skin_kama .cke_menuitem a.cke_disabled:hover,
+.cke_skin_kama .cke_menuitem a.cke_disabled:focus,
+.cke_skin_kama .cke_menuitem a.cke_disabled:active
+{
+	background-color: transparent;
+}
+
+.cke_skin_kama .cke_menuitem a.cke_disabled
+{
+	filter: alpha(opacity=30); /* IE */
+	opacity : 0.3; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_kama .cke_menuitem .cke_icon
+{
+	background-image: url(icons.png);
+	background-position: 100px;
+	background-repeat:no-repeat;
+	background-color: #e3e3c7;
+	width: 16px;
+	height: 16px;
+	float: left;
+	border: solid 4px #e3e3c7;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon
+{
+	float: right;
+}
+
+.cke_skin_kama .cke_menuitem a:hover .cke_icon,
+.cke_skin_kama .cke_menuitem a:focus .cke_icon,
+.cke_skin_kama .cke_menuitem a:active .cke_icon
+{
+	background-color: #9d9d9d;
+	border: solid 4px #9d9d9d;
+	filter: alpha(opacity=100); /* IE */
+	opacity: 1; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_kama .cke_menuitem a:hover.cke_disabled .cke_icon,
+.cke_skin_kama .cke_menuitem a:focus.cke_disabled .cke_icon,
+.cke_skin_kama .cke_menuitem a:active.cke_disabled .cke_icon
+{
+	background-color: #e3e3c7;
+	border: solid 4px #e3e3c7;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_kama .cke_menuitem .cke_label
+{
+	display:block;
+    padding-right: 3px;
+    padding-top: 5px;
+    height:19px;
+    margin-left: 28px;
+    background-color: #fff;
+	_overflow: hidden;
+	_width: 86px;
+}
+
+.cke_rtl .cke_skin_kama .cke_menuitem .cke_label
+{
+    padding-right: 0;
+    margin-left: 0;
+    padding-left: 3px;
+    margin-right: 28px;
+}
+
+.cke_skin_kama .cke_menuitem a:hover .cke_label,
+.cke_skin_kama .cke_menuitem a:focus .cke_label,
+.cke_skin_kama .cke_menuitem a:active .cke_label
+{
+	background-color: #D3D3D3;
+}
+
+.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_label,
+.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_label,
+.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_label
+{
+	background-color: transparent;
+}
+
+.cke_skin_kama .cke_menuseparator
+{
+	background-color: #e3e3c7;
+	height: 2px;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+
+	_font-size: 0;
+}
+
+.cke_skin_kama .cke_menuarrow
+{
+	background-image: url(images/arrowright.gif);
+	background-repeat: no-repeat;
+	height: 5px;
+	width: 3px;
+	float: right;
+	margin-right: 2px;
+	margin-top: 3px;
+}
+
+.cke_rtl .cke_skin_kama .cke_menuarrow
+{
+	float: left;
+	margin-right: 0;
+	margin-left: 2px;
+	background-image: url(images/arrowleft.gif);
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/panel.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/panel.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/panel.css	(revision 3547)
@@ -0,0 +1,203 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_kama .cke_panel
+{
+	border: 1px solid #8f8f73;
+	background-color: #fff;
+
+	width: 120px;
+	height: 100px;
+
+	overflow: hidden;
+
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.cke_skin_kama .cke_contextmenu
+{
+	margin: 0;
+}
+
+/* Ideally we would use "inherit here"... but you know... IE :( */
+.cke_skin_kama .cke_panel iframe
+{
+	width: 100%;
+	height: 100%;
+}
+
+/*
+ * All the following styles are to be used inside the iframe that holds panel
+ * contents. We don't use the cke_skin_default there to avoid the reset to be
+ * active.
+ * This is not an issue as we'll never have two skins running inside the same
+ * panel iframe.
+ */
+
+html.cke_skin_kama_container
+{
+	overflow: auto;
+	overflow-x: hidden;
+}
+
+body.cke_panel_frame
+{
+	overflow: auto;
+	overflow-x: hidden;
+}
+
+ul.cke_panel_list
+{
+	list-style-type: none;
+	margin: 3px;
+	padding: 0px;
+	white-space: nowrap;
+}
+
+li.cke_panel_listItem
+{
+	margin: 0px;
+}
+
+.cke_panel_listItem a
+{
+	padding: 2px;
+	display: block;
+	border: 1px solid #fff;
+	color: inherit;
+	text-decoration: none;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* IE6 */
+* html .cke_panel_listItem a
+{
+	width : 100%;
+
+	/* IE is not able to inherit the color, so we must force it to black */
+	color: #000;
+}
+
+/* IE7 */
+*:first-child+html .cke_panel_listItem a
+{
+	/* IE is not able to inherit the color, so we must force it to black */
+	color: #000;
+}
+
+.cke_panel_listItem.cke_selected a
+{
+	border: 1px solid #ccc;
+	background-color: #e9f5ff;
+}
+
+.cke_panel_listItem a:hover,
+.cke_panel_listItem a:focus,
+.cke_panel_listItem a:active
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+}
+
+.cke_panel_grouptitle
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+	font-weight: bold;
+	white-space: nowrap;
+	background-color: #dcdcdc;
+	color: #000;
+	margin:0px;
+	padding:3px;
+}
+
+.cke_panel_listItem p,
+.cke_panel_listItem h1,
+.cke_panel_listItem h2,
+.cke_panel_listItem h3,
+.cke_panel_listItem h4,
+.cke_panel_listItem h5,
+.cke_panel_listItem h6,
+.cke_panel_listItem pre
+{
+	margin-top: 3px;
+	margin-bottom: 3px;
+}
+
+.cke_skin_kama .cke_button_textcolor_panel,
+.cke_skin_kama .cke_button_bgcolor_panel
+{
+	width: 150px;
+	height: 135px;
+}
+
+.cke_colorblock
+{
+	padding: 3px;
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.cke_colorblock,
+.cke_colorblock a
+{
+	text-decoration: none;
+	color: #000;
+}
+
+span.cke_colorbox
+{
+	width: 10px;
+	height: 10px;
+    border: #808080 1px solid;
+	float: left;
+}
+
+.cke_rtl span.cke_colorbox
+{
+	float: right;
+}
+
+a.cke_colorbox
+{
+    border: #fff 1px solid;
+    padding: 2px;
+    float: left;
+}
+
+.cke_rtl a.cke_colorbox
+{
+    float: right;
+}
+
+a:hover.cke_colorbox,
+a:focus.cke_colorbox,
+a:active.cke_colorbox
+{
+    border: #316ac5 1px solid;
+    background-color: #dff1ff;
+}
+
+a.cke_colorauto,
+a.cke_colormore
+{
+    border: #fff 1px solid;
+    padding: 2px;
+    display: block;
+}
+
+a:hover.cke_colorauto,
+a:hover.cke_colormore,
+a:focus.cke_colorauto,
+a:focus.cke_colormore,
+a:active.cke_colorauto,
+a:active.cke_colormore
+{
+    border: #316ac5 1px solid;
+    background-color: #dff1ff;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/presets.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/presets.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/presets.css	(revision 3547)
@@ -0,0 +1,49 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/* "Source" button label */
+.cke_skin_kama .cke_button_source .cke_label
+{
+	display: inline;
+}
+
+/* "Styles" panel size */
+.cke_skin_kama .cke_styles_panel
+{
+	width: 150px;
+	height: 170px;
+}
+
+/* "Format" panel size */
+.cke_skin_kama .cke_format_panel
+{
+	width: 150px;
+	height: 170px;
+}
+
+/* "Font" panel size */
+.cke_skin_kama .cke_font_panel
+{
+	width: 150px;
+	height: 170px;
+}
+
+/* "Font Size" panel size */
+.cke_skin_kama .cke_fontSize_panel
+{
+	height: 170px;
+}
+
+/* "Font Size" combo width */
+.cke_skin_kama .cke_fontSize .cke_text
+{
+	width: 25px;
+}
+
+/* "Font Size" combo width (IE Quirks) */
+.cke_skin_kama .cke_browser_iequirks .cke_fontSize .cke_text
+{
+	width: 32px;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/reset.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/reset.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/reset.css	(revision 3547)
@@ -0,0 +1,78 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * Reset and Default Values
+ */
+.cke_skin_kama *,
+.cke_skin_kama a:hover,
+.cke_skin_kama a:link,
+.cke_skin_kama a:visited,
+.cke_skin_kama a:active
+{
+	margin: 0;
+	padding: 0;
+	border: 0;
+	background: transparent;
+	text-decoration: none;
+	font: normal normal normal 100% Sans-Serif;
+	width: auto;
+	height: auto;
+	border-collapse: collapse;
+	text-align: left;
+	vertical-align: baseline;
+	white-space: nowrap;
+	cursor: auto;
+	color: #000;
+
+    font-size: 12px;
+    font-family: Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
+}
+
+.cke_skin_kama .cke_rtl *,
+.cke_skin_kama .cke_rtl a:hover,
+.cke_skin_kama .cke_rtl a:link,
+.cke_skin_kama .cke_rtl a:visited,
+.cke_skin_kama .cke_rtl a:active,
+.cke_rtl .cke_skin_kama *,
+.cke_rtl .cke_skin_kama a:hover,
+.cke_rtl .cke_skin_kama a:link,
+.cke_rtl .cke_skin_kama a:visited,
+.cke_rtl .cke_skin_kama a:active
+{
+	text-align: right;
+}
+
+.cke_skin_kama iframe
+{
+	vertical-align: inherit;	/** For IE */
+}
+
+.cke_skin_kama textarea
+{
+	white-space: pre;
+}
+
+.cke_skin_kama .cke_browser_gecko textarea
+{
+	cursor: text;
+}
+
+.cke_skin_kama .cke_browser_gecko textarea[disabled]
+{
+	cursor: default;
+}
+
+.cke_skin_kama input[type="text"],
+.cke_skin_kama input[type="password"]
+{
+	cursor: text;
+}
+
+.cke_skin_kama input[type="text"][disabled],
+.cke_skin_kama input[type="password"][disabled]
+{
+	cursor: default;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/richcombo.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/richcombo.css	(revision 3547)
@@ -0,0 +1,238 @@
+/* Special Combo */
+
+.cke_skin_kama .cke_rcombo
+{
+	display: inline-block;
+	margin: 0 3px;
+}
+
+.cke_skin_kama .cke_rcombopanel
+{
+	border: 1px solid #8F8F73;
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-left-radius: 0;
+	border-top-left-radius: 0;
+	height: auto;
+	_height: 100px;
+}
+
+/* IE6 workaround, shouln't be here */
+.cke_skin_kama .cke_browser_iequirks .cke_rcombopanel,
+.cke_skin_kama .cke_browser_ie6 .cke_rcombopanel
+{
+	width: 150px;
+}
+
+.cke_skin_kama .cke_rcombo a,
+.cke_skin_kama .cke_rcombo a:active,
+.cke_skin_kama .cke_rcombo a:hover
+{
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	background-image: url(sprites.png);
+	background-repeat: repeat-x;
+	background-position: 0 -100px;
+	border-bottom:1px solid #DAD9D9;
+	border-right:1px solid #DAD9D9;
+	float:left;
+	padding: 2px;
+	height: 22px;
+}
+
+.cke_skin_kama .cke_browser_iequirks .cke_rcombo a,
+.cke_skin_kama .cke_browser_iequirks .cke_rcombo a:active,
+.cke_skin_kama .cke_browser_iequirks .cke_rcombo a:hover,
+.cke_skin_kama .cke_browser_ie6 .cke_rcombo a,
+.cke_skin_kama .cke_browser_ie6 .cke_rcombo a:active,
+.cke_skin_kama .cke_browser_ie6 .cke_rcombo a:hover
+{
+	border-bottom: 1px solid transparent;
+	background: #FEFEFE none;
+	padding-bottom: 0;
+	margin-bottom: -6px;
+}
+
+.cke_skin_kama .cke_hc .cke_rcombo a
+{
+	filter: alpha(opacity=100); /* IE */
+	opacity: 1.0; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_kama .cke_rcombo .cke_label
+{
+	display: none;
+	line-height: 26px;
+	vertical-align: top;
+	margin-right: 5px;
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+	/* background-color: #f1f1e3;	Because of IE6+ClearType */
+}
+
+.cke_skin_kama .cke_rcombo .cke_inline_label
+{
+	line-height: 22px;
+	font-style: italic;
+	color: #666666;
+}
+
+.cke_skin_kama .cke_hc .cke_rcombo .cke_label
+{
+	filter: alpha(opacity=100);
+	opacity: 1.0;
+}
+
+.cke_skin_kama .cke_rtl .cke_rcombo .cke_label
+{
+	padding-right: 4px;
+	padding-left: 5px;
+}
+
+.cke_skin_kama .cke_rcombo .cke_text
+{
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+
+	height: 22px;
+	line-height: 22px;
+	width:60px;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: inline-block;
+	margin: 0 2px 0 4px;
+}
+
+.cke_skin_kama .cke_browser_ie6 .cke_rcombo .cke_text
+{
+	filter: none;
+}
+
+.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_text
+{
+	height: 24px;
+	width: 72px;
+}
+
+.cke_skin_kama .cke_rcombo .cke_openbutton
+{
+    background-image: url(sprites.png);
+    background-position: 0 -68px;
+    background-repeat: no-repeat;
+	display: inline-block;
+    width: 17px;
+	height: 22px;
+	margin: 2px;
+    background-repeat: no-repeat;
+}
+
+.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_openbutton
+{
+	height: 24px;
+    width: 15px;
+}
+
+.cke_skin_kama .cke_rcombo .cke_off a:hover,
+.cke_skin_kama .cke_rcombo .cke_off a:focus,
+.cke_skin_kama .cke_rcombo .cke_off a:active,
+.cke_skin_kama .cke_rcombo .cke_on a
+{
+}
+
+.cke_skin_kama .cke_rcombo .cke_off a:hover .cke_text,
+.cke_skin_kama .cke_rcombo .cke_off a:focus .cke_text,
+.cke_skin_kama .cke_rcombo .cke_off a:active .cke_text,
+.cke_skin_kama .cke_rcombo .cke_on .cke_text
+{
+	border-color: #316ac5;
+	filter: alpha(opacity=100); /* IE */
+	_filter: none; /* IE6 */
+	opacity: 1; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_kama .cke_rcombo .cke_off a:hover .cke_openbutton,
+.cke_skin_kama .cke_rcombo .cke_off a:focus .cke_openbutton,
+.cke_skin_kama .cke_rcombo .cke_off a:active .cke_openbutton,
+.cke_skin_kama .cke_rcombo .cke_on .cke_openbutton
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+}
+
+.cke_skin_kama .cke_rcombo .cke_on .cke_text
+{
+	-moz-border-radius-bottomleft: 0px;
+	-webkit-border-bottom-left-radius: 0px;
+	border-bottom-left-radius: 0px;
+}
+
+.cke_skin_kama .cke_rcombo .cke_on .cke_openbutton
+{
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+}
+
+.cke_skin_kama .cke_rcombo .cke_disabled .cke_label
+{
+	filter: alpha(opacity=30); /* IE */
+	opacity: 0.3; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_kama .cke_hc .cke_rcombo .cke_disabled .cke_label
+{
+	filter: alpha(opacity=70);
+	opacity: 0.7;
+}
+
+.cke_skin_kama .cke_rcombo .cke_disabled .cke_text,
+.cke_skin_kama .cke_rcombo .cke_disabled .cke_openbutton
+{
+	filter: alpha(opacity=50); /* IE */
+	opacity: 0.5; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_kama .cke_hc .cke_rcombo .cke_disabled .cke_text,
+.cke_skin_kama .cke_hc .cke_rcombo .cke_disabled .cke_openbutton
+{
+	filter: alpha(opacity=80);
+	opacity: 0.8;
+}
+
+.cke_skin_kama .cke_rcombo .cke_disabled .cke_text
+{
+	color: #fff;
+}
+
+/* Firefox 2 & WebKit Section */
+
+.cke_skin_kama .cke_browser_gecko .cke_rcombo .cke_text,
+.cke_skin_kama .cke_browser_gecko .cke_rcombo .cke_openbutton,
+.cke_skin_kama .cke_browser_webkit .cke_rcombo .cke_text,
+.cke_skin_kama .cke_browser_webkit .cke_rcombo .cke_openbutton
+{
+	display: block;
+	float: left;
+}
+
+.cke_skin_kama .cke_browser_gecko .cke_rcombo .cke_label,
+.cke_skin_kama .cke_browser_webkit .cke_rcombo .cke_label
+{
+	/*display: block;*/
+	float: left;
+}
+
+.cke_skin_kama .cke_browser_gecko18 .cke_rcombo
+{
+	display: -moz-box;
+}
+
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_rcombo .cke_label,
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_rcombo .cke_text,
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_rcombo .cke_openbutton,
+.cke_skin_kama .cke_rtl.cke_browser_webkit .cke_rcombo .cke_label,
+.cke_skin_kama .cke_rtl.cke_browser_webkit .cke_rcombo .cke_text,
+.cke_skin_kama .cke_rtl.cke_browser_webkit .cke_rcombo .cke_openbutton
+{
+	float: right;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/skin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/skin.js	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/skin.js	(revision 3547)
@@ -0,0 +1,125 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.skins.add( 'kama', (function()
+{
+	var preload = [];
+
+	if ( CKEDITOR.env.ie && CKEDITOR.env.version < 7 )
+	{
+		// For IE6, we need to preload some images, otherwhise they will be
+		// downloaded several times (CSS background bug).
+		preload.push( 'icons.png', 'images/sprites_ie6.png', 'images/dialog_sides.gif' );
+	}
+
+	return {
+		preload		: preload,
+		editor		: { css : [ 'editor.css' ] },
+		dialog		: { css : [ 'dialog.css' ] },
+		templates	: { css : [ 'templates.css' ] },
+		margins		: [ 0, 0, 0, 0 ],
+		init : function( editor )
+		{
+			CKEDITOR.tools.extend( editor,
+			{
+				uiColor: null,
+
+				getUiColor : function() {
+					return this.uiColor;
+				},
+
+				setUiColor : function( color )
+				{
+					var editor = this,
+						uiStyle = this.container.getDocument().getBody().append('style'),
+						cssId = '#cke_' + editor.name.replace('.', '\\.'),
+						cssSelectors =
+						[
+							cssId + " .cke_wrapper",
+							cssId + "_dialog .cke_dialog_contents",
+							cssId + "_dialog a.cke_dialog_tab",
+							cssId + "_dialog .cke_dialog_footer"
+						],
+						cssSrc = cssSelectors.join( ',' )
+							+ "{ background-color: ${color} !important; }";
+					
+					uiStyle.setAttribute("type", "text/css");
+					
+					return (this.setUiColor = function( color )
+					{
+						var css = cssSrc.replace( '${color}', color );
+						editor.uiColor = color;
+						if ( CKEDITOR.env.ie )
+							uiStyle.$.styleSheet.cssText = css;
+						else
+							uiStyle.setHtml( css );
+					})( color );
+				}
+			});
+
+			// Apply UI color if specified in config.
+			if ( editor.config.uiColor )
+			{
+				// Delay to gain access to container element.
+				CKEDITOR.tools.setTimeout( function()
+					{
+						if ( !this.container )
+							CKEDITOR.tools.setTimeout( arguments.callee, 1000, this );
+						else
+							this.setUiColor( this.config.uiColor );
+					}, 1000, editor);
+			}
+		}
+	};
+})() );
+
+if ( CKEDITOR.dialog )
+{
+	CKEDITOR.dialog.on( 'resize', function( evt )
+		{
+			var data = evt.data,
+				width = data.width,
+				height = data.height,
+				dialog = data.dialog,
+				standardsMode = !CKEDITOR.env.quirks;
+
+			if ( data.skin != 'kama' )
+				return;
+
+			dialog.parts.contents.setStyles(
+				{
+					width : width + 'px',
+					height : height + 'px'
+				});
+
+			if ( !CKEDITOR.env.ie )
+				return;
+
+			// Fix the size of the elements which have flexible lengths.
+			setTimeout( function()
+				{
+					var content = dialog.parts.contents,
+						body = content.getParent(),
+						innerDialog = body.getParent();
+
+					// tc
+					var el = innerDialog.getChild( 2 );
+					el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
+
+					// bc
+					el = innerDialog.getChild( 7 );
+					el.setStyle( 'width', ( body.$.offsetWidth - 28 ) + 'px' );
+
+					// ml
+					el = innerDialog.getChild( 4 );
+					el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
+
+					// mr
+					el = innerDialog.getChild( 5 );
+					el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
+				},
+				100 );
+		});
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/templates.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/templates.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/templates.css	(revision 3547)
@@ -0,0 +1,71 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * Styles for the "templates" plugin.
+ */
+
+.cke_skin_kama .cke_tpl_list
+{
+	border: #dcdcdc 2px solid;
+	background-color: #ffffff;
+	overflow: auto;
+	width: 100%;
+	height: 220px;
+}
+
+.cke_skin_kama .cke_tpl_item
+{
+	margin: 5px;
+	padding: 7px;
+	border: #eeeeee 1px solid;
+	*width: 88%;
+}
+
+.cke_skin_kama .cke_tpl_preview
+{
+	border-collapse: separate;
+	text-indent:0;
+	width: 100%;
+}
+.cke_skin_kama .cke_tpl_preview td
+{
+	padding: 2px;
+	vertical-align: middle;
+}
+.cke_skin_kama .cke_tpl_preview .cke_tpl_preview_img
+{
+	width: 100px;
+}
+.cke_skin_kama .cke_tpl_preview span
+{
+	white-space: normal;
+}
+
+.cke_skin_kama .cke_tpl_title
+{
+	font-weight: bold;
+}
+
+.cke_skin_kama .cke_tpl_hover
+{
+	border: #ff9933 1px solid !important;
+	background-color: #fffacd !important;
+	cursor: pointer;
+	cursor: hand;
+}
+/*
+ * Fix property 'cursor' doesn't inherit on table
+ */
+.cke_skin_kama .cke_tpl_hover *
+{
+	cursor: inherit;
+}
+
+.cke_skin_kama .cke_tpl_empty, .cke_tpl_loading
+{
+	text-align: center;
+	padding: 5px;
+}
Index: /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css	(revision 3547)
+++ /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css	(revision 3547)
@@ -0,0 +1,325 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_toolbox
+{
+	clear: both;
+	padding: 5px 3px;
+}
+
+@media print
+{
+	.cke_toolbox
+	{
+		display: none;
+	}
+}
+
+.cke_skin_kama a.cke_toolbox_collapser, 
+.cke_skin_kama a:hover.cke_toolbox_collapser
+{
+	background-image: url(images/arrowtop.gif);
+	background-repeat: no-repeat;
+	background-position: center center;
+	width: 11px;
+	height: 11px;
+	float: right;
+	border: 1px outset #D3D3D3;
+	margin: 11px 4px 2px;
+	cursor: pointer;
+}
+
+.cke_skin_kama .cke_rtl a.cke_toolbox_collapser, 
+.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser
+{
+	float: left;
+}
+
+.cke_skin_kama a.cke_toolbox_collapser_min, 
+.cke_skin_kama a:hover.cke_toolbox_collapser_min
+{
+	background-image: url(images/arrowleft.gif);
+	margin: 2px 4px;
+}
+
+.cke_skin_kama .cke_rtl a.cke_toolbox_collapser_min, 
+.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser_min
+{
+	background-image: url(images/arrowright.gif);
+}
+
+.cke_skin_kama .cke_toolbar
+{
+	display:inline-block;
+	float:left;
+	margin-bottom: 5px
+}
+
+.cke_skin_kama .cke_rtl .cke_toolbar
+{
+	float:right;
+}
+
+.cke_skin_kama .cke_separator
+{
+	display: none;
+}
+
+.cke_skin_kama .cke_break
+{
+	clear:left;
+}
+
+.cke_skin_kama .cke_rtl .cke_break
+{
+	clear:right;
+}
+
+.cke_skin_kama .cke_toolbar_start
+{
+	display: none;
+}
+
+.cke_skin_kama .cke_toolgroup 
+{
+	-moz-border-radius:5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	background-image: url(sprites.png);
+	background-repeat: repeat-x;
+	background-position: 0 -500px;
+	float:left;
+	margin: 0 3px;
+	padding: 2px;
+}
+
+.cke_skin_kama .cke_button a,
+.cke_skin_kama .cke_button a.cke_off
+{
+	filter: alpha(opacity=70); /* IE */
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+	display: inline-block;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	outline: none;
+	padding-top: 2px;
+	padding-left: 4px;
+	padding-right: 4px;
+	padding-bottom: 2px;
+	height: 18px;
+}
+
+.cke_skin_kama .cke_hc .cke_button a,
+.cke_skin_kama .cke_hc .cke_button a.cke_off
+{
+	opacity: 1.0;
+	filter: alpha(opacity=100);
+}
+
+.cke_skin_kama .cke_browser_ie6 .cke_button a
+{
+	filter: none;
+}
+
+.cke_skin_kama .cke_button a.cke_on
+{
+	background-color: #a3d7ff;
+	filter: alpha(opacity=100); /* IE */
+	opacity: 1; /* Safari, Opera and Mozilla */
+	padding: 2px 4px;
+}
+
+.cke_skin_kama .cke_hc .cke_button a.cke_on
+{
+	padding: 0 2px !important;
+	border-width: 3px;
+}
+
+.cke_skin_kama .cke_button a.cke_disabled,
+.cke_skin_kama .cke_browser_ie a:hover.cke_button .cke_disabled
+{
+	filter: alpha(opacity=30); /* IE */
+	opacity : 0.3; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_kama .cke_hc .cke_button a.cke_disabled,
+.cke_skin_kama .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled
+{
+	filter: alpha(opacity=60);
+	opacity: 0.6;
+}
+
+.cke_skin_kama .cke_button a:hover.cke_on,
+.cke_skin_kama .cke_button a:focus.cke_on,
+.cke_skin_kama .cke_button a:active.cke_on,	/* IE */
+.cke_skin_kama .cke_button a:hover.cke_off,
+.cke_skin_kama .cke_button a:focus.cke_off,
+.cke_skin_kama .cke_button a:active.cke_off	/* IE */
+{
+	filter: alpha(opacity=100); /* IE */
+	opacity: 1; /* Safari, Opera and Mozilla */
+	padding: 2px 4px;
+}
+
+.cke_skin_kama .cke_button a:hover.cke_on,
+.cke_skin_kama .cke_button a:focus.cke_on,
+.cke_skin_kama .cke_button a:active.cke_on	/* IE */
+{
+	background-color: #86caff;
+}
+
+.cke_skin_kama .cke_button a:hover.cke_off,
+.cke_skin_kama .cke_button a:focus.cke_off,
+.cke_skin_kama .cke_button a:active.cke_off	/* IE */
+{
+	background-color: #dff1ff;
+}
+
+.cke_skin_kama .cke_hc .cke_button a:hover.cke_on,
+.cke_skin_kama .cke_hc .cke_button a:focus.cke_on,
+.cke_skin_kama .cke_hc .cke_button a:active.cke_on,	/* IE */
+.cke_skin_kama .cke_hc .cke_button a:hover.cke_off,
+.cke_skin_kama .cke_hc .cke_button a:focus.cke_off,
+.cke_skin_kama .cke_hc .cke_button a:active.cke_off	/* IE */
+{
+	padding: 0 2px !important;
+	border-width: 3px;
+}
+
+.cke_skin_kama .cke_button .cke_icon
+{
+	background-image: url(icons.png);
+	background-position: 100px;
+	background-repeat:no-repeat;
+	margin-top:1px;
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+}
+
+.cke_skin_kama .cke_button .cke_label
+{
+	display: none;
+	padding-left: 3px;
+	line-height: 18px;
+	vertical-align: middle;
+}
+
+.cke_skin_kama .cke_hc .cke_button .cke_label
+{
+	display: inline-block;
+}
+
+.cke_skin_kama .cke_hc .cke_button .cke_icon
+{
+	display: none;
+}
+
+.cke_skin_kama .cke_accessibility
+{
+	position: absolute;
+	top: -1000000px;
+}
+
+.cke_skin_kama .cke_button .cke_buttonarrow
+{
+	display: inline-block;
+	height: 18px;
+	width: 8px;
+	background-position: right center;
+	background-image: url(images/arrowdown.gif);
+	background-repeat: no-repeat;
+}
+
+.cke_skin_kama .cke_rtl .cke_button .cke_buttonarrow
+{
+	background-position: left center;
+}
+
+
+/* IE Section */
+
+/* Repeat it here for all variations of ".cke_button a" because of IE6 */
+.cke_skin_kama .cke_browser_ie .cke_button a,
+.cke_skin_kama .cke_browser_ie .cke_button a.cke_off,
+.cke_skin_kama .cke_browser_ie .cke_button a.cke_on,
+.cke_skin_kama .cke_browser_ie .cke_button a.cke_disabled,
+.cke_skin_kama .cke_browser_ie .cke_button a:hover.cke_on,
+.cke_skin_kama .cke_browser_ie .cke_button a:focus.cke_on,
+.cke_skin_kama .cke_browser_ie .cke_button a:active.cke_on,
+.cke_skin_kama .cke_browser_ie .cke_button a:hover.cke_off,
+.cke_skin_kama .cke_browser_ie .cke_button a:focus.cke_off,
+.cke_skin_kama .cke_browser_ie .cke_button a:active.cke_off
+{
+	padding-top: 2px;
+	padding-left: 4px;
+	padding-right: 4px;
+	padding-bottom: 2px;
+	height: 18px;
+}
+
+.cke_skin_kama .cke_browser_ie .cke_separator
+{
+	vertical-align: 35%;
+}
+
+
+/* IE+Quirks Section */
+
+.cke_skin_kama .cke_browser_iequirks .cke_button a,
+.cke_skin_kama .cke_browser_iequirks .cke_button a.cke_off,
+.cke_skin_kama .cke_browser_iequirks .cke_button a.cke_on,
+.cke_skin_kama .cke_browser_iequirks .cke_button a.cke_disabled,
+.cke_skin_kama .cke_browser_iequirks .cke_button a:hover.cke_on,
+.cke_skin_kama .cke_browser_iequirks .cke_button a:focus.cke_on,
+.cke_skin_kama .cke_browser_iequirks .cke_button a:active.cke_on,
+.cke_skin_kama .cke_browser_iequirks .cke_button a:hover.cke_off,
+.cke_skin_kama .cke_browser_iequirks .cke_button a:focus.cke_off,
+.cke_skin_kama .cke_browser_iequirks .cke_button a:active.cke_off
+{
+	padding-bottom: 3px;
+}
+
+/* Firefox 2 Section */
+
+.cke_skin_kama .cke_browser_gecko .cke_toolbar,
+.cke_skin_kama .cke_browser_gecko .cke_button a,
+.cke_skin_kama .cke_browser_gecko .cke_button a.cke_off,
+.cke_skin_kama .cke_browser_gecko .cke_button .cke_icon,
+.cke_skin_kama .cke_browser_gecko .cke_button .cke_buttonarrow,
+.cke_skin_kama .cke_browser_gecko .cke_separator,
+.cke_skin_kama .cke_browser_gecko .cke_toolbar_start
+{
+	display: block;
+	float: left;
+}
+
+.cke_skin_kama .cke_browser_gecko.cke_hc .cke_button .cke_icon
+{
+	display: none;
+}
+
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_toolbar,
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_button a,
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_button a.cke_off,
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_button .cke_icon,
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_button .cke_buttonarrow,
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_toolbar_start
+{
+	float: right;
+}
+
+.cke_skin_kama .cke_browser_gecko .cke_button .cke_label,
+.cke_skin_kama .cke_browser_gecko .cke_break
+{
+	float: left;
+}
+
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_button .cke_label,
+.cke_skin_kama .cke_rtl.cke_browser_gecko .cke_break
+{
+	float: right;
+}
Index: /CKEditor/branches/features/kama/_source/themes/default/theme.js
===================================================================
--- /CKEditor/branches/features/kama/_source/themes/default/theme.js	(revision 3546)
+++ /CKEditor/branches/features/kama/_source/themes/default/theme.js	(revision 3547)
@@ -96,5 +96,5 @@
 
 			var element = CKEDITOR.dom.element.createFromHtml( [
-					'<div class="cke_skin_', editor.skinName,
+					'<div id="cke_' + editor.name.replace('.', '\\.') + '_dialog" class="cke_skin_', editor.skinName,
 						'" dir="', editor.lang.dir, '"' +
 						' lang="', editor.langCode, '"' +