Index: wp-admin/custom-background.php
===================================================================
--- wp-admin/custom-background.php	(revision 14670)
+++ wp-admin/custom-background.php	(working copy)
@@ -107,13 +107,13 @@
 				$repeat = 'repeat';
 			set_theme_mod('background_repeat', $repeat);
 		}
-		if ( isset($_POST['background-position']) ) {
+		if ( isset($_POST['background-position-x']) ) {
 			check_admin_referer('custom-background');
-			if ( in_array($_POST['background-position'], array('center', 'right', 'left')) )
-				$position = $_POST['background-position'];
+			if ( in_array($_POST['background-position-x'], array('center', 'right', 'left')) )
+				$position = $_POST['background-position-x'];
 			else
 				$position = 'left';
-			set_theme_mod('background_position', $position);
+			set_theme_mod('background_position_x', $position);
 		}
 		if ( isset($_POST['background-attachment']) ) {
 			check_admin_referer('custom-background');
@@ -155,7 +155,7 @@
 		call_user_func($this->admin_image_div_callback);
 	} else {
 ?>
-<h3><?php _e('Background Preview'); ?></h3>
+<h3><?php _e('Background Image'); ?></h3>
 <table class="form-table">
 <tbody>
 <tr valign="top">
@@ -171,8 +171,7 @@
 	$background_styles .= "
 	background-image: url(" . get_theme_mod('background_image_thumb', '') . ");
 	background-repeat: ". get_theme_mod('background_repeat', 'repeat') . ";
-	background-position: ". get_theme_mod('background_position', 'left') . " top;
-	background-attachment: " . get_theme_mod('background_attachment', 'fixed') . ";
+	background-position: ". get_theme_mod('background_position_x', 'left') . " top;
 	";
 }
 ?>
@@ -192,7 +191,7 @@
 <td><p><?php _e('This will remove the background image. You will not be able to restore any customizations.') ?></p>
 <form method="post" action="">
 <?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
-<input type="submit" class="button" name="remove-background" value="<?php esc_attr_e('Remove Background'); ?>" />
+<input type="submit" class="button" name="remove-background" value="<?php esc_attr_e('Remove Background Image'); ?>" />
 </form>
 </td>
 </tr>
@@ -232,8 +231,11 @@
 <tr valign="top">
 <th scope="row"><?php _e( 'Background Color' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
+<p><label>
 <input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr(get_background_color()) ?>" />
-<input type="button" class="button" value="<?php esc_attr_e('Select a Color'); ?>" id="pickcolor" />
+<input type="button" class="button hide-if-no-js" value="<?php esc_attr_e('Select a Color'); ?>" id="pickcolor" />
+<span class="description"><?php _e( 'Leave it blank to use no background color.' ); ?></span>
+</label></p>
 
 <div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
 </fieldset></td>
@@ -243,22 +245,22 @@
 <th scope="row"><?php _e( 'Background Position' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Position' ); ?></span></legend>
 <label>
-<input name="background-position" type="radio" value="left" <?php checked('left', get_theme_mod('background_position', 'left')); ?> />
+<input name="background-position-x" type="radio" value="left" <?php checked('left', get_theme_mod('background_position_x', 'left')); ?> />
 <?php _e('Left') ?>
 </label>
 <label>
-<input name="background-position" type="radio" value="center" <?php checked('center', get_theme_mod('background_position', 'left')); ?> />
+<input name="background-position-x" type="radio" value="center" <?php checked('center', get_theme_mod('background_position_x', 'left')); ?> />
 <?php _e('Center') ?>
 </label>
 <label>
-<input name="background-position" type="radio" value="right" <?php checked('right', get_theme_mod('background_position', 'left')); ?> />
+<input name="background-position-x" type="radio" value="right" <?php checked('right', get_theme_mod('background_position_x', 'left')); ?> />
 <?php _e('Right') ?>
 </label>
 </fieldset></td>
 </tr>
 
 <tr valign="top">
-<th scope="row"><?php _e( 'Repeat' ); ?></th>
+<th scope="row"><?php _e( 'Background Repeat' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Repeat' ); ?></span></legend>
 <label>
 <select name="background-repeat">
@@ -272,7 +274,7 @@
 </tr>
 
 <tr valign="top">
-<th scope="row"><?php _e( 'Attachment' ); ?></th>
+<th scope="row"><?php _e( 'Background Attachment' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Attachment' ); ?></span></legend>
 <label>
 <input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', 'fixed')); ?> />
Index: wp-admin/js/custom-background.dev.js
===================================================================
--- wp-admin/js/custom-background.dev.js	(revision 14670)
+++ wp-admin/js/custom-background.dev.js	(working copy)
@@ -23,17 +23,13 @@
 			pickColor( hex );
 	});
 
-	jQuery('input[name="background-position"]').change(function() {
-		jQuery('#custom-background-image').css('background-position', 'top ' + jQuery(this).val());
+	jQuery('input[name="background-position-x"]').change(function() {
+		jQuery('#custom-background-image').css('background-position', jQuery(this).val() + ' top');
 	});
 
 	jQuery('select[name="background-repeat"]').change(function() {
 		jQuery('#custom-background-image').css('background-repeat', jQuery(this).val());
 	});
-	
-	jQuery('input[name="background-attachment"]').change(function() {
-		jQuery('#custom-background-image').css('background-attachment', jQuery(this).val());
-	});
 
 	farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) {
 		pickColor(color);
Index: wp-includes/script-loader.php
===================================================================
--- wp-includes/script-loader.php	(revision 14670)
+++ wp-includes/script-loader.php	(working copy)
@@ -529,9 +529,6 @@
 		'l10n_print_after' => 'try{convertEntities(autosaveL10n);}catch(e){};'
 	) );
 
-	wp_localize_script( 'custom-background', 'customBackgroundL10n', array(
-		'backgroundcolor' => '#' . get_background_color(),
-	) );
 }
 
 /**
Index: wp-includes/theme.php
===================================================================
--- wp-includes/theme.php	(revision 14670)
+++ wp-includes/theme.php	(working copy)
@@ -1553,15 +1553,15 @@
 			$repeat = 'background-repeat: repeat;';
 	}
 
-	switch ( get_theme_mod('background_position', 'left') ) {
+	switch ( get_theme_mod('background_position_x', 'left') ) {
 		case 'center':
-			$position = 'background-position: top center;';
+			$position = 'background-position: center top;';
 			break;
 		case 'right':
-			$position = 'background-position: top right;';
+			$position = 'background-position: right top;';
 			break;
 		default:
-			$position = 'background-position: top left;';
+			$position = 'background-position: left top;';
 	}
 
 	if ( 'scroll' == get_theme_mod('background_attachment', 'fixed') )