diff --git a/wp-content/themes/twentyeleven/inc/theme-options.js b/wp-content/themes/twentyeleven/inc/theme-options.js
index bf1be391e..4cfaec151 100644
--- a/wp-content/themes/twentyeleven/inc/theme-options.js
+++ b/wp-content/themes/twentyeleven/inc/theme-options.js
@@ -39,14 +39,14 @@ var farbtastic;
 			e.preventDefault();
 		});
 
-		$('.image-radio-option input:radio').change( function() {
+		$('.image-radio-option.color-scheme input:radio').change( function() {
 			var currentDefault = $('#default-color a'),
-				newDefault;
-			if ( $('#link-color').val() !== currentDefault.text() )
-				return;
-			newDefault = $(this).next().val();
+				newDefault = $(this).next().val();
+
+			if ( $('#link-color').val() == currentDefault.text() )
+				pickColor( newDefault );
+
 			currentDefault.text( newDefault );
-			pickColor( newDefault );
 		});
 	});
 })(jQuery);
\ No newline at end of file
diff --git a/wp-content/themes/twentyeleven/inc/theme-options.php b/wp-content/themes/twentyeleven/inc/theme-options.php
index cdcebbde9..e408af3bd 100644
--- a/wp-content/themes/twentyeleven/inc/theme-options.php
+++ b/wp-content/themes/twentyeleven/inc/theme-options.php
@@ -22,7 +22,7 @@ function twentyeleven_admin_enqueue_scripts( $hook_suffix ) {
 		return;
 
 	wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', false, '2011-04-28' );
-	wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'farbtastic' ), '2011-04-28' );
+	wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'farbtastic' ), '2011-06-10' );
 	wp_enqueue_style( 'farbtastic' );
 }
 add_action( 'admin_enqueue_scripts', 'twentyeleven_admin_enqueue_scripts' );
@@ -224,7 +224,7 @@ function theme_options_render_page() {
 
 			<table class="form-table">
 
-				<tr valign="top" class="image-radio-option"><th scope="row"><?php _e( 'Color Scheme', 'twentyeleven' ); ?></th>
+				<tr valign="top" class="image-radio-option color-scheme"><th scope="row"><?php _e( 'Color Scheme', 'twentyeleven' ); ?></th>
 					<td>
 						<fieldset><legend class="screen-reader-text"><span><?php _e( 'Color Scheme', 'twentyeleven' ); ?></span></legend>
 						<?php
@@ -260,7 +260,7 @@ function theme_options_render_page() {
 					</td>
 				</tr>
 
-				<tr valign="top" class="image-radio-option"><th scope="row"><?php _e( 'Default Layout', 'twentyeleven' ); ?></th>
+				<tr valign="top" class="image-radio-option theme-layout"><th scope="row"><?php _e( 'Default Layout', 'twentyeleven' ); ?></th>
 					<td>
 						<fieldset><legend class="screen-reader-text"><span><?php _e( 'Color Scheme', 'twentyeleven' ); ?></span></legend>
 						<?php