Index: trunk/custom-post-type-ui.php
===================================================================
--- trunk/custom-post-type-ui.php	(revision 430280)
+++ trunk/custom-post-type-ui.php	(working copy)
@@ -79,10 +79,11 @@
 		foreach ($cpt_post_types as $cpt_post_type) {
 
 			//set post type values
-			$cpt_label = ( !$cpt_post_type["label"] ) ? esc_html($cpt_post_type["name"]) : esc_html($cpt_post_type["label"]);
-			$cpt_singular = ( !$cpt_post_type["singular_label"] ) ? $cpt_label : esc_html($cpt_post_type["singular_label"]);
-			$cpt_rewrite_slug = ( !$cpt_post_type["rewrite_slug"] ) ? esc_html($cpt_post_type["name"]) : esc_html($cpt_post_type["rewrite_slug"]);
-			$cpt_menu_position = ( !$cpt_post_type["menu_position"] ) ? null : intval($cpt_post_type["menu_position"]);
+			$cpt_label = ( !$cpt_post_type["label"] ) ? esc_html( $cpt_post_type["name"] ) : esc_html( $cpt_post_type["label"] );
+			$cpt_singular = ( !$cpt_post_type["singular_label"] ) ? $cpt_label : esc_html( $cpt_post_type["singular_label"] );
+			$cpt_rewrite_slug = ( !$cpt_post_type["rewrite_slug"] ) ? esc_html( $cpt_post_type["name"] ) : esc_html( $cpt_post_type["rewrite_slug"] );
+			$cpt_menu_position = ( !$cpt_post_type["menu_position"] ) ? null : intval( $cpt_post_type["menu_position"] );
+			$cpt_menu_icon = ( !$cpt_post_type["menu_icon"] ) ? null : $cpt_post_type["menu_icon"];
 			$cpt_taxonomies = ( !$cpt_post_type[1] ) ? array() : $cpt_post_type[1];
 			$cpt_supports = ( !$cpt_post_type[0] ) ? array() : $cpt_post_type[0];
 			//$cpt_show_in_menu  = ( !$cpt_post_type["show_in_menu_string"] ) ? null : $cpt_post_type["show_in_menu_string"];
@@ -115,22 +116,23 @@
 			$cpt_labels['not_found_in_trash'] = ( $cpt_post_type[2]["not_found_in_trash"] ) ? $cpt_post_type[2]["not_found_in_trash"] : 'No ' .$cpt_label. ' Found in Trash';
 			$cpt_labels['parent'] = ( $cpt_post_type[2]["parent"] ) ? $cpt_post_type[2]["parent"] : 'Parent ' .$cpt_singular;
 
-			register_post_type( $cpt_post_type["name"], array(	'label' => __($cpt_label),
-				'public' => get_disp_boolean($cpt_post_type["public"]),
-				'singular_label' => $cpt_post_type["singular_label"],
-				'show_ui' => get_disp_boolean($cpt_post_type["show_ui"]),
-				'has_archive' => $cpt_has_archive,
-				'show_in_menu' => $cpt_show_in_menu,
-				'capability_type' => $cpt_post_type["capability_type"],
-				'hierarchical' => get_disp_boolean($cpt_post_type["hierarchical"]),
-				'rewrite' => array('slug' => $cpt_rewrite_slug),
-				'query_var' => get_disp_boolean($cpt_post_type["query_var"]),
-				'description' => esc_html($cpt_post_type["description"]),
-				'menu_position' => $cpt_menu_position,
-				'supports' => $cpt_supports,
-				'taxonomies' => $cpt_taxonomies,
-				'labels' => $cpt_labels
-			) );
+			register_post_type( $cpt_post_type["name"], array( 'label' => __( $cpt_label ),
+					'public' => get_disp_boolean( $cpt_post_type["public"] ),
+					'singular_label' => $cpt_post_type["singular_label"],
+					'show_ui' => get_disp_boolean( $cpt_post_type["show_ui"] ),
+					'has_archive' => $cpt_has_archive,
+					'show_in_menu' => $cpt_show_in_menu,
+					'capability_type' => $cpt_post_type["capability_type"],
+					'hierarchical' => get_disp_boolean( $cpt_post_type["hierarchical"] ),
+					'rewrite' => array( 'slug' => $cpt_rewrite_slug, 'with_front' => $cpt_post_type["rewrite_front"] ),
+					'query_var' => get_disp_boolean( $cpt_post_type["query_var"] ),
+					'description' => esc_html( $cpt_post_type["description"] ),
+					'menu_position' => $cpt_menu_position,
+					'menu_icon' => $cpt_menu_icon,
+					'supports' => $cpt_supports,
+					'taxonomies' => $cpt_taxonomies,
+					'labels' => $cpt_labels
+				) );
 		}
 	}
 }
@@ -169,14 +171,14 @@
 			//register our custom taxonomies
 			register_taxonomy( $cpt_tax_type["name"],
 				$cpt_post_types,
-				array( 'hierarchical' => get_disp_boolean($cpt_tax_type["hierarchical"]),
-				'label' => $cpt_label,
-				'show_ui' => get_disp_boolean($cpt_tax_type["show_ui"]),
-				'query_var' => get_disp_boolean($cpt_tax_type["query_var"]),
-				'rewrite' => array('slug' => $cpt_rewrite_slug),
-				'singular_label' => $cpt_singular_label,
-				'labels' => $cpt_labels
-			) );
+				array( 'hierarchical' => get_disp_boolean( $cpt_tax_type["hierarchical"] ),
+					'label' => $cpt_label,
+					'show_ui' => get_disp_boolean( $cpt_tax_type["show_ui"] ),
+					'query_var' => get_disp_boolean( $cpt_tax_type["query_var"] ),
+					'rewrite' => array( 'slug' => $cpt_rewrite_slug, 'with_front' => $cpt_tax_type["rewrite_front"] ),
+					'singular_label' => $cpt_singular_label,
+					'labels' => $cpt_labels
+				) );
 
 		}
 	}
@@ -530,32 +532,34 @@
         <table width="100%" class="widefat">
             <thead>
                 <tr>
-                    <th><?php _e('Action', 'cpt-plugin');?></th>
-                    <th><?php _e('Name', 'cpt-plugin');?></th>
-                    <th><?php _e('Label', 'cpt-plugin');?></th>
-                    <th><?php _e('Public', 'cpt-plugin');?></th>
-                    <th><?php _e('Show UI', 'cpt-plugin');?></th>
-                    <th><?php _e('Hierarchical', 'cpt-plugin');?></th>
-                    <th><?php _e('Rewrite', 'cpt-plugin');?></th>
-                    <th><?php _e('Rewrite Slug', 'cpt-plugin');?></th>
-                    <th><?php _e('Total Published', 'cpt-plugin');?></th>
-                    <th><?php _e('Total Drafts', 'cpt-plugin');?></th>
-                    <th><?php _e('Supports', 'cpt-plugin');?></th>
+					<th><?php _e( 'Action', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Name', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Label', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Public', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Show UI', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Hierarchical', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Rewrite', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Rewrite Front', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Rewrite Slug', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Total Published', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Total Drafts', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Supports', 'cpt-plugin' );?></th>
                 </tr>
             </thead>
             <tfoot>
                 <tr>
-                    <th><?php _e('Action', 'cpt-plugin');?></th>
-                    <th><?php _e('Name', 'cpt-plugin');?></th>
-                    <th><?php _e('Label', 'cpt-plugin');?></th>
-                    <th><?php _e('Public', 'cpt-plugin');?></th>
-                    <th><?php _e('Show UI', 'cpt-plugin');?></th>
-                    <th><?php _e('Hierarchical', 'cpt-plugin');?></th>
-                    <th><?php _e('Rewrite', 'cpt-plugin');?></th>
-                    <th><?php _e('Rewrite Slug', 'cpt-plugin');?></th>
-                    <th><?php _e('Total Published', 'cpt-plugin');?></th>
-                    <th><?php _e('Total Drafts', 'cpt-plugin');?></th>
-                    <th><?php _e('Supports', 'cpt-plugin');?></th>
+                    <th><?php _e( 'Action', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Name', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Label', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Public', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Show UI', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Hierarchical', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Rewrite', 'cpt-plugin' );?></th>
+					<th><?php _e( 'Rewrite Front', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Rewrite Slug', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Total Published', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Total Drafts', 'cpt-plugin' );?></th>
+                    <th><?php _e( 'Supports', 'cpt-plugin' );?></th>
                 </tr>
             </tfoot>
         <?php
@@ -575,12 +579,13 @@
 		?>
         	<tr>
             	<td valign="top"><a href="<?php echo $del_url; ?>">Delete</a> / <a href="<?php echo $edit_url; ?>">Edit</a> / <a href="#" class="comment_button" id="<?php echo $thecounter; ?>">Get Code</a></td>
-            	<td valign="top"><?php echo stripslashes($cpt_post_type["name"]); ?></td>
-                <td valign="top"><?php echo stripslashes($cpt_post_type["label"]); ?></td>
-                <td valign="top"><?php echo disp_boolean($cpt_post_type["public"]); ?></td>
-                <td valign="top"><?php echo disp_boolean($cpt_post_type["show_ui"]); ?></td>
-                <td valign="top"><?php echo disp_boolean($cpt_post_type["hierarchical"]); ?></td>
-                <td valign="top"><?php echo disp_boolean($cpt_post_type["rewrite"]); ?></td>
+            	<td valign="top"><?php echo stripslashes( $cpt_post_type["name"] ); ?></td>
+                <td valign="top"><?php echo stripslashes( $cpt_post_type["label"] ); ?></td>
+                <td valign="top"><?php echo disp_boolean( $cpt_post_type["public"] ); ?></td>
+                <td valign="top"><?php echo disp_boolean( $cpt_post_type["show_ui"] ); ?></td>
+                <td valign="top"><?php echo disp_boolean( $cpt_post_type["hierarchical"] ); ?></td>
+                <td valign="top"><?php echo disp_boolean( $cpt_post_type["rewrite"] ); ?></td>
+                <td valign="top"><?php echo disp_boolean( $cpt_post_type["rewrite_front"] ); ?></td>
                 <td valign="top"><?php echo $rewrite_slug; ?></td>
                 <td valign="top"><?php echo $cpt_counts->publish; ?></td>
                 <td valign="top"><?php echo $cpt_counts->draft; ?></td>
@@ -598,82 +603,70 @@
             	<td colspan="12">
                     <div style="display:none;" id="slidepanel<?php echo $thecounter; ?>">
                         <?php
-                        //display register_post_type code
-						$custom_post_type='';
-						$cpt_support_array='';
-						$cpt_tax_array='';
+			//display register_post_type code
+			$custom_post_type='';
+			$cpt_support_array='';
+			$cpt_tax_array='';
 
-						$cpt_label = ( !$cpt_post_type["label"] ) ? esc_html($cpt_post_type["name"]) : esc_html($cpt_post_type["label"]);
-						$cpt_singular = ( !$cpt_post_type["singular_label"] ) ? $cpt_label : esc_html($cpt_post_type["singular_label"]);
-						$cpt_rewrite_slug = ( !$cpt_post_type["rewrite_slug"] ) ? esc_html($cpt_post_type["name"]) : esc_html($cpt_post_type["rewrite_slug"]);
-						$cpt_menu_position = ( !$cpt_post_type["menu_position"] ) ? null : intval($cpt_post_type["menu_position"]);
-						$cpt_show_in_menu = ( $cpt_post_type["show_in_menu"] == 1 ) ? 'true' : 'false';
-						$cpt_show_in_menu = ( $cpt_post_type["show_in_menu_string"] ) ? '\''.$cpt_post_type["show_in_menu_string"].'\'' : $cpt_show_in_menu;
+			$cpt_label = ( !$cpt_post_type["label"] ) ? esc_html( $cpt_post_type["name"] ) : esc_html( $cpt_post_type["label"] );
+			$cpt_singular = ( !$cpt_post_type["singular_label"] ) ? $cpt_label : esc_html( $cpt_post_type["singular_label"] );
+			$cpt_rewrite_slug = ( !$cpt_post_type["rewrite_slug"] ) ? esc_html( $cpt_post_type["name"] ) : esc_html( $cpt_post_type["rewrite_slug"] );
+			$cpt_menu_position = ( !$cpt_post_type["menu_position"] ) ? null : intval( $cpt_post_type["menu_position"] );
+			$cpt_show_in_menu = ( $cpt_post_type["show_in_menu"] == 1 ) ? 'true' : 'false';
+			$cpt_show_in_menu = ( $cpt_post_type["show_in_menu_string"] ) ? '\''.$cpt_post_type["show_in_menu_string"].'\'' : $cpt_show_in_menu;
+			$cpt_menu_icon = ( !$cpt_post_type["menu_icon"] ) ? null : $cpt_post_type["menu_icon"];
 
-						//set custom label values
-						$cpt_labels['name'] = $cpt_label;
-						$cpt_labels['singular_name'] = $cpt_post_type["singular_label"];
-						$cpt_labels['menu_name'] = ( $cpt_post_type[2]["menu_name"] ) ? $cpt_post_type[2]["menu_name"] : $cpt_label;
-						$cpt_labels['add_new'] = ( $cpt_post_type[2]["add_new"] ) ? $cpt_post_type[2]["add_new"] : 'Add ' .$cpt_singular;
-						$cpt_labels['add_new_item'] = ( $cpt_post_type[2]["add_new_item"] ) ? $cpt_post_type[2]["add_new_item"] : 'Add New ' .$cpt_singular;
-						$cpt_labels['edit'] = ( $cpt_post_type[2]["edit"] ) ? $cpt_post_type[2]["edit"] : 'Edit';
-						$cpt_labels['edit_item'] = ( $cpt_post_type[2]["edit_item"] ) ? $cpt_post_type[2]["edit_item"] : 'Edit ' .$cpt_singular;
-						$cpt_labels['new_item'] = ( $cpt_post_type[2]["new_item"] ) ? $cpt_post_type[2]["new_item"] : 'New ' .$cpt_singular;
-						$cpt_labels['view'] = ( $cpt_post_type[2]["view"] ) ? $cpt_post_type[2]["view"] : 'View ' .$cpt_singular;
-						$cpt_labels['view_item'] = ( $cpt_post_type[2]["view_item"] ) ? $cpt_post_type[2]["view_item"] : 'View ' .$cpt_singular;
-						$cpt_labels['search_items'] = ( $cpt_post_type[2]["search_items"] ) ? $cpt_post_type[2]["search_items"] : 'Search ' .$cpt_label;
-						$cpt_labels['not_found'] = ( $cpt_post_type[2]["not_found"] ) ? $cpt_post_type[2]["not_found"] : 'No ' .$cpt_label. ' Found';
-						$cpt_labels['not_found_in_trash'] = ( $cpt_post_type[2]["not_found_in_trash"] ) ? $cpt_post_type[2]["not_found_in_trash"] : 'No ' .$cpt_label. ' Found in Trash';
-						$cpt_labels['parent'] = ( $cpt_post_type[2]["parent"] ) ? $cpt_post_type[2]["parent"] : 'Parent ' .$cpt_singular;
+			//set custom label values
+			$cpt_labels['name'] = $cpt_label;
+			$cpt_labels['singular_name'] = $cpt_post_type["singular_label"];
+			$cpt_labels['menu_name'] = ( $cpt_post_type[2]["menu_name"] ) ? $cpt_post_type[2]["menu_name"] : $cpt_label;
+			$cpt_labels['add_new'] = ( $cpt_post_type[2]["add_new"] ) ? $cpt_post_type[2]["add_new"] : 'Add ' .$cpt_singular;
+			$cpt_labels['add_new_item'] = ( $cpt_post_type[2]["add_new_item"] ) ? $cpt_post_type[2]["add_new_item"] : 'Add New ' .$cpt_singular;
+			$cpt_labels['edit'] = ( $cpt_post_type[2]["edit"] ) ? $cpt_post_type[2]["edit"] : 'Edit';
+			$cpt_labels['edit_item'] = ( $cpt_post_type[2]["edit_item"] ) ? $cpt_post_type[2]["edit_item"] : 'Edit ' .$cpt_singular;
+			$cpt_labels['new_item'] = ( $cpt_post_type[2]["new_item"] ) ? $cpt_post_type[2]["new_item"] : 'New ' .$cpt_singular;
+			$cpt_labels['view'] = ( $cpt_post_type[2]["view"] ) ? $cpt_post_type[2]["view"] : 'View ' .$cpt_singular;
+			$cpt_labels['view_item'] = ( $cpt_post_type[2]["view_item"] ) ? $cpt_post_type[2]["view_item"] : 'View ' .$cpt_singular;
+			$cpt_labels['search_items'] = ( $cpt_post_type[2]["search_items"] ) ? $cpt_post_type[2]["search_items"] : 'Search ' .$cpt_label;
+			$cpt_labels['not_found'] = ( $cpt_post_type[2]["not_found"] ) ? $cpt_post_type[2]["not_found"] : 'No ' .$cpt_label. ' Found';
+			$cpt_labels['not_found_in_trash'] = ( $cpt_post_type[2]["not_found_in_trash"] ) ? $cpt_post_type[2]["not_found_in_trash"] : 'No ' .$cpt_label. ' Found in Trash';
+			$cpt_labels['parent'] = ( $cpt_post_type[2]["parent"] ) ? $cpt_post_type[2]["parent"] : 'Parent ' .$cpt_singular;
 
-						if( is_array( $cpt_post_type[0] ) ) {
-							foreach ( $cpt_post_type[0] as $cpt_supports ) {
-							//build supports variable
-								$cpt_support_array .= '\''.$cpt_supports.'\',';
-							}
-						}
+			if ( is_array( $cpt_post_type[0] ) ) {
+				foreach ( $cpt_post_type[0] as $cpt_supports ) {
+					//build supports variable
+					$cpt_support_array .= '\''.$cpt_supports.'\',';
+				}
+			}
 
-						if( is_array( $cpt_post_type[1] ) ) {
-							foreach ( $cpt_post_type[1] as $cpt_taxes ) {
-							//build taxonomies variable
-								$cpt_tax_array .= '\''.$cpt_taxes.'\',';
-							}
-						}
+			if ( is_array( $cpt_post_type[1] ) ) {
+				foreach ( $cpt_post_type[1] as $cpt_taxes ) {
+					//build taxonomies variable
+					$cpt_tax_array .= '\''.$cpt_taxes.'\',';
+				}
+			}
 
-						$custom_post_type = 'register_post_type(\'' .$cpt_post_type["name"]. '\', array(	\'label\' => \''.__($cpt_label).'\',';
-						$custom_post_type .= 	'\'description\' => \''. $cpt_post_type["description"].'\',';
-						$custom_post_type .= 	'\'public\' => '.disp_boolean($cpt_post_type["public"]).',';
-						$custom_post_type .= 	'\'show_ui\' => '.disp_boolean($cpt_post_type["show_ui"]).',';
-						$custom_post_type .= 	'\'show_in_menu\' => ' .$cpt_show_in_menu .',';
-						$custom_post_type .= 	'\'capability_type\' => \''.$cpt_post_type["capability_type"].'\',';
-						$custom_post_type .= 	'\'hierarchical\' => '.disp_boolean($cpt_post_type["hierarchical"]).',';
-						$custom_post_type .= 	'\'rewrite\' => array(\'slug\' => \'' .$cpt_post_type["rewrite_slug"]. '\'),';
-						$custom_post_type .= 	'\'query_var\' => '. disp_boolean($cpt_post_type["query_var"]).',';
+			$custom_post_type = 'register_post_type(\'' .$cpt_post_type["name"]. '\', array(	\'label\' => \''.__( $cpt_label ).'\',';
+			$custom_post_type .=  '\'description\' => \''. $cpt_post_type["description"].'\',';
+			$custom_post_type .=  '\'public\' => '.disp_boolean( $cpt_post_type["public"] ).',';
+			$custom_post_type .=  '\'show_ui\' => '.disp_boolean( $cpt_post_type["show_ui"] ).',';
+			$custom_post_type .=  '\'show_in_menu\' => ' .$cpt_show_in_menu .',';
+			$custom_post_type .=  '\'capability_type\' => \''.$cpt_post_type["capability_type"].'\',';
+			$custom_post_type .=  '\'hierarchical\' => '.disp_boolean( $cpt_post_type["hierarchical"] ).',';
+			$custom_post_type .=  '\'rewrite\' => array(\'slug\' => \'' .$cpt_post_type["rewrite_slug"]. '\',\'with_front\' => \'' .$cpt_post_type["rewrite_front"]. '\'),';
+			$custom_post_type .=  '\'query_var\' => '. disp_boolean( $cpt_post_type["query_var"] ).',';
 
-						if ( $cpt_post_type["has_archive"] ) {
-						    $custom_post_type .= '\'has_archive\' => '. disp_boolean( $cpt_post_type["has_archive"] ).',';
-						}
+			if ( $cpt_post_type["has_archive"] ) {
+				$custom_post_type .= '\'has_archive\' => '. disp_boolean( $cpt_post_type["has_archive"] ).',';
+			}
 
-						if ( $cpt_post_type["menu_position"] ) {
-						    $custom_post_type .= '\'menu_position\' => '. $cpt_post_type["menu_position"].',';
-						}
+			if ( $cpt_post_type["menu_position"] ) {
+				$custom_post_type .= '\'menu_position\' => '. $cpt_post_type["menu_position"].',';
+				$custom_post_type .= '\'menu_icon\' => '. $cpt_post_type["menu_icon"].',';
+			}
 
-						$custom_post_type .= 	'\'supports\' => array(' .$cpt_support_array.'),';
+			$custom_post_type .=  '\'supports\' => array(' .$cpt_support_array.'),';
 
-						if ( $cpt_tax_array ) {
-							$custom_post_type .= 	'\'taxonomies\' => array(' .$cpt_tax_array.'),';
-						}
-
-						if ( $cpt_labels ) {
-							$custom_post_type .= 	'\'labels\' => '.var_export( $cpt_labels, true ).',';
-						}
-
-						$custom_post_type .= ') );';
-
-						echo _e('Place the below code in your themes functions.php file to manually create this custom post type','cpt-plugin').'<br>';
-						echo _e('This is a <strong>BETA</strong> feature.  Please <a href="http://webdevstudios.com/support/forum/custom-post-type-ui/">report bugs</a>.','cpt-plugin').'<br>';
-						echo '<textarea rows="5" cols="100">' .$custom_post_type .'</textarea>';
-
                         ?>
                     </div>
 				</td>
@@ -704,30 +697,30 @@
                                 <table width="100%" class="widefat">
                                     <thead>
                                         <tr>
-                                            <th><?php _e('Name', 'cpt-plugin');?></th>
-                                            <th><?php _e('Label', 'cpt-plugin');?></th>
-                                            <th><?php _e('Singular Label', 'cpt-plugin');?></th>
-                                            <th><?php _e('Public', 'cpt-plugin');?></th>
-                                            <th><?php _e('Show UI', 'cpt-plugin');?></th>
-                                            <th><?php _e('Capability Type', 'cpt-plugin');?></th>
-                                            <th><?php _e('Hierarchical', 'cpt-plugin');?></th>
-                                            <th><?php _e('Rewrite Slug', 'cpt-plugin');?></th>
-                                            <th><?php _e('Rewrite Slug', 'cpt-plugin');?></th>
-                                            <th><?php _e('Query Var', 'cpt-plugin');?></th>
+                                            <th><?php _e( 'Name', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Label', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Singular Label', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Public', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Show UI', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Capability Type', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Hierarchical', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Rewrite Front', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Rewrite Slug', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Query Var', 'cpt-plugin' );?></th>
                                         </tr>
                                     </thead>
                                     <tfoot>
                                         <tr>
-                                            <th><?php _e('Name', 'cpt-plugin');?></th>
-                                            <th><?php _e('Label', 'cpt-plugin');?></th>
-                                            <th><?php _e('Singular Label', 'cpt-plugin');?></th>
-                                            <th><?php _e('Public', 'cpt-plugin');?></th>
-                                            <th><?php _e('Show UI', 'cpt-plugin');?></th>
-                                            <th><?php _e('Capability Type', 'cpt-plugin');?></th>
-                                            <th><?php _e('Hierarchical', 'cpt-plugin');?></th>
-                                            <th><?php _e('Rewrite Slug', 'cpt-plugin');?></th>
-                                            <th><?php _e('Rewrite Slug', 'cpt-plugin');?></th>
-                                            <th><?php _e('Query Var', 'cpt-plugin');?></th>
+                                            <th><?php _e( 'Name', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Label', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Singular Label', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Public', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Show UI', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Capability Type', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Hierarchical', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Rewrite Front', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Rewrite Slug', 'cpt-plugin' );?></th>
+                                            <th><?php _e( 'Query Var', 'cpt-plugin' );?></th>
                                         </tr>
                                     </tfoot>
                                 <?php
@@ -794,28 +787,30 @@
         <table width="100%" class="widefat">
             <thead>
                 <tr>
-            	<th><?php _e('Action', 'cpt-plugin');?></th>
-            	<th><?php _e('Name', 'cpt-plugin');?></th>
-                <th><?php _e('Label', 'cpt-plugin');?></th>
-                <th><?php _e('Singular Label', 'cpt-plugin');?></th>
-                <th><?php _e('Attached Post Types', 'cpt-plugin');?></th>
-                <th><?php _e('Hierarchical', 'cpt-plugin');?></th>
-                <th><?php _e('Show UI', 'cpt-plugin');?></th>
-                <th><?php _e('Rewrite', 'cpt-plugin');?></th>
-                <th><?php _e('Rewrite Slug', 'cpt-plugin');?></th>
+            	<th><?php _e( 'Action', 'cpt-plugin' );?></th>
+            	<th><?php _e( 'Name', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Label', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Singular Label', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Attached Post Types', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Hierarchical', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Show UI', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Rewrite', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Rewrite Front', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Rewrite Slug', 'cpt-plugin' );?></th>
                 </tr>
             </thead>
             <tfoot>
                 <tr>
-            	<th><?php _e('Action', 'cpt-plugin');?></th>
-            	<th><?php _e('Name', 'cpt-plugin');?></th>
-                <th><?php _e('Label', 'cpt-plugin');?></th>
-                <th><?php _e('Singular Label', 'cpt-plugin');?></th>
-                <th><?php _e('Attached Post Types', 'cpt-plugin');?></th>
-                <th><?php _e('Hierarchical', 'cpt-plugin');?></th>
-                <th><?php _e('Show UI', 'cpt-plugin');?></th>
-                <th><?php _e('Rewrite', 'cpt-plugin');?></th>
-                <th><?php _e('Rewrite Slug', 'cpt-plugin');?></th>
+            	<th><?php _e( 'Action', 'cpt-plugin' );?></th>
+            	<th><?php _e( 'Name', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Label', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Singular Label', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Attached Post Types', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Hierarchical', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Show UI', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Rewrite', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Rewrite Front', 'cpt-plugin' );?></th>
+                <th><?php _e( 'Rewrite Slug', 'cpt-plugin' );?></th>
                 </tr>
             </tfoot>
         <?php
@@ -846,9 +841,10 @@
 				}
 				?>
                 </td>
-                <td valign="top"><?php echo disp_boolean($cpt_tax_type["hierarchical"]); ?></td>
-                <td valign="top"><?php echo disp_boolean($cpt_tax_type["show_ui"]); ?></td>
-                <td valign="top"><?php echo disp_boolean($cpt_tax_type["rewrite"]); ?></td>
+                <td valign="top"><?php echo disp_boolean( $cpt_tax_type["hierarchical"] ); ?></td>
+                <td valign="top"><?php echo disp_boolean( $cpt_tax_type["show_ui"] ); ?></td>
+                <td valign="top"><?php echo disp_boolean( $cpt_tax_type["rewrite"] ); ?></td>
+                <td valign="top"><?php echo disp_boolean( $cpt_tax_type["rewrite_front"] ); ?></td>
                 <td valign="top"><?php echo $rewrite_slug; ?></td>
             </tr>
         	<tr>
@@ -885,7 +881,7 @@
                                 $custom_tax .= 	'\'label\' => \''.$cpt_label.'\',';
                                 $custom_tax .= 	'\'show_ui\' => '.disp_boolean($cpt_tax_type["show_ui"]).',';
                                 $custom_tax .= 	'\'query_var\' => '. disp_boolean($cpt_tax_type["query_var"]).',';
-				$custom_tax .= 	'\'rewrite\' => array(\'slug\' => \'' .$cpt_tax_type["rewrite_slug"]. '\'),';
+				$custom_tax .= 	'\'rewrite\' => array(\'slug\' => \'' .$cpt_tax_type["rewrite_slug"]. '\',\'with_front\' => \'' .$cpt_tax_type["rewrite_front"]. '\'),';
                                 $custom_tax .= 	'\'singular_label\' => \''.$cpt_singular_label.'\'';
                                 $custom_tax .= ') );';
 
@@ -922,41 +918,44 @@
 	}
 
 
-//check if we are editing a custom post type or creating a new one
-If (isset($_GET['edittype']) && !isset($_GET['cpt_edit'])) {
-	check_admin_referer('cpt_edit_post_type');
+	//check if we are editing a custom post type or creating a new one
+	if ( isset( $_GET['edittype'] ) && !isset( $_GET['cpt_edit'] ) ) {
+		check_admin_referer( 'cpt_edit_post_type' );
 
-	//get post type to edit
-	$editType = intval($_GET['edittype']);
+		//get post type to edit
+		$editType = intval( $_GET['edittype'] );
 
-	//load custom posts saved in WP
-	$cpt_options = get_option('cpt_custom_post_types');
+		//load custom posts saved in WP
+		$cpt_options = get_option( 'cpt_custom_post_types' );
 
-	//load custom post type values to edit
-	$cpt_post_type_name = $cpt_options[$editType]["name"];
-	$cpt_label = $cpt_options[$editType]["label"];
-	$cpt_singular_label = $cpt_options[$editType]["singular_label"];
-	$cpt_public = $cpt_options[$editType]["public"];
-	$cpt_showui = $cpt_options[$editType]["show_ui"];
-	$cpt_capability = $cpt_options[$editType]["capability_type"];
-	$cpt_hierarchical = $cpt_options[$editType]["hierarchical"];
-	$cpt_rewrite = $cpt_options[$editType]["rewrite"];
-	$cpt_rewrite_slug = $cpt_options[$editType]["rewrite_slug"];
-	$cpt_query_var = $cpt_options[$editType]["query_var"];
-	$cpt_description = $cpt_options[$editType]["description"];
-	$cpt_menu_position = $cpt_options[$editType]["menu_position"];
-	$cpt_supports = $cpt_options[$editType][0];
-	$cpt_taxes = $cpt_options[$editType][1];
-	$cpt_labels = $cpt_options[$editType][2];
-	$cpt_has_archive = ( isset( $cpt_options[$editType]["has_archive"] ) ) ? $cpt_options[$editType]["has_archive"] : null;
-	$cpt_show_in_menu = ( isset( $cpt_options[$editType]["show_in_menu"] ) ) ? $cpt_options[$editType]["show_in_menu"] : null;
-	$cpt_show_in_menu_string = ( isset( $cpt_options[$editType]["show_in_menu_string"] ) ) ? $cpt_options[$editType]["show_in_menu_string"] : null;
+		//load custom post type values to edit
+		$cpt_post_type_name = $cpt_options[$editType]["name"];
+		$cpt_label = $cpt_options[$editType]["label"];
+		$cpt_singular_label = $cpt_options[$editType]["singular_label"];
+		$cpt_public = $cpt_options[$editType]["public"];
+		$cpt_showui = $cpt_options[$editType]["show_ui"];
+		$cpt_capability = $cpt_options[$editType]["capability_type"];
+		$cpt_hierarchical = $cpt_options[$editType]["hierarchical"];
+		$cpt_rewrite = $cpt_options[$editType]["rewrite"];
+		$cpt_rewrite_front = $cpt_options[$editType]["rewrite_front"];
+		$cpt_rewrite_slug = $cpt_options[$editType]["rewrite_slug"];
+		$cpt_query_var = $cpt_options[$editType]["query_var"];
+		$cpt_description = $cpt_options[$editType]["description"];
+		$cpt_menu_position = $cpt_options[$editType]["menu_position"];
+		$cpt_menu_icon = $cpt_options[$editType]["menu_icon"];
 
-	$cpt_submit_name = 'Save Custom Post Type';
-}Else{
-	$cpt_submit_name = 'Create Custom Post Type';
-}
+		$cpt_supports = $cpt_options[$editType][0];
+		$cpt_taxes = $cpt_options[$editType][1];
+		$cpt_labels = $cpt_options[$editType][2];
+		$cpt_has_archive = ( isset( $cpt_options[$editType]["has_archive"] ) ) ? $cpt_options[$editType]["has_archive"] : null;
+		$cpt_show_in_menu = ( isset( $cpt_options[$editType]["show_in_menu"] ) ) ? $cpt_options[$editType]["show_in_menu"] : null;
+		$cpt_show_in_menu_string = ( isset( $cpt_options[$editType]["show_in_menu_string"] ) ) ? $cpt_options[$editType]["show_in_menu_string"] : null;
 
+		$cpt_submit_name = 'Save Custom Post Type';
+	}else {
+		$cpt_submit_name = 'Create Custom Post Type';
+	}
+
 If (isset($_GET['edittax']) && !isset($_GET['cpt_edit'])) {
 	check_admin_referer('cpt_edit_tax');
 
@@ -966,23 +965,24 @@
 	//load custom posts saved in WP
 	$cpt_options = get_option('cpt_custom_tax_types');
 
-	//load custom post type values to edit
-	$cpt_tax_name = $cpt_options[$editTax]["name"];
-	$cpt_tax_label = $cpt_options[$editTax]["label"];
-	$cpt_singular_label = $cpt_options[$editTax]["singular_label"];
-	$cpt_tax_object_type = ( isset( $cpt_options[$editTax]["cpt_name"] ) ) ? $cpt_options[$editTax]["cpt_name"] : null;
-	$cpt_tax_hierarchical = $cpt_options[$editTax]["hierarchical"];
-	$cpt_tax_showui = $cpt_options[$editTax]["show_ui"];
-	$cpt_tax_query_var = $cpt_options[$editTax]["query_var"];
-	$cpt_tax_rewrite = $cpt_options[$editTax]["rewrite"];
-	$cpt_tax_rewrite_slug = $cpt_options[$editTax]["rewrite_slug"];
-	$cpt_tax_labels = $cpt_options[$editTax][0];
-	$cpt_post_types = $cpt_options[$editTax][1];
+		//load custom post type values to edit
+		$cpt_tax_name = $cpt_options[$editTax]["name"];
+		$cpt_tax_label = $cpt_options[$editTax]["label"];
+		$cpt_singular_label = $cpt_options[$editTax]["singular_label"];
+		$cpt_tax_object_type = ( isset( $cpt_options[$editTax]["cpt_name"] ) ) ? $cpt_options[$editTax]["cpt_name"] : null;
+		$cpt_tax_hierarchical = $cpt_options[$editTax]["hierarchical"];
+		$cpt_tax_showui = $cpt_options[$editTax]["show_ui"];
+		$cpt_tax_query_var = $cpt_options[$editTax]["query_var"];
+		$cpt_tax_rewrite = $cpt_options[$editTax]["rewrite"];
+		$cpt_tax_rewrite_front = $cpt_options[$editTax]["rewrite_front"];
+		$cpt_tax_rewrite_slug = $cpt_options[$editTax]["rewrite_slug"];
+		$cpt_tax_labels = $cpt_options[$editTax][0];
+		$cpt_post_types = $cpt_options[$editTax][1];
 
-	$cpt_tax_submit_name = 'Save Custom Taxonomy';
-}Else{
-	$cpt_tax_submit_name = 'Create Custom Taxonomy';
-}
+		$cpt_tax_submit_name = 'Save Custom Taxonomy';
+	}else {
+		$cpt_tax_submit_name = 'Create Custom Taxonomy';
+	}
 
 //flush rewrite rules
 flush_rewrite_rules();
@@ -1189,6 +1189,16 @@
                     </tr>
 
                     <tr valign="top">
+                    <th scope="row"><?php _e( 'Rewrite Front', 'cpt-plugin' ) ?></th>
+                    <td>
+                        <SELECT name="cpt_custom_post_type[rewrite_front]" tabindex="8">
+                            <OPTION value="0" <?php if ( isset( $cpt_rewrite_front ) ) { if ( $cpt_rewrite_front == 0 && $cpt_rewrite_front != '' ) { echo 'selected="selected"'; } } ?>>False</OPTION>
+                            <OPTION value="1" <?php if ( isset( $cpt_rewrite_front ) ) { if ( $cpt_rewrite_front == 1 || is_null( $cpt_rewrite_front ) ) { echo 'selected="selected"'; } }else { echo 'selected="selected"'; } ?>>True</OPTION>
+                        </SELECT> <a href="#" title="" style="cursor: help;">?</a> (default: True)
+                    </td>
+                    </tr>
+
+                    <tr valign="top">
                     <th scope="row"><?php _e('Custom Rewrite Slug', 'cpt-plugin') ?></th>
                     <td><input type="text" name="cpt_custom_post_type[rewrite_slug]" tabindex="9" value="<?php If (isset($cpt_rewrite_slug)) { echo esc_attr($cpt_rewrite_slug); } ?>" /> <a href="#" title="Custom Post Type Rewrite Slug" style="cursor: help;">?</a> (default: post type name)</td>
                     </tr>
@@ -1215,8 +1225,13 @@
                             <OPTION value="0" <?php If (isset($cpt_show_in_menu)) { If ($cpt_show_in_menu == 0 && $cpt_show_in_menu != '') { echo 'selected="selected"'; } } ?>>False</OPTION>
                             <OPTION value="1" <?php If (isset($cpt_show_in_menu)) { If ($cpt_show_in_menu == 1 || is_null($cpt_show_in_menu)) { echo 'selected="selected"'; } }Else{ echo 'selected="selected"'; } ?>>True</OPTION>
                         </SELECT> <a href="#" title="" style="cursor: help;">?</a> Top level page (e.g. 'plugins.php')
-			<input type="text" name="cpt_custom_post_type[show_in_menu_string]" tabindex="12" size="5" value="<?php If (isset($cpt_show_in_menu_string)) { echo esc_attr($cpt_show_in_menu_string); } ?>" /> <a href="#" title="Whether to show the post type in the admin menu and where to show that menu. Note that show_ui must be true" style="cursor: help;">?</a></td>
+			<input type="text" name="cpt_custom_post_type[show_in_menu_string]" tabindex="12" size="5" value="<?php if ( isset( $cpt_show_in_menu_string ) ) { echo esc_attr( $cpt_show_in_menu_string ); } ?>" /> <a href="#" title="Whether to show the post type in the admin menu and where to show that menu. Note that show_ui must be true" style="cursor: help;">?</a></td>
                     </tr>
+                    
+                    <tr valign="top">
+                    <th scope="row"><?php _e( 'Menu Icon', 'cpt-plugin' ) ?></th>
+                    <td><input type="text" name="cpt_custom_post_type[menu_icon]" size="30" value="<?php if ( isset( $cpt_menu_icon ) ) { echo esc_attr( $cpt_menu_icon ); } ?>" /> <a href="#" title="The menu icon of the custom post type. Example: /wp-content/themes/mytheme/img/icon-painting.png" style="cursor: help;">?</a></td>
+                    </tr>
 
                     <tr valign="top">
                     <th scope="row"><?php _e('Supports', 'cpt-plugin') ?></th>
@@ -1433,6 +1448,16 @@
                     </tr>
 
                     <tr valign="top">
+                    <th scope="row"><?php _e( 'Rewrite Front', 'cpt-plugin' ) ?></th>
+                    <td>
+                        <SELECT name="cpt_custom_tax[rewrite_front]" tabindex="28">
+                            <OPTION value="0" <?php if ( isset( $cpt_tax_rewrite_front ) ) { if ( $cpt_tax_rewrite_front == 0 && $cpt_tax_rewrite_front != '' ) { echo 'selected="selected"'; } } ?>>False</OPTION>
+                            <OPTION value="1" <?php if ( isset( $cpt_tax_rewrite_front ) ) { if ( $cpt_tax_rewrite_front == 1 || is_null( $cpt_tax_rewrite_front ) ) { echo 'selected="selected"'; } }else { echo 'selected="selected"'; } ?>>True</OPTION>
+                        </SELECT> <a href="#" title="" style="cursor: help;">?</a> (default: True)
+                    </td>
+                    </tr>
+
+                    <tr valign="top">
                     <th scope="row"><?php _e('Custom Rewrite Slug', 'cpt-plugin') ?></th>
                     <td><input type="text" name="cpt_custom_tax[rewrite_slug]" tabindex="9" value="<?php If (isset($cpt_tax_rewrite_slug)) { echo esc_attr($cpt_tax_rewrite_slug); } ?>" /> <a href="#" title="Custom Taxonomy Rewrite Slug" style="cursor: help;">?</a> (default: taxonomy name)</td>
                     </tr>