Index: /CKEditor/branches/features/kama/_samples/skins.html
===================================================================
--- /CKEditor/branches/features/kama/_samples/skins.html	(revision 3543)
+++ /CKEditor/branches/features/kama/_samples/skins.html	(revision 3544)
@@ -13,9 +13,22 @@
 		<form action="sample_posteddata.php" method="post">
 			<p>
-				<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+				<textarea id="editor_kama" name="editor_kama" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
 				<script type="text/javascript">
 				//<![CDATA[
 
-					CKEDITOR.replace( 'editor1',
+					CKEDITOR.replace( 'editor_kama',
+						{
+							skin : 'kama'
+						});
+
+				//]]>
+				</script>
+			</p>
+			<p>
+				<textarea id="editor_office2003" name="editor_office2003" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+				<script type="text/javascript">
+				//<![CDATA[
+
+					CKEDITOR.replace( 'editor_office2003',
 						{
 							skin : 'office2003'
@@ -26,9 +39,9 @@
 			</p>
 			<p>
-				<textarea id="editor2" name="editor2" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+				<textarea id="editor_v2" name="editor_v2" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
 				<script type="text/javascript">
 				//<![CDATA[
 
-					CKEDITOR.replace( 'editor2',
+					CKEDITOR.replace( 'editor_v2',
 						{
 							skin : 'v2'
Index: /CKEditor/branches/features/kama/_source/core/config.js
===================================================================
--- /CKEditor/branches/features/kama/_source/core/config.js	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/core/config.js	(revision 3544)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -202,5 +202,5 @@
 	 * config.skin = 'myskin,/customstuff/myskin/';
 	 */
-	skin : 'v2',
+	skin : 'kama',
 
 	/**
Index: /CKEditor/branches/features/kama/_source/core/skins.js
===================================================================
--- /CKEditor/branches/features/kama/_source/core/skins.js	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/core/skins.js	(revision 3544)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -21,5 +21,5 @@
 	var paths = {};
 
-	var loadedPart = function( skinName, part, callback )
+	var loadedPart = function( skinName, part, editor, callback )
 	{
 		// Get the skin definition.
@@ -119,4 +119,7 @@
 			checkIsLoaded();
 		}
+
+		if ( skinDefinition.init )
+			skinDefinition.init( editor );
 	};
 
@@ -157,5 +160,5 @@
 
 			if ( loaded[ skinName ] )
-				loadedPart( skinName, skinPart, callback );
+				loadedPart( skinName, skinPart, editor, callback );
 			else
 			{
@@ -163,5 +166,5 @@
 				CKEDITOR.scriptLoader.load( skinPath + 'skin.js', function()
 						{
-							loadedPart( skinName, skinPart, callback );
+							loadedPart( skinName, skinPart, editor, callback );
 						});
 			}
Index: /CKEditor/branches/features/kama/_source/lang/en.js
===================================================================
--- /CKEditor/branches/features/kama/_source/lang/en.js	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/lang/en.js	(revision 3544)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -658,4 +658,12 @@
 	},
 
-	resize : 'Drag to resize'
+	resize : 'Drag to resize',
+
+	uicolor :
+	{
+		title : 'UI Color Picker',
+		preview : 'Live preview',
+		config : 'Paste this string into your config.js file',
+		predefined : 'Predefined color sets'
+	}
 };
Index: /CKEditor/branches/features/kama/_source/plugins/richcombo/plugin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/richcombo/plugin.js	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/plugins/richcombo/plugin.js	(revision 3544)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -112,5 +112,5 @@
 						_.list.unmarkAll();
 
-					_.panel.showBlock( this.id, new CKEDITOR.dom.element( $element ).getChild( [0, 1] ), 4 );
+					_.panel.showBlock( this.id, new CKEDITOR.dom.element( $element ), 4 );
 				},
 				this );
@@ -189,5 +189,8 @@
 						'<span>' +
 							'<span class="cke_accessibility">' + ( this.voiceLabel ? this.voiceLabel + ' ' : '' ) + '</span>' +
-							'<span id="' + id + '_text" class="cke_text">&nbsp;</span></span>' +
+							'<span id="' + id + '_text" class="cke_text">' +
+					      '<span class="cke_inline_label">' + this.label + '</span>' +
+							'</span>' +
+						'</span>' +
 						'<span class=cke_openbutton></span>' +
 					'</a>' +
@@ -275,4 +278,7 @@
 			this._.value = value;
 
+			if ( !value )
+				text = '<span class="cke_inline_label">' + this.label + '</span>';
+
 			var textElement = this.document.getById( 'cke_' + this.id + '_text' );
 			textElement.setHtml( typeof text != 'undefined' ? text : value );
Index: /CKEditor/branches/features/kama/_source/plugins/table/dialogs/table.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/table/dialogs/table.js	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/plugins/table/dialogs/table.js	(revision 3544)
@@ -24,5 +24,5 @@
 			title : editor.lang.table.title,
 			minWidth : 250,
-			minHeight : CKEDITOR.env.ie ? 280 : 265,
+			minHeight : CKEDITOR.env.ie ? 280 : 275,
 			onShow : function()
 			{
Index: /CKEditor/branches/features/kama/_source/plugins/toolbar/plugin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/toolbar/plugin.js	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/plugins/toolbar/plugin.js	(revision 3544)
@@ -114,5 +114,6 @@
 
 						var output = [ '<div class="cke_toolbox"' ],
-							expanded =  editor.config.toolbarStartupExpanded;
+							expanded =  editor.config.toolbarStartupExpanded,
+							groupStarted;
 
 						output.push( expanded ? '>' : ' style="display:none">' );
@@ -131,4 +132,10 @@
 								toolbarObj = { id : toolbarId, items : [] };
 
+							if ( groupStarted )
+							{
+								output.push( '</div>' );
+								groupStarted = 0;
+							}
+
 							if ( row === '/' )
 							{
@@ -163,4 +170,18 @@
 								if ( item )
 								{
+									if ( item.canGroup )
+									{
+										if ( !groupStarted )
+										{
+											output.push( '<div class="cke_toolgroup">' );
+											groupStarted = 1;										
+										}
+									}
+									else if ( groupStarted )
+									{
+										output.push( '</div>' );
+										groupStarted = 0;										
+									}
+
 									var itemObj = item.render( editor, output );
 									index = toolbarObj.items.push( itemObj ) - 1;
@@ -185,4 +206,10 @@
 									};
 								}
+							}
+
+							if ( groupStarted )
+							{
+								output.push( '</div>' );
+								groupStarted = 0;
 							}
 
@@ -302,5 +329,5 @@
 	['Styles','Format','Font','FontSize'],
 	['TextColor','BGColor'],
-	['Maximize', 'ShowBlocks','-','About']
+	['Maximize', 'ShowBlocks','-','About', 'UIColor']
 ];
 
Index: /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css	(revision 3544)
@@ -8,4 +8,5 @@
 	margin-top: 2px;
 	vertical-align: top;
+	float: left;
 }
 
@@ -16,4 +17,6 @@
 	-webkit-border-top-left-radius: 0;
 	border-top-left-radius: 0;
+	margin-left: 1px;
+	_margin-left: 0;
 }
 
@@ -22,4 +25,5 @@
 	filter: alpha(opacity=70); /* IE */
 	opacity: 0.70; /* Safari, Opera and Mozilla */
+	float: left;
 }
 
@@ -32,4 +36,5 @@
 .cke_skin_office2003 .cke_rcombo .cke_label
 {
+	float: left;
 	display: inline-block;
 	line-height: 24px;
@@ -43,4 +48,15 @@
 	_background-position: 0 -962px;
 	_background-repeat: repeat-x;
+}
+
+/* TODO IE8 ? */
+.cke_skin_office2003 .cke_browser_ie6 .cke_rcombo a *
+{
+	float: left;
+}
+
+.cke_skin_office2003 .cke_rcombo .cke_inline_label
+{
+	display: none;
 }
 
Index: /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css	(revision 3544)
@@ -63,4 +63,5 @@
 .cke_skin_office2003 .cke_separator
 {
+	float: left;
 	display:inline-block;
 	border-left: solid 1px #B2CBFF;
@@ -82,4 +83,5 @@
 .cke_skin_office2003 .cke_toolbar_start
 {
+	float: left;
 	display: inline-block;
 	background-image: url(images/sprites.png);
@@ -98,4 +100,5 @@
 .cke_skin_office2003 .cke_toolbar_end
 {
+	float: left;
 	display: inline-block;
 	background-image: url(images/sprites.png);
@@ -272,4 +275,8 @@
 }
 
+.cke_skin_office2003 .cke_toolgroup
+{
+	float: left;
+}
 
 /* IE Section */
Index: /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css	(revision 3544)
@@ -6,4 +6,5 @@
 	margin-left: 2px;
 	margin-right: 2px;
+	float: left;
 }
 
@@ -14,4 +15,6 @@
 	-webkit-border-top-left-radius: 0;
 	border-top-left-radius: 0;
+	margin-left: 1px;
+	_margin-left: 0;
 }
 
@@ -20,4 +23,5 @@
 	filter: alpha(opacity=70); /* IE */
 	opacity: 0.70; /* Safari, Opera and Mozilla */
+	float: left;
 }
 
@@ -30,4 +34,5 @@
 .cke_skin_v2 .cke_rcombo .cke_label
 {
+	float: left;
 	display: inline-block;
 	line-height: 24px;
@@ -38,4 +43,15 @@
 	opacity: 0.70; /* Safari, Opera and Mozilla */
 	background-color: #f1f1e3;	/* Because of IE6+ClearType */
+}
+
+/* TODO IE8 ? */
+.cke_skin_v2 .cke_browser_ie6 .cke_rcombo a *
+{
+	float: left;
+}
+
+.cke_skin_v2 .cke_rcombo .cke_inline_label
+{
+	display: none;
 }
 
Index: /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css	(revision 3544)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -65,4 +65,5 @@
 .cke_skin_v2 .cke_separator
 {
+	float: left;
 	display:inline-block;
 	border-left: solid 1px #999;
@@ -84,4 +85,5 @@
 .cke_skin_v2 .cke_toolbar_start
 {
+	float: left;
 	display: inline-block;
     background-image: url(images/toolbar_start.gif);
@@ -90,4 +92,9 @@
     width: 3px;
     height: 16px;
+}
+
+.cke_skin_v2 .cke_toolbar_end
+{
+	float: left;
 }
 
@@ -223,4 +230,8 @@
 }
 
+.cke_skin_v2 .cke_toolgroup
+{
+	float: left;
+}
 
 /* IE Section */
Index: /CKEditor/branches/features/kama/_source/themes/default/theme.js
===================================================================
--- /CKEditor/branches/features/kama/_source/themes/default/theme.js	(revision 3543)
+++ /CKEditor/branches/features/kama/_source/themes/default/theme.js	(revision 3544)
@@ -56,17 +56,19 @@
 					' lang="', editor.langCode, '"' +
 					' tabindex="' + tabIndex + '">' +
-				'<span class="' , CKEDITOR.env.cssClass, ' cke_', editor.lang.dir, '">' +
-					'<table class="cke_editor" border="0" cellspacing="0" cellpadding="0" style="width:', width, '"><tbody>' +
-						'<tr', topHtml		? '' : ' style="display:none"', '><td id="cke_top_'		, name, '" class="cke_top">'	, topHtml		, '</td></tr>' +
-						'<tr', contentsHtml	? '' : ' style="display:none"', '><td id="cke_contents_', name, '" class="cke_contents" style="height:', height, '">', contentsHtml, '</td></tr>' +
-						'<tr', bottomHtml	? '' : ' style="display:none"', '><td id="cke_bottom_'	, name, '" class="cke_bottom">'	, bottomHtml	, '</td></tr>' +
-					'</tbody></table>' +
-					//Hide the container when loading skins, later restored by skin css.
-					'<style>.', editor.skinClass, '{visibility:hidden;}</style>' +
-				'</span>' +
+					'<span class="' , CKEDITOR.env.cssClass, '">' +
+						'<span class="cke_wrapper cke_', editor.lang.dir, '">' +
+							'<table class="cke_editor" border="0" cellspacing="0" cellpadding="0" style="width:', width, '"><tbody>' +
+								'<tr', topHtml		? '' : ' style="display:none"', '><td id="cke_top_'		, name, '" class="cke_top">'	, topHtml		, '</td></tr>' +
+								'<tr', contentsHtml	? '' : ' style="display:none"', '><td id="cke_contents_', name, '" class="cke_contents" style="height:', height, '">', contentsHtml, '</td></tr>' +
+								'<tr', bottomHtml	? '' : ' style="display:none"', '><td id="cke_bottom_'	, name, '" class="cke_bottom">'	, bottomHtml	, '</td></tr>' +
+							'</tbody></table>' +
+							//Hide the container when loading skins, later restored by skin css.
+							'<style>.', editor.skinClass, '{visibility:hidden;}</style>' +
+						'</span>' +
+					'</span>' +
 				'</span>' ].join( '' ) );
 
-			container.getChild( [0, 0, 0, 0] ).unselectable();
-			container.getChild( [0, 0, 0, 2] ).unselectable();
+			container.getChild( [0, 0, 0, 0, 0] ).unselectable();
+			container.getChild( [0, 0, 0, 0, 2] ).unselectable();
 
 			if ( elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )
Index: /CKEditor/branches/features/kama/config.js
===================================================================
--- /CKEditor/branches/features/kama/config.js	(revision 3543)
+++ /CKEditor/branches/features/kama/config.js	(revision 3544)
@@ -9,3 +9,6 @@
 	// config.language = 'fr';
 	// config.skin = 'office2003';
+	config.uiColor = '#9AB8F3';
+	config.language = 'en';
+	config.addPlugins = 'uicolor';
 };