Index: wp-includes/update.php
===================================================================
--- wp-includes/update.php	(revision 19911)
+++ wp-includes/update.php	(working copy)
@@ -248,7 +248,7 @@
 	$exclude_fields = array('Template Files', 'Stylesheet Files', 'Status', 'Theme Root', 'Theme Root URI', 'Template Dir', 'Stylesheet Dir', 'Description', 'Tags', 'Screenshot');
 
 	// Put slug of current theme into request.
-	$themes['current_theme'] = get_option( 'stylesheet' );
+	$themes['current_theme'] = get_stylesheet();
 
 	foreach ( (array) $installed_themes as $theme_title => $theme ) {
 		$themes[$theme['Stylesheet']] = array();
Index: wp-includes/theme.php
===================================================================
--- wp-includes/theme.php	(revision 19911)
+++ wp-includes/theme.php	(working copy)
@@ -522,8 +522,8 @@
 
 	if ( $themes ) {
 		$theme_names = array_keys( $themes );
-		$current_template = get_option( 'template' );
-		$current_stylesheet = get_option( 'stylesheet' );
+		$current_template = get_template();
+		$current_stylesheet = get_stylesheet();
 
 		foreach ( (array) $theme_names as $theme_name ) {
 			if ( $themes[$theme_name]['Stylesheet'] == $current_stylesheet &&
@@ -713,9 +713,9 @@
 
 	// If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
 	if ( !$no_cache ) {
-		if ( get_option('stylesheet') == $stylesheet_or_template )
+		if ( get_stylesheet() == $stylesheet_or_template )
 			$theme_root = get_option('stylesheet_root');
-		elseif ( get_option('template') == $stylesheet_or_template )
+		elseif ( get_template() == $stylesheet_or_template )
 			$theme_root = get_option('template_root');
 	}
 
@@ -1318,7 +1318,7 @@
  * @return array Theme modifications.
  */
 function get_theme_mods() {
-	$theme_slug = get_option( 'stylesheet' );
+	$theme_slug = get_stylesheet();
 	if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) {
 		$theme_name = get_current_theme();
 		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
@@ -1370,7 +1370,7 @@
 
 	$mods[ $name ] = $value;
 
-	$theme = get_option( 'stylesheet' );
+	$theme = get_stylesheet();
 	update_option( "theme_mods_$theme", $mods );
 }
 
@@ -1396,7 +1396,7 @@
 	if ( empty( $mods ) )
 		return remove_theme_mods();
 
-	$theme = get_option( 'stylesheet' );
+	$theme = get_stylesheet();
 	update_option( "theme_mods_$theme", $mods );
 }
 
@@ -1406,7 +1406,7 @@
  * @since 2.1.0
  */
 function remove_theme_mods() {
-	delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
+	delete_option( 'theme_mods_' . get_stylesheet() );
 	delete_option( 'mods_' . get_current_theme() );
 }
 
@@ -1565,7 +1565,7 @@
 	$header_images = array();
 
 	// @todo caching
-	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
+	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_stylesheet(), 'orderby' => 'none', 'nopaging' => true ) );
 
 	if ( empty( $headers ) )
 		return array();
Index: wp-admin/includes/class-wp-ms-themes-list-table.php
===================================================================
--- wp-admin/includes/class-wp-ms-themes-list-table.php	(revision 19911)
+++ wp-admin/includes/class-wp-ms-themes-list-table.php	(working copy)
@@ -287,7 +287,7 @@
 		if ( current_user_can('edit_themes') )
 			$actions['edit'] = '<a href="' . esc_url('theme-editor.php?theme=' . urlencode( $theme['Name'] )) . '" title="' . esc_attr__('Open this theme in the Theme Editor') . '" class="edit">' . __('Edit') . '</a>';
 
-		if ( empty( $theme['enabled'] ) && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $theme_key != get_option( 'stylesheet' ) && $theme_key != get_option( 'template' ) )
+		if ( empty( $theme['enabled'] ) && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $theme_key != get_stylesheet() && $theme_key != get_template() )
 			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=delete-selected&amp;checked[]=' . $theme_key . '&amp;theme_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-themes' ) ) . '" title="' . esc_attr__( 'Delete this theme' ) . '" class="delete">' . __( 'Delete' ) . '</a>';
 
 		$actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme_key, $theme, $context );
Index: wp-admin/includes/schema.php
===================================================================
--- wp-admin/includes/schema.php	(revision 19911)
+++ wp-admin/includes/schema.php	(working copy)
@@ -841,8 +841,8 @@
 		return $errors;
 
 	// set up site tables
-	$template = get_option( 'template' );
-	$stylesheet = get_option( 'stylesheet' );
+	$template = get_template();
+	$stylesheet = get_stylesheet();
 	$allowed_themes = array( $stylesheet => true );
 	if ( $template != $stylesheet )
 		$allowed_themes[ $template ] = true;
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 19911)
+++ wp-admin/includes/template.php	(working copy)
@@ -1485,7 +1485,7 @@
 
 function _media_states( $post ) {
 	$media_states = array();
-	$stylesheet = get_option('stylesheet');
+	$stylesheet = get_stylesheet();
 
 	if ( current_theme_supports( 'custom-header') ) {
 		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
Index: wp-admin/theme-editor.php
===================================================================
--- wp-admin/theme-editor.php	(revision 19911)
+++ wp-admin/theme-editor.php	(working copy)
@@ -241,7 +241,7 @@
 	<?php } ?>
 
 		<div>
-		<?php if ( is_child_theme() && ! $is_child_theme && $themes[$theme]['Template'] == get_option('template') ) : ?>
+		<?php if ( is_child_theme() && ! $is_child_theme && $themes[$theme]['Template'] == get_template() ) : ?>
 			<p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
 			<?php _e( 'This is a file in your current parent theme.' ); ?></p>
 		<?php endif; ?>
Index: wp-admin/network/themes.php
===================================================================
--- wp-admin/network/themes.php	(revision 19911)
+++ wp-admin/network/themes.php	(working copy)
@@ -110,10 +110,10 @@
 
 			$themes = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
 
-			if ( isset( $themes[ get_option( 'template' ) ] ) )
-				unset( $themes[ get_option( 'template' ) ] );
-			if ( isset( $themes[ get_option( 'stylesheet' ) ] ) )
-				unset( $themes[ get_option( 'stylesheet' ) ] );
+			if ( isset( $themes[ get_template() ] ) )
+				unset( $themes[ get_template() ] );
+			if ( isset( $themes[ get_stylesheet() ] ) )
+				unset( $themes[ get_stylesheet() ] );
 
 			if ( empty( $themes ) ) {
 				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );