Index: /CKEditor/trunk/_source/plugins/basicstyles/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/basicstyles/plugin.js	(revision 3006)
+++ /CKEditor/trunk/_source/plugins/basicstyles/plugin.js	(revision 3007)
@@ -32,24 +32,21 @@
 		};
 
-		var coreStyles = editor.config.coreStyles;
+		var config = editor.config;
 		var lang = editor.lang;
 
-		addButtonCommand( 'Bold'		, lang.bold			, 'bold'		, coreStyles.bold );
-		addButtonCommand( 'Italic'		, lang.italic		, 'italic'		, coreStyles.italic );
-		addButtonCommand( 'Underline'	, lang.underline	, 'underline'	, coreStyles.underline );
-		addButtonCommand( 'Strike'		, lang.strike		, 'strike'		, coreStyles.strike );
-		addButtonCommand( 'Subscript'	, lang.subscript	, 'subscript'	, coreStyles.subscript );
-		addButtonCommand( 'Superscript'	, lang.superscript	, 'superscript'	, coreStyles.superscript );
+		addButtonCommand( 'Bold'		, lang.bold			, 'bold'		, config.coreStyles_bold );
+		addButtonCommand( 'Italic'		, lang.italic		, 'italic'		, config.coreStyles_italic );
+		addButtonCommand( 'Underline'	, lang.underline	, 'underline'	, config.coreStyles_underline );
+		addButtonCommand( 'Strike'		, lang.strike		, 'strike'		, config.coreStyles_strike );
+		addButtonCommand( 'Subscript'	, lang.subscript	, 'subscript'	, config.coreStyles_subscript );
+		addButtonCommand( 'Superscript'	, lang.superscript	, 'superscript'	, config.coreStyles_superscript );
 	}
 });
 
-CKEDITOR.config.coreStyles =
-{
-	// Basic Inline Styles.
-	bold			: { element : 'strong', overrides : 'b' },
-	italic			: { element : 'em', overrides : 'i' },
-	underline		: { element : 'u' },
-	strike			: { element : 'strike' },
-	subscript		: { element : 'sub' },
-	superscript		: { element : 'sup' }
-};
+// Basic Inline Styles.
+CKEDITOR.config.coreStyles_bold			= { element : 'strong', overrides : 'b' };
+CKEDITOR.config.coreStyles_italic		= { element : 'em', overrides : 'i' };
+CKEDITOR.config.coreStyles_underline	= { element : 'u' };
+CKEDITOR.config.coreStyles_strike		= { element : 'strike' };
+CKEDITOR.config.coreStyles_subscript	= { element : 'sub' };
+CKEDITOR.config.coreStyles_superscript	= { element : 'sup' };
Index: /CKEditor/trunk/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialog/plugin.js	(revision 3006)
+++ /CKEditor/trunk/_source/plugins/dialog/plugin.js	(revision 3007)
@@ -1251,5 +1251,5 @@
 			abstractDialogCoords = null,
 			element = dialog.getElement().getFirst(),
-			magnetDistance = dialog._.editor.config.dialog.magnetDistance,
+			magnetDistance = dialog._.editor.config.dialog_magnetDistance,
 			mouseMoveHandler = function( evt )
 			{
@@ -1459,5 +1459,5 @@
 				'; z-index: ', editor.config.baseFloatZIndex,
 				'; top: 0px; left: 0px; ',
-				'background-color: ', editor.config.dialog.backgroundCoverColor,
+				'background-color: ', editor.config.dialog_backgroundCoverColor,
 				'" id="cke_dialog_background_cover">'
 			];
@@ -1520,5 +1520,5 @@
 			scrollFunc();
 		}
-		element.setOpacity( editor.config.dialog.backgroundCoverOpacity );
+		element.setOpacity( editor.config.dialog_backgroundCoverOpacity );
 		element.appendTo( CKEDITOR.document.getBody() );
 	};
@@ -2402,31 +2402,32 @@
 
 // Dialog related configurations.
