Index: /CKEditor/branches/features/v4-ui/_source/skins/kama/mainui.css
===================================================================
--- /CKEditor/branches/features/v4-ui/_source/skins/kama/mainui.css	(revision 7105)
+++ /CKEditor/branches/features/v4-ui/_source/skins/kama/mainui.css	(revision 7106)
@@ -3,199 +3,86 @@
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
-
-.cke_skin_kama .cke_container
-{
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-	border: 1px solid #D3D3D3;
-	padding: 3px;
-	border-collapse: separate;
-}
-
-.cke_skin_kama .cke_browser_ie6 .cke_wrapper,
-.cke_skin_kama .cke_browser_iequirks .cke_wrapper
-{
-	background-image: none;
-}
-
-.cke_skin_kama .cke_editor
-{
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-	background-color: #d3d3d3;
-	background-image: url(images/sprites.png);
-	background-repeat: repeat-x;
-	background-position: 0 -1950px;
-	width: 100%;
-	height: 100%;
-}
-
-.cke_skin_kama .cke_top
-{
-	padding:5px 5px 0px;
-}
-.cke_skin_kama .cke_contents
-{
-	padding:0px 5px;
-}
-
-.cke_shared .cke_skin_kama .cke_contents
-{
-	padding: 5px;
-}
-
-.cke_skin_kama .cke_bottom
-{
-	padding:0px 5px 5px;
-}
-
-.cke_skin_kama .ltr .cke_browser_ie iframe
-{
-	margin-right: -10px;
-}
-
-.cke_skin_kama .rtl .cke_browser_ie iframe
-{
-	margin-left: -10px;
-}
-
-.cke_skin_kama .cke_browser_opera .cke_editor.cke_skin_kama .cke_resizer
-{
-	display: table;
-}
-
-/* Content space takes up the maximum amount of  spaces available.*/
-.cke_skin_kama .cke_browser_gecko .cke_contents,
-.cke_skin_kama .cke_browser_webkit .cke_contents
-{
-	height: 100%;
-}
-
-.cke_skin_kama .cke_hc .cke_contents
-{
-	border: 1px solid black;
-}
-
-.cke_skin_kama .cke_contents iframe
-{
-	width:100%;
-	height:100%;
-	background-color: #fff;
-}
-
-.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: 9px;
-	display: block;
-	float: right;
-	/* resizer.gif*/
-	background-image: url(images/sprites.png);
-	_background-image: url(images/sprites_ie6.png);
-	background-position: 0 -1428px;
-	background-repeat: no-repeat;
-	cursor: se-resize;
-}
-
-/* Adobe AIR doesn't support *-resize cursor shape. */
-.cke_skin_kama .cke_browser_air .cke_resizer,
-.cke_skin_kama .cke_browser_air .cke_rtl .cke_resizer
-{
-	cursor: move;
-}
-
-.cke_skin_kama .cke_resizer_rtl
-{
-	cursor: sw-resize;
-	/* resizer_rtl.gif*/
-	background-position: 0 -1455px;
-	float: left;
-}
-
-.cke_skin_kama .cke_resizer_horizontal,
-.cke_skin_kama .cke_rtl .cke_resizer_horizontal
-{
-	cursor: e-resize;
-}
-
-.cke_skin_kama .cke_resizer_vertical,
-.cke_skin_kama .cke_rtl .cke_resizer_vertical
-{
-	cursor: n-resize;
-}
-
-.cke_skin_kama .cke_maximized .cke_resizer
-{
-	display: none;
-}
-
-.cke_skin_kama .cke_browser_ie6 .cke_contents textarea,
-.cke_skin_kama .cke_browser_ie7 .cke_contents textarea
-{
-	position: absolute;
-}
-
-.cke_skin_kama .cke_browser_ie.cke_browser_quirks .cke_contents iframe
-{
-	position: absolute;
-	top: 0;
-}
-
-.cke_skin_kama .cke_browser_ie6 .cke_editor,
-.cke_skin_kama .cke_browser_ie7 .cke_editor
-{
-	display: inline-block;
-}
-
-.cke_skin_kama .cke_browser_ie6 .cke_editor,
-.cke_shared .cke_skin_kama .cke_browser_ie7 .cke_wrapper
-{
-	padding-bottom: 5px;
-}
-
-/* All voice labels are not displayed. */
-.cke_skin_kama .cke_voice_label
-{
-	display: none;
-}
-
-.cke_skin_kama legend.cke_voice_label
-{
-	display: none;
-}
-
-.cke_skin_kama .cke_browser_ie legend.cke_voice_label
-{
-	position: absolute;
-	display: block;
-	width: 0;
-	height: 0;
-	overflow: hidden;
-}
-
-.cke_clear_float
-{
-	clear:both;
-}
+.cke_skin_kama .cke_container {
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  border: 1px solid #D3D3D3;
+  padding: 3px;
+  border-collapse: separate; }
+.cke_skin_kama .cke_editor {
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  background-color: #d3d3d3;
+  background-image: url(images/sprites.png);
+  background-repeat: repeat-x;
+  background-position: 0 -1950px;
+  width: 100%;
+  height: 100%; }
+  .cke_browser_ie6 .cke_skin_kama .cke_editor, .cke_browser_ie7 .cke_skin_kama .cke_editor {
+    display: inline-block; }
+.cke_skin_kama .cke_top {
+  padding: 5px 5px 0px; }
+.cke_skin_kama .cke_contents {
+  padding: 0px 5px; }
+  .cke_shared .cke_skin_kama .cke_contents {
+    padding: 5px; }
+.cke_skin_kama .cke_bottom {
+  padding: 0px 5px 5px; }
+.cke_browser_gecko .cke_skin_kama .cke_contents, .cke_browser_webkit .cke_skin_kama .cke_contents {
+  height: 100%; }
+.cke_hc .cke_skin_kama .cke_contents {
+  border: 1px solid black; }
+.cke_skin_kama .cke_contents iframe {
+  width: 100%;
+  height: 100%;
+  background-color: #fff; }
+  .cke_browser_ie.cke_browser_quirks .cke_skin_kama .cke_contents iframe {
+    position: absolute;
+    top: 0; }
+.cke_skin_kama .cke_contents textarea {
+  font-family: 'Courier New' , Monospace;
+  font-size: small;
+  background-color: #fff;
+  white-space: pre; }
+  .cke_browser_iequirks .cke_skin_kama .cke_contents textarea {
+    _white-space: normal; }
+  .cke_browser_ie6 .cke_skin_kama .cke_contents textarea, .cke_browser_ie7 .cke_skin_kama .cke_contents textarea {
+    position: absolute; }
+.cke_skin_kama .cke_focus {
+  outline: auto 5px -webkit-focus-ring-color; }
+.cke_skin_kama .cke_resizer {
+  width: 12px;
+  height: 12px;
+  margin-top: 9px;
+  display: block;
+  float: right;
+  background-image: url(images/sprites.png);
+  _background-image: url(images/sprites_ie6.png);
+  background-position: 0 -1428px;
+  background-repeat: no-repeat;
+  cursor: se-resize; }
+  .cke_browser_air .cke_skin_kama .cke_resizer {
+    cursor: move; }
+  .cke_browser_opera .cke_skin_kama .cke_resizer {
+    display: table; }
+  .cke_maximized .cke_skin_kama .cke_resizer {
+    display: none; }
+.cke_skin_kama .cke_resizer_rtl {
+  cursor: sw-resize;
+  background-position: 0 -1455px;
+  float: left; }
+.cke_skin_kama .cke_resizer_horizontal {
+  cursor: e-resize; }
+.cke_skin_kama .cke_resizer_vertical {
+  cursor: n-resize; }
+.cke_skin_kama .cke_voice_label {
+  display: none; }
+.cke_browser_ie .cke_skin_kama legend.cke_voice_label {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  overflow: hidden; }
+.cke_skin_kama .cke_clear_float {
+  clear: both; }
Index: /CKEditor/branches/features/v4-ui/_source/skins/kama/scss/mainui.scss
===================================================================
--- /CKEditor/branches/features/v4-ui/_source/skins/kama/scss/mainui.scss	(revision 7106)
+++ /CKEditor/branches/features/v4-ui/_source/skins/kama/scss/mainui.scss	(revision 7106)
@@ -0,0 +1,174 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+.cke_skin_kama
+{
+ 	.cke_container
+	{
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+		border-radius: 5px;
+		border: 1px solid #D3D3D3;
+		padding: 3px;
+		border-collapse: separate;
+	}
+
+	 .cke_editor
+	{
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+		border-radius: 5px;
+		background-color: #d3d3d3;
+		background-image: url(images/sprites.png);
+		background-repeat: repeat-x;
+		background-position: 0 -1950px;
+		width: 100%;
+		height: 100%;
+
+		 .cke_browser_ie6 &,
+		 .cke_browser_ie7 &
+		{
+			display: inline-block;
+		}
+	}
+
+	 .cke_top
+	{
+		padding:5px 5px 0px;
+	}
+
+	 .cke_contents
+	{
+		padding:0px 5px;
+		.cke_shared &
+		{
+			padding: 5px;
+		}
+	}
+
+	 .cke_bottom
+	{
+		padding:0px 5px 5px;
+	}
+
+	// Content space takes up the maximum amount of  spaces available.
+	 .cke_contents
+	{
+		.cke_browser_gecko &,
+	 	.cke_browser_webkit &
+		 {
+			height: 100%;
+		 }
+
+		.cke_hc &
+		{
+			border: 1px solid black;
+		}
+
+		iframe
+		{
+			width:100%;
+			height:100%;
+			background-color: #fff;
+
+			.cke_browser_ie.cke_browser_quirks &,
+			{
+				position: absolute;
+				top: 0;
+			}
+		}
+
+		 textarea
+		{
+			font-family: 'Courier New' , Monospace;
+			font-size: small;
+			background-color: #fff;
+			white-space: pre;
+			.cke_browser_iequirks &
+			{
+				// For IE6+Quirks only
+				_white-space: normal;
+			}
+
+			.cke_browser_ie6 &,
+			.cke_browser_ie7 &
+			{
+				position: absolute;
+			}
+		}
+	}
+
+	 .cke_focus
+	{
+		outline: auto 5px -webkit-focus-ring-color;
+	}
+
+	 .cke_resizer
+	{
+		width: 12px;
+		height: 12px;
+		margin-top: 9px;
+		display: block;
+		float: right;
+		// resizer.gif
+		background-image: url(images/sprites.png);
+		_background-image: url(images/sprites_ie6.png);
+		background-position: 0 -1428px;
+		background-repeat: no-repeat;
+		cursor: se-resize;
+		.cke_browser_air &
+		{
+			cursor: move;
+		}
+ 		 .cke_browser_opera &
+   		{
+   			display: table;
+   		}
+		.cke_maximized &
+		{
+			display: none;
+		}
+	}
+
+	.cke_resizer_rtl
+	{
+		cursor: sw-resize;
+		background-position: 0 -1455px;
+		float: left;
+	}
+
+	 .cke_resizer_horizontal
+	{
+		cursor: e-resize;
+	}
+
+	 .cke_resizer_vertical,
+	{
+		cursor: n-resize;
+	}
+
+	// All voice labels are not displayed.
+	 .cke_voice_label
+	{
+		display: none;
+	}
+
+	legend.cke_voice_label
+	{
+		.cke_browser_ie &
+		{
+			position: absolute;
+			display: block;
+			width: 0;
+			height: 0;
+			overflow: hidden;
+		}
+	}
+
+	.cke_clear_float
+	{
+		clear:both;
+	}
+}
+
Index: /CKEditor/branches/features/v4-ui/_source/themes/default/theme.js
===================================================================
--- /CKEditor/branches/features/v4-ui/_source/themes/default/theme.js	(revision 7105)
+++ /CKEditor/branches/features/v4-ui/_source/themes/default/theme.js	(revision 7106)
@@ -18,6 +18,6 @@
 	function envHtml( editor, html )
 	{
-		var envs = [ 'cke_'+editor.lang.dir, CKEDITOR.env.cssClass, editor.skinClass ];
-		editor.config.sharedSpaces && envs.push( 'cke_shared' );
+		var envs = [ editor.skinClass, 'cke_'+editor.lang.dir, CKEDITOR.env.cssClass ];
+		editor.config.sharedSpaces && envs.splice( 1, 0, 'cke_shared' );
 		for ( var i = 0; i < envs.length; i++ )
 			html = '<span class="' + envs[ i ] + '">' + html + '</span>';