Index: wp-includes/version.php
===================================================================
--- wp-includes/version.php	(revision 7868)
+++ wp-includes/version.php	(working copy)
@@ -16,6 +16,6 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 7842;
+$wp_db_version = 7843;
 
 ?>
Index: wp-content/themes/default/functions.php
===================================================================
--- wp-content/themes/default/functions.php	(revision 7868)
+++ wp-content/themes/default/functions.php	(working copy)
@@ -62,7 +62,7 @@
 
 function kubrick_header_color_string() {
 	$color = kubrick_header_color();
-	if ( false === $color )
+	if ( !$color )
 		return 'white';
 
 	return $color;
@@ -85,15 +85,16 @@
 			check_admin_referer('kubrick-header');
 			if ( isset($_REQUEST['njform']) ) {
 				if ( isset($_REQUEST['defaults']) ) {
-					delete_option('kubrick_header_image');
-					delete_option('kubrick_header_color');
-					delete_option('kubrick_header_display');
+					update_option('kubrick_header_image', '');
+					update_option('kubrick_header_color', '#ffffff');
+					update_option('kubrick_header_display', '');
 				} else {
 					if ( '' == $_REQUEST['njfontcolor'] )
-						delete_option('kubrick_header_color');
+						update_option('kubrick_header_color', '#ffffff');
 					else {
 						$fontcolor = preg_replace('/^.*(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['njfontcolor']);
-						update_option('kubrick_header_color', $fontcolor);
+						if ( $fontcolor ) // if it fails the preg_replace, it'll be NULL, so don't update
+							update_option('kubrick_header_color', $fontcolor);
 					}
 					if ( preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njuppercolor'], $uc) && preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njlowercolor'], $lc) ) {
 						$uc = ( strlen($uc[0]) == 3 ) ? $uc[0]{0}.$uc[0]{0}.$uc[0]{1}.$uc[0]{1}.$uc[0]{2}.$uc[0]{2} : $uc[0];
@@ -105,7 +106,7 @@
 						if ( false === get_option('kubrick_header_display') )
 							update_option('kubrick_header_display', 'none');
 						else
-							delete_option('kubrick_header_display');
+							update_option('kubrick_header_display', '');
 					}
 				}
 			} else {
@@ -113,7 +114,7 @@
 				if ( isset($_REQUEST['headerimage']) ) {
 					check_admin_referer('kubrick-header');
 					if ( '' == $_REQUEST['headerimage'] )
-						delete_option('kubrick_header_image');
+						update_option('kubrick_header_image', '');
 					else {
 						$headerimage = preg_replace('/^.*?(header-img.php\?upper=[0-9a-fA-F]{6}&lower=[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['headerimage']);
 						update_option('kubrick_header_image', $headerimage);
@@ -123,17 +124,18 @@
 				if ( isset($_REQUEST['fontcolor']) ) {
 					check_admin_referer('kubrick-header');
 					if ( '' == $_REQUEST['fontcolor'] )
-						delete_option('kubrick_header_color');
+						update_option('kubrick_header_color', '#ffffff');
 					else {
 						$fontcolor = preg_replace('/^.*?(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['fontcolor']);
-						update_option('kubrick_header_color', $fontcolor);
+						if ( $fontcolor ) // if it fails the preg_replace, it'll be NULL, so don't update
+							update_option('kubrick_header_color', $fontcolor);
 					}
 				}
 
 				if ( isset($_REQUEST['fontdisplay']) ) {
 					check_admin_referer('kubrick-header');
 					if ( '' == $_REQUEST['fontdisplay'] || 'inline' == $_REQUEST['fontdisplay'] )
-						delete_option('kubrick_header_display');
+						update_option('kubrick_header_display', '');
 					else
 						update_option('kubrick_header_display', 'none');
 				}
@@ -237,7 +239,7 @@
 		document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#4180b6';
 		document.getElementById('header').style.background = 'url("<?php echo get_template_directory_uri(); ?>/images/kubrickheader.jpg") center no-repeat';
 		document.getElementById('header').style.color = '#FFFFFF';
-		document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '';
+		document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '#FFFFFF';
 		document.getElementById('fontdisplay').value = 'inline';
 		document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value;
 	}
Index: wp-admin/includes/schema.php
===================================================================
--- wp-admin/includes/schema.php	(revision 7868)
+++ wp-admin/includes/schema.php	(working copy)
@@ -253,6 +253,14 @@
 	add_option('medium_size_w', 300);
 	add_option('medium_size_h', 300);
 
+	// 2.6
+	// these five options have long existed, but need to be initialized to avoid extra queries
+	add_option('widget_text', '');
+	add_option('widget_rss', '');
+	add_option('kubrick_header_image', '');
+	add_option('kubrick_header_color', '#FFFFFF');
+	add_option('kubrick_header_display', '');
+
 	// Delete unused options
 	$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval');
 	foreach ($unusedoptions as $option) :