-CKEDITOR.config.dialog =
-{
-	/**
-	 * The color of the dialog background cover. It should be a valid CSS color string.
-	 * @type String
-	 * @default white
-	 * @example
-	 * backgroundCoverColor = 'rgb(255, 254, 253)';
-	 */
-	backgroundCoverColor : 'white',
-
-	/**
-	 * The opacity of the dialog background cover. It should be a number within the range [0.0, 1.0].
-	 * @type Number
-	 * @default 0.5
-	 * @example
-	 * backgroundCoverOpacity = 0.7;
-	 */
-	backgroundCoverOpacity : 0.5,
-
-	/**
-	 * The distance of magnetic borders used in moving and resizing dialogs, measured in pixels.
-	 * @type Number
-	 * @default 20
-	 * @example
-	 * magnetic = 30;
-	 */
-	magnetDistance : 20
-};
+
+/**
+ * The color of the dialog background cover. It should be a valid CSS color
+ * string.
+ * @type String
+ * @default white
+ * @example
+ * config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)';
+ */
+CKEDITOR.config.dialog_backgroundCoverColor = 'white';
+
+/**
+ * The opacity of the dialog background cover. It should be a number within the
+ * range [0.0, 1.0].
+ * @type Number
+ * @default 0.5
+ * @example
+ * config.dialog_backgroundCoverOpacity = 0.7;
+ */
+CKEDITOR.config.dialog_backgroundCoverOpacity = 0.5;
+
+/**
+ * The distance of magnetic borders used in moving and resizing dialogs,
+ * measured in pixels.
+ * @type Number
+ * @default 20
+ * @example
+ * config.dialog_magnetDistance = 30;
+ */
+CKEDITOR.config.dialog_magnetDistance = 20;
Index: /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js
===================================================================
--- /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js	(revision 3006)
+++ /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js	(revision 3007)
@@ -6,7 +6,7 @@
 CKEDITOR.dialog.add( 'smiley', function( editor )
 {
-	var config = editor.config.smiley,
-		images = config.images,
-		columns = config.columns,
+	var config = editor.config,
+		images = config.smiley_images,
+		columns = config.smiley_columns,
 		i;
 
@@ -21,6 +21,6 @@
 		html.push( 
 			'<td class="dark_background hand centered" style="vertical-align: middle;">' +
-				'<img border="0" class="hand" title="', config.descriptions[i], '"' +
-					' src="', CKEDITOR.tools.htmlEncode( config.path + images[ i ] ), '"',
+				'<img border="0" class="hand" title="', config.smiley_descriptions[i], '"' +
+					' src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '"',
 					// IE BUG: Below is a workaround to an IE image loading bug to ensure the image sizes are correct.
 					( CKEDITOR.env.ie ? ' onload="this.setAttribute(\'width\', 2); this.removeAttribute(\'width\');" ' : '' ),
Index: /CKEditor/trunk/_source/plugins/smiley/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/smiley/plugin.js	(revision 3006)
+++ /CKEditor/trunk/_source/plugins/smiley/plugin.js	(revision 3007)
@@ -20,15 +20,12 @@
 } );
 
-CKEDITOR.config.smiley =
-{
-	path : CKEDITOR.basePath +  '_source/plugins/smiley/images/',
+CKEDITOR.config.smiley_path = CKEDITOR.basePath +  '_source/plugins/smiley/images/';
 
-	images : [ 'regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif',
+CKEDITOR.config.smiley_images = [ 'regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif',
 	'embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif',
 	'devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif',
-	'broken_heart.gif','kiss.gif','envelope.gif'],
+	'broken_heart.gif','kiss.gif','envelope.gif'];
 
-	descriptions : [ ':)', ':(', ';)', ':D', ':/', ':P', '', '', '', '', '', '', '', ';(', '', '', '', '', ':kiss', '', ],
+CKEDITOR.config.smiley_descriptions = [ ':)', ':(', ';)', ':D', ':/', ':P', '', '', '', '', '', '', '', ';(', '', '', '', '', ':kiss', '' ];
 
-	columns : 8
-};
+CKEDITOR.config.smiley_columns = 8;