Index: functions.php
===================================================================
--- functions.php	(revision 2995)
+++ functions.php	(working copy)
@@ -160,27 +160,8 @@
  */
 function wporg_themes_get_feature_list() {
 	return array(
-		__( 'Colors', 'wporg-themes' )   => array(
-			'black'  => __( 'Black',  'wporg-themes' ),
-			'blue'   => __( 'Blue',   'wporg-themes' ),
-			'brown'  => __( 'Brown',  'wporg-themes' ),
-			'gray'   => __( 'Gray',   'wporg-themes' ),
-			'green'  => __( 'Green',  'wporg-themes' ),
-			'orange' => __( 'Orange', 'wporg-themes' ),
-			'pink'   => __( 'Pink',   'wporg-themes' ),
-			'purple' => __( 'Purple', 'wporg-themes' ),
-			'red'    => __( 'Red',    'wporg-themes' ),
-			'silver' => __( 'Silver', 'wporg-themes' ),
-			'tan'    => __( 'Tan',    'wporg-themes' ),
-			'white'  => __( 'White',  'wporg-themes' ),
-			'yellow' => __( 'Yellow', 'wporg-themes' ),
-			'dark'   => __( 'Dark',   'wporg-themes' ),
-			'light'  => __( 'Light',  'wporg-themes' ),
-		),
 		__( 'Layout', 'wporg-themes' ) => array(
-			'fixed-layout'      => __( 'Fixed Layout',      'wporg-themes' ),
-			'fluid-layout'      => __( 'Fluid Layout',      'wporg-themes' ),
-			'responsive-layout' => __( 'Responsive Layout', 'wporg-themes' ),
+			'grid-layout'       => __( 'Grid Layout',       'wporg-themes' ),
 			'one-column'        => __( 'One Column',        'wporg-themes' ),
 			'two-columns'       => __( 'Two Columns',       'wporg-themes' ),
 			'three-columns'     => __( 'Three Columns',     'wporg-themes' ),
@@ -190,7 +171,6 @@
 		),
 		__( 'Features', 'wporg-themes' ) => array(
 			'accessibility-ready'   => __( 'Accessibility Ready',   'wporg-themes' ),
-			'blavatar'              => __( 'Blavatar',              'wporg-themes' ),
 			'buddypress'            => __( 'BuddyPress',            'wporg-themes' ),
 			'custom-background'     => __( 'Custom Background',     'wporg-themes' ),
 			'custom-colors'         => __( 'Custom Colors',         'wporg-themes' ),
@@ -200,6 +180,7 @@
 			'featured-image-header' => __( 'Featured Image Header', 'wporg-themes' ),
 			'featured-images'       => __( 'Featured Images',       'wporg-themes' ),
 			'flexible-header'       => __( 'Flexible Header',       'wporg-themes' ),
+			'footer-widgets'        => __( 'Footer Widgets',        'wporg-themes' ),
 			'front-page-post-form'  => __( 'Front Page Posting',    'wporg-themes' ),
 			'full-width-template'   => __( 'Full Width Template',   'wporg-themes' ),
 			'microformats'          => __( 'Microformats',          'wporg-themes' ),
@@ -211,9 +192,15 @@
 			'translation-ready'     => __( 'Translation Ready',     'wporg-themes' ),
 		),
 		__( 'Subject', 'wporg-themes' ) => array(
-			'holiday'       => __( 'Holiday',       'wporg-themes' ),
-			'photoblogging' => __( 'Photoblogging', 'wporg-themes' ),
-			'seasonal'      => __( 'Seasonal',      'wporg-themes' ),
+			'blog'           => __( 'Blog',          'wporg-themes' ),
+			'e-commerce'     => __( 'E-Commerce',    'wporg-themes' ),
+			'education'      => __( 'Education',     'wporg-themes' ),
+			'entertainment'  => __( 'Entertainment', 'wporg-themes' ),
+			'food-and-drink' => __( 'Food & Drink',  'wporg-themes' ),
+			'holiday'        => __( 'Holiday',       'wporg-themes' ),
+			'news'           => __( 'News',          'wporg-themes' ),
+			'photography'    => __( 'Photography',   'wporg-themes' ),
+			'portfolio'      => __( 'Portfolio',     'wporg-themes' ),
 		)
 	);
 }