Index: bp-core/admin/bp-core-update.php
===================================================================
--- bp-core/admin/bp-core-update.php	(revision 6050)
+++ bp-core/admin/bp-core-update.php	(working copy)
@@ -519,11 +519,7 @@
 		$installed_plugins = get_plugins();
 
 		// Backward-compatibility with WP < 3.4 will be removed in a future release
-		if ( bp_get_major_wp_version() >= 3.4 ) {
-			$installed_themes = wp_get_themes();
-		} else {
-			$installed_themes = get_themes();
-		}
+		$installed_themes = function_exists( 'wp_get_themes' ) ? wp_get_themes() : get_themes();
 
 		$bp_themes         = array();
 
@@ -547,11 +543,7 @@
 
 		// Get theme screenshot
 		// Backward-compatibility with WP < 3.4 will be removed in a future release
-		if ( bp_get_major_wp_version() >= 3.4 ) {
-			$current_theme = wp_get_theme();
-		} else {
-			$current_theme = get_current_theme();
-		}
+		$current_theme = function_exists( 'wp_get_theme' ) ? wp_get_theme() : get_current_theme();
 
 		$screenshot    = '';
 
Index: bp-themes/bp-default/functions.php
===================================================================
--- bp-themes/bp-default/functions.php	(revision 6050)
+++ bp-themes/bp-default/functions.php	(working copy)
@@ -87,38 +87,38 @@
 
 	// This theme allows users to set a custom background
 	// Backward-compatibility with WP < 3.4 will be removed in a future release
-	if ( bp_get_major_wp_version() >= 3.4 ) {
+	if ( function_exists( 'get_custom_header' ) ) {
 		$custom_background_args = array(
 			'wp-head-callback' => 'bp_dtheme_custom_background_style'
 		);
 		add_theme_support( 'custom-background', $custom_background_args );
 	} else {
-		add_custom_background( 'bp_dtheme_custom_background_style' );
+		add_custom_background( $custom_background_args['wp-head-callback'] );
 	}
 
 	// Add custom header support if allowed
 	if ( !defined( 'BP_DTHEME_DISABLE_CUSTOM_HEADER' ) ) {
-		define( 'HEADER_TEXTCOLOR', 'FFFFFF' );
+		$custom_header_args = array(
+			'default-text-color' => 'fff',
+			'width' => apply_filters( 'bp_dtheme_header_image_width',  1250 ),
+			'height' => apply_filters( 'bp_dtheme_header_image_height', 133  ),
+			'wp-head-callback' => 'bp_dtheme_header_style',
+			'admin-head-callback' => 'bp_dtheme_admin_header_style'
+		);
 
-		// The height and width of your custom header. You can hook into the theme's own filters to change these values.
-		// Add a filter to bp_dtheme_header_image_width and bp_dtheme_header_image_height to change these values.
-		define( 'HEADER_IMAGE_WIDTH',  apply_filters( 'bp_dtheme_header_image_width',  1250 ) );
-		define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'bp_dtheme_header_image_height', 133  ) );
-
 		// We'll be using post thumbnails for custom header images on posts and pages. We want them to be 1250 pixels wide by 133 pixels tall.
 		// Larger images will be auto-cropped to fit, smaller ones will be ignored.
-		set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
+		set_post_thumbnail_size( $custom_header_args['width'], $custom_header_args['height'], true );
 
 		// Add a way for the custom header to be styled in the admin panel that controls custom headers.
 		// Backward-compatibility with WP < 3.4 will be removed in a future release
-		if ( bp_get_major_wp_version() >= 3.4 ) {
-			$custom_header_args = array(
-				'wp-head-callback' => 'bp_dtheme_header_style',
-				'admin-head-callback' => 'bp_dtheme_admin_header_style'
-			);
+		if ( function_exists( 'get_custom_header' ) ) {			
 			add_theme_support( 'custom-header', $custom_header_args );
 		} else {
-			add_custom_image_header( 'bp_dtheme_header_style', 'bp_dtheme_admin_header_style' );
+			define( 'HEADER_TEXTCOLOR', $custom_header_args['default-text-color'] );
+			define( 'HEADER_IMAGE_WIDTH', $custom_header_args['width'] );
+			define( 'HEADER_IMAGE_HEIGHT', $custom_header_args['height'] );
+			add_custom_image_header( $custom_header_args['wp-head-callback'], $custom_header_args['admin-head-callback'] );
 		}
 	}