Index: /FCKeditor/trunk/editor/_source/commandclasses/fckjustifycommands.js
===================================================================
--- /FCKeditor/trunk/editor/_source/commandclasses/fckjustifycommands.js	(revision 930)
+++ /FCKeditor/trunk/editor/_source/commandclasses/fckjustifycommands.js	(revision 931)
@@ -34,14 +34,18 @@
 	var cssClassName = this._CssClassName = ( function()
 	{
-		switch ( alignValue )
+		var classes = FCKConfig.JustifyClasses ;
+		if ( classes )
 		{
-			case 'left' :
-				return FCKConfig.JustifyLeftClass ;
-			case 'right' :
-				return FCKConfig.JustifyRightClass ;
-			case 'center' :
-				return FCKConfig.JustifyCenterClass ;
-			case 'justify' :
-				return FCKConfig.JustifyFullClass ;
+			switch ( alignValue )
+			{
+				case 'left' :
+					return classes[0] ;
+				case 'center' :
+					return classes[1] ;
+				case 'right' :
+					return classes[2] ;
+				case 'justify' :
+					return classes[3] ;
+			}
 		}
 		return null ;
@@ -60,14 +64,14 @@
 	var names = [] ;
 
-	var appendName = function( name )
+	var classes = FCKConfig.JustifyClasses ;
+	if ( classes )
 	{
-		if ( name && name.length > 0 )
-			names.push( name ) ;
+		for ( var i = 0 ; i < 4 ; i++ )
+		{
+			var className = classes[i] ;
+			if ( className && className.length > 0 )
+				names.push( className ) ;
+		}
 	}
-
-	appendName( FCKConfig.JustifyLeftClass ) ;
-	appendName( FCKConfig.JustifyRightClass ) ;
-	appendName( FCKConfig.JustifyCenterClass ) ;
-	appendName( FCKConfig.JustifyFullClass ) ;
 
 	if ( names.length > 0 )
Index: /FCKeditor/trunk/fckconfig.js
===================================================================
--- /FCKeditor/trunk/fckconfig.js	(revision 930)
+++ /FCKeditor/trunk/fckconfig.js	(revision 931)
@@ -59,12 +59,4 @@
 FCKConfig.DefaultLanguage		= 'en' ;
 FCKConfig.ContentLangDirection	= 'ltr' ;
-
-// The distance of an indentation step.
-FCKConfig.IndentLength = 40 ;
-FCKConfig.IndentUnit = 'px' ;
-
-// Alternatively, FCKeditor allows the use of CSS classes for block indentation.
-// This overrides the IndentLength/IndentUnit settings.
-FCKConfig.IndentClasses = [] ;
 
 FCKConfig.ProcessHTMLEntities	= true ;
@@ -252,8 +244,14 @@
 };
 
-FCKConfig.JustifyLeftClass		= '' ;
-FCKConfig.JustifyRightClass		= '' ;
-FCKConfig.JustifyCenterClass	= '' ;
-FCKConfig.JustifyFullClass		= '' ;
+// The distance of an indentation step.
+FCKConfig.IndentLength = 40 ;
+FCKConfig.IndentUnit = 'px' ;
+
+// Alternatively, FCKeditor allows the use of CSS classes for block indentation.
+// This overrides the IndentLength/IndentUnit settings.
+FCKConfig.IndentClasses = [] ;
+
+// [ Left, Center, Right, Justified ]
+FCKConfig.JustifyClasses = [] ;
 
 // The following value defines which File Browser connector and Quick Upload