diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index b2d536f3a5..d5950b12fb 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -471,7 +471,7 @@ function delete_plugins($plugins, $redirect = '' ) {
 		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s'), implode(', ', $errors)) );
 
 	// Force refresh of plugin update information
-	delete_option('update_plugins');
+	delete_transient('update_plugins');
 
 	return true;
 }
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 53452824ab..da67051b90 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -31,6 +31,78 @@ function current_theme_info() {
 	return $ct;
 }
 
+/**
+ * Remove a theme
+ *
+ * @since 2.8.0
+ *
+ * @param string $template Template directory of the theme to delete
+ * @return mixed
+ */
+function delete_theme($template) {
+	global $wp_filesystem;
+
+	if ( empty($template) )
+		return false;
+
+	ob_start();
+	$url = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
+	if ( false === ($credentials = request_filesystem_credentials($url)) ) {
+		$data = ob_get_contents();
+		ob_end_clean();
+		if ( ! empty($data) ){
+			include_once( ABSPATH . 'wp-admin/admin-header.php');
+			echo $data;
+			include( ABSPATH . 'wp-admin/admin-footer.php');
+			exit;
+		}
+		return;
+	}
+
+	if ( ! WP_Filesystem($credentials) ) {
+		request_filesystem_credentials($url, '', true); // Failed to connect, Error and request again
+		$data = ob_get_contents();
+		ob_end_clean();
+		if( ! empty($data) ){
+			include_once( ABSPATH . 'wp-admin/admin-header.php');
+			echo $data;
+			include( ABSPATH . 'wp-admin/admin-footer.php');
+			exit;
+		}
+		return;
+	}
+
+	if ( $wp_filesystem->errors->get_error_code() ) {
+		return $wp_filesystem->errors;
+	}
+
+	if ( ! is_object($wp_filesystem) )
+		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+
+	if ( $wp_filesystem->errors->get_error_code() )
+		return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
+
+	//Get the base plugin folder
+	$themes_dir = $wp_filesystem->wp_themes_dir();
+	if ( empty($themes_dir) )
+		return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
+
+	$themes_dir = trailingslashit( $themes_dir );
+
+	$errors = array();
+
+	$theme_dir = trailingslashit($themes_dir . $template);
+	$deleted = $wp_filesystem->delete($theme_dir, true);
+
+	if ( ! $deleted )
+		return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s'), $template) );
+
+	// Force refresh of theme update information
+	delete_transient('update_themes');
+
+	return true;
+}
+
 /**
  * {@internal Missing Short Description}}
  *
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 80f18fa911..3b08375720 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -17,7 +17,11 @@ if ( isset($_GET['action']) ) {
 		exit;
 	} else if ( 'delete' == $_GET['action'] ) {
 		check_admin_referer('delete-theme_' . $_GET['template']);
-		die('Not implemented');
+		if ( !current_user_can('update_themes') )
+			wp_die( __( 'Cheatin’ uh?' ) );
+		delete_theme($_GET['template']);
+		wp_redirect('themes.php?deleted=true');
+		exit;
 	}
 }
 
@@ -34,6 +38,8 @@ require_once('admin-header.php');
 <div id="message1" class="updated fade"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
 <?php elseif ( isset($_GET['activated']) ) : ?>
 <div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">Visit site</a>'), get_bloginfo('url') . '/'); ?></p></div>
+<?php elseif ( isset($_GET['deleted']) ) : ?>
+<div id="message3" class="updated fade"><p><?php _e('Theme deleted.') ?></p></div>
 <?php endif; ?>
 
 <?php