diff --git a/woocommerce_taxonomy.php b/woocommerce_taxonomy.php
index a20f431eb4d..5ce1bacce27 100644
--- a/woocommerce_taxonomy.php
+++ b/woocommerce_taxonomy.php
@@ -10,81 +10,232 @@
  */
  
 /**
- * Custom Post Types
+ * Custom Post Types and taxonomies
  **/
 function woocommerce_post_type() {
-
 	global $wpdb, $woocommerce;
 	
 	$shop_page_id = get_option('woocommerce_shop_page_id');
-	
 	$base_slug = ($shop_page_id > 0 && get_page( $shop_page_id )) ? get_page_uri( $shop_page_id ) : 'shop';	
 	
-	$product_base 	= '';
-	$category_base 	= '';
-	
-	if (get_option('woocommerce_prepend_shop_page_to_urls')=="yes") :
-		$category_base = trailingslashit($base_slug);
-	endif;
-	
-	if (get_option('woocommerce_prepend_shop_page_to_products')=='yes') :
-		$product_base = trailingslashit($base_slug);
-	else :
-		$product_base = trailingslashit(__('product', 'woothemes'));
-	endif;
-	
-	if (get_option('woocommerce_prepend_category_to_products')=='yes') :
-		$product_base .= trailingslashit('%product_cat%');
-	endif;
+	$category_base = (get_option('woocommerce_prepend_shop_page_to_urls')=="yes") ? trailingslashit($base_slug) : '';
 	
+	$product_base = (get_option('woocommerce_prepend_shop_page_to_products')=='yes') ? trailingslashit($base_slug) : trailingslashit(__('product', 'woothemes'));
+	if (get_option('woocommerce_prepend_category_to_products')=='yes') $product_base .= trailingslashit('%product_cat%');
 	$product_base = untrailingslashit($product_base);
 	
 	if (current_user_can('manage_woocommerce')) $show_in_menu = 'woocommerce'; else $show_in_menu = true;
+
+	register_post_type( "product",
+		array(
+			'labels' => array(
+					'name' 					=> __( 'Products', 'woothemes' ),
+					'singular_name' 		=> __( 'Product', 'woothemes' ),
+					'add_new' 				=> __( 'Add Product', 'woothemes' ),
+					'add_new_item' 			=> __( 'Add New Product', 'woothemes' ),
+					'edit' 					=> __( 'Edit', 'woothemes' ),
+					'edit_item' 			=> __( 'Edit Product', 'woothemes' ),
+					'new_item' 				=> __( 'New Product', 'woothemes' ),
+					'view' 					=> __( 'View Product', 'woothemes' ),
+					'view_item' 			=> __( 'View Product', 'woothemes' ),
+					'search_items' 			=> __( 'Search Products', 'woothemes' ),
+					'not_found' 			=> __( 'No Products found', 'woothemes' ),
+					'not_found_in_trash' 	=> __( 'No Products found in trash', 'woothemes' ),
+					'parent' 				=> __( 'Parent Product', 'woothemes' )
+				),
+			'description' 			=> __( 'This is where you can add new products to your store.', 'woothemes' ),
+			'public' 				=> true,
+			'show_ui' 				=> true,
+			'capability_type' 		=> 'post',
+			'publicly_queryable' 	=> true,
+			'exclude_from_search' 	=> false,
+			'hierarchical' 			=> true,
+			'rewrite' 				=> array( 'slug' => $product_base, 'with_front' => false ),
+			'query_var' 			=> true,			
+			'supports' 				=> array( 'title', 'editor', 'excerpt', 'thumbnail', 'comments' ),
+			'has_archive' 			=> $base_slug,
+			'show_in_nav_menus' 	=> false,
+		)
+	);
 	
+	register_post_type( "product_variation",
+		array(
+			'labels' => array(
+					'name' 					=> __( 'Variations', 'woothemes' ),
+					'singular_name' 		=> __( 'Variation', 'woothemes' ),
+					'add_new' 				=> __( 'Add Variation', 'woothemes' ),
+					'add_new_item' 			=> __( 'Add New Variation', 'woothemes' ),
+					'edit' 					=> __( 'Edit', 'woothemes' ),
+					'edit_item' 			=> __( 'Edit Variation', 'woothemes' ),
+					'new_item' 				=> __( 'New Variation', 'woothemes' ),
+					'view' 					=> __( 'View Variation', 'woothemes' ),
+					'view_item' 			=> __( 'View Variation', 'woothemes' ),
+					'search_items' 			=> __( 'Search Variations', 'woothemes' ),
+					'not_found' 			=> __( 'No Variations found', 'woothemes' ),
+					'not_found_in_trash' 	=> __( 'No Variations found in trash', 'woothemes' ),
+					'parent' 				=> __( 'Parent Variation', 'woothemes' )
+				),
+			'public' 				=> true,
+			'show_ui' 				=> false,
+			'capability_type' 		=> 'post',
+			'publicly_queryable' 	=> true,
+			'exclude_from_search' 	=> true,
+			'hierarchical' 			=> true,
+			'rewrite' 				=> false,
+			'query_var'				=> true,			
+			'supports' 				=> array( 'title', 'editor', 'custom-fields', 'page-attributes', 'thumbnail' ),
+			'show_in_nav_menus' 	=> false
+		)
+	);
+    
+    register_post_type( "shop_order",
+		array(
+			'labels' => array(
+					'name' 					=> __( 'Orders', 'woothemes' ),
+					'singular_name' 		=> __( 'Order', 'woothemes' ),
+					'add_new' 				=> __( 'Add Order', 'woothemes' ),
+					'add_new_item' 			=> __( 'Add New Order', 'woothemes' ),
+					'edit' 					=> __( 'Edit', 'woothemes' ),
+					'edit_item' 			=> __( 'Edit Order', 'woothemes' ),
+					'new_item' 				=> __( 'New Order', 'woothemes' ),
+					'view' 					=> __( 'View Order', 'woothemes' ),
+					'view_item' 			=> __( 'View Order', 'woothemes' ),
+					'search_items' 			=> __( 'Search Orders', 'woothemes' ),
+					'not_found' 			=> __( 'No Orders found', 'woothemes' ),
+					'not_found_in_trash' 	=> __( 'No Orders found in trash', 'woothemes' ),
+					'parent' 				=> __( 'Parent Orders', 'woothemes' )
+				),
+			'description' 			=> __( 'This is where store orders are stored.', 'woothemes' ),
+			'public' 				=> true,
+			'show_ui' 				=> true,
+			'capability_type' 		=> 'post',
+			'publicly_queryable' 	=> false,
+			'exclude_from_search' 	=> true,
+			'show_in_menu' 			=> $show_in_menu,
+			'hierarchical' 			=> false,
+			'show_in_nav_menus' 	=> false,
+			'rewrite' 				=> false,
+			'query_var' 			=> true,			
+			'supports' 				=> array( 'title', 'comments', 'custom-fields' ),
+			'has_archive' 			=> false
+		)
+	);
+
+    register_post_type( "shop_coupon",
+		array(
+			'labels' => array(
+					'name' 					=> __( 'Coupons', 'woothemes' ),
+					'singular_name' 		=> __( 'Coupon', 'woothemes' ),
+					'add_new' 				=> __( 'Add Coupon', 'woothemes' ),
+					'add_new_item' 			=> __( 'Add New Coupon', 'woothemes' ),
+					'edit' 					=> __( 'Edit', 'woothemes' ),
+					'edit_item' 			=> __( 'Edit Coupon', 'woothemes' ),
+					'new_item' 				=> __( 'New Coupon', 'woothemes' ),
+					'view' 					=> __( 'View Coupons', 'woothemes' ),
+					'view_item' 			=> __( 'View Coupon', 'woothemes' ),
+					'search_items' 			=> __( 'Search Coupons', 'woothemes' ),
+					'not_found' 			=> __( 'No Coupons found', 'woothemes' ),
+					'not_found_in_trash' 	=> __( 'No Coupons found in trash', 'woothemes' ),
+					'parent' 				=> __( 'Parent Coupon', 'woothemes' )
+				),
+			'description' 			=> __( 'This is where you can add new coupons that customers can use in your store.', 'woothemes' ),
+			'public' 				=> true,
+			'show_ui' 				=> true,
+			'capability_type' 		=> 'post',
+			'publicly_queryable' 	=> true,
+			'exclude_from_search' 	=> true,
+			'show_in_menu' 			=> $show_in_menu,
+			'hierarchical' 			=> false,
+			'rewrite' 				=> false,
+			'query_var' 			=> false,			
+			'supports' 				=> array( 'title' ),
+			'show_in_nav_menus'		=> false,
+		)
+	);
+	
+	/**
+	 * Taxonomies
+	 **/
+	$product_type_query_var = (is_admin()) ? true : false;
+	  
+	register_taxonomy( 'product_type',
+        array('product'),
+        array(
+            'hierarchical' 			=> false,
+            'show_ui' 				=> false,
+            'show_in_nav_menus' 	=> false,
+            'query_var' 			=> $product_type_query_var,
+            'rewrite'				=> false
+        )
+    );
 	register_taxonomy( 'product_cat',
         array('product'),
         array(
-            'hierarchical' => true,
+            'hierarchical' 			=> true,
             'update_count_callback' => '_update_post_term_count',
-            'label' => __( 'Categories', 'woothemes'),
+            'label' 				=> __( 'Categories', 'woothemes'),
             'labels' => array(
-                    'name' => __( 'Categories', 'woothemes'),
-                    'singular_name' => __( 'Product Category', 'woothemes'),
-                    'search_items' =>  __( 'Search Product Categories', 'woothemes'),
-                    'all_items' => __( 'All Product Categories', 'woothemes'),
-                    'parent_item' => __( 'Parent Product Category', 'woothemes'),
+                    'name' 				=> __( 'Categories', 'woothemes'),
+                    'singular_name' 	=> __( 'Product Category', 'woothemes'),
+                    'search_items' 		=>  __( 'Search Product Categories', 'woothemes'),
+                    'all_items' 		=> __( 'All Product Categories', 'woothemes'),
+                    'parent_item' 		=> __( 'Parent Product Category', 'woothemes'),
                     'parent_item_colon' => __( 'Parent Product Category:', 'woothemes'),
-                    'edit_item' => __( 'Edit Product Category', 'woothemes'),
-                    'update_item' => __( 'Update Product Category', 'woothemes'),
-                    'add_new_item' => __( 'Add New Product Category', 'woothemes'),
-                    'new_item_name' => __( 'New Product Category Name', 'woothemes')
-            ),
-            'show_ui' => true,
-            'query_var' => true,
-            'rewrite' => array( 'slug' => $category_base . _x('product-category', 'slug', 'woothemes'), 'with_front' => false ),
+                    'edit_item' 		=> __( 'Edit Product Category', 'woothemes'),
+                    'update_item' 		=> __( 'Update Product Category', 'woothemes'),
+                    'add_new_item' 		=> __( 'Add New Product Category', 'woothemes'),
+                    'new_item_name' 	=> __( 'New Product Category Name', 'woothemes')
+            	),
+            'show_ui' 				=> true,
+            'query_var' 			=> true,
+            'rewrite' 				=> array( 'slug' => $category_base . _x('product-category', 'slug', 'woothemes'), 'with_front' => false ),
         )
     );
     
     register_taxonomy( 'product_tag',
         array('product'),
         array(
-            'hierarchical' => false,
-            'label' => __( 'Tags', 'woothemes'),
+            'hierarchical' 			=> false,
+            'label' 				=> __( 'Tags', 'woothemes'),
             'labels' => array(
-                    'name' => __( 'Tags', 'woothemes'),
-                    'singular_name' => __( 'Product Tag', 'woothemes'),
-                    'search_items' =>  __( 'Search Product Tags', 'woothemes'),
-                    'all_items' => __( 'All Product Tags', 'woothemes'),
-                    'parent_item' => __( 'Parent Product Tag', 'woothemes'),
+                    'name' 				=> __( 'Tags', 'woothemes'),
+                    'singular_name' 	=> __( 'Product Tag', 'woothemes'),
+                    'search_items' 		=>  __( 'Search Product Tags', 'woothemes'),
+                    'all_items' 		=> __( 'All Product Tags', 'woothemes'),
+                    'parent_item' 		=> __( 'Parent Product Tag', 'woothemes'),
                     'parent_item_colon' => __( 'Parent Product Tag:', 'woothemes'),
-                    'edit_item' => __( 'Edit Product Tag', 'woothemes'),
-                    'update_item' => __( 'Update Product Tag', 'woothemes'),
-                    'add_new_item' => __( 'Add New Product Tag', 'woothemes'),
-                    'new_item_name' => __( 'New Product Tag Name', 'woothemes')
-            ),
-            'show_ui' => true,
-            'query_var' => true,
-            'rewrite' => array( 'slug' => $category_base . _x('product-tag', 'slug', 'woothemes'), 'with_front' => false ),
+                    'edit_item' 		=> __( 'Edit Product Tag', 'woothemes'),
+                    'update_item' 		=> __( 'Update Product Tag', 'woothemes'),
+                    'add_new_item' 		=> __( 'Add New Product Tag', 'woothemes'),
+                    'new_item_name' 	=> __( 'New Product Tag Name', 'woothemes')
+            	),
+            'show_ui' 				=> true,
+            'query_var' 			=> true,
+            'rewrite' 				=> array( 'slug' => $category_base . _x('product-tag', 'slug', 'woothemes'), 'with_front' => false ),
+        )
+    );
+    
+    register_taxonomy( 'shop_order_status',
+        array('shop_order'),
+        array(
+            'hierarchical' 			=> true,
+            'update_count_callback' => '_update_post_term_count',
+            'labels' => array(
+                    'name' 				=> __( 'Order statuses', 'woothemes'),
+                    'singular_name' 	=> __( 'Order status', 'woothemes'),
+                    'search_items' 		=>  __( 'Search Order statuses', 'woothemes'),
+                    'all_items' 		=> __( 'All  Order statuses', 'woothemes'),
+                    'parent_item' 		=> __( 'Parent Order status', 'woothemes'),
+                    'parent_item_colon' => __( 'Parent Order status:', 'woothemes'),
+                    'edit_item' 		=> __( 'Edit Order status', 'woothemes'),
+                    'update_item' 		=> __( 'Update Order status', 'woothemes'),
+                    'add_new_item' 		=> __( 'Add New Order status', 'woothemes'),
+                    'new_item_name' 	=> __( 'New Order status Name', 'woothemes')
+           	 ),
+            'show_ui' 				=> false,
+            'show_in_nav_menus' 	=> false,
+            'query_var' 			=> false,
+            'rewrite' 				=> false,
         )
     );
     
@@ -103,191 +254,29 @@ function woocommerce_post_type() {
 	    		register_taxonomy( $name,
 			        array('product'),
 			        array(
-			            'hierarchical' => $hierarchical,
+			            'hierarchical' 				=> $hierarchical,
 			            'labels' => array(
-			                    'name' => $label,
-			                    'singular_name' => $label,
-			                    'search_items' =>  __( 'Search', 'woothemes') . ' ' . $label,
-			                    'all_items' => __( 'All', 'woothemes') . ' ' . $label,
-			                    'parent_item' => __( 'Parent', 'woothemes') . ' ' . $label,
-			                    'parent_item_colon' => __( 'Parent', 'woothemes') . ' ' . $label . ':',
-			                    'edit_item' => __( 'Edit', 'woothemes') . ' ' . $label,
-			                    'update_item' => __( 'Update', 'woothemes') . ' ' . $label,
-			                    'add_new_item' => __( 'Add New', 'woothemes') . ' ' . $label,
-			                    'new_item_name' => __( 'New', 'woothemes') . ' ' . $label
-			            ),
-			            'show_ui' => false,
-			            'query_var' => true,
-			            'show_in_nav_menus' => $show_in_nav_menus,
-			            'rewrite' => array( 'slug' => $category_base . strtolower(sanitize_title($tax->attribute_name)), 'with_front' => false, 'hierarchical' => $hierarchical ),
+			                    'name' 						=> $label,
+			                    'singular_name' 			=> $label,
+			                    'search_items' 				=>  __( 'Search', 'woothemes') . ' ' . $label,
+			                    'all_items' 				=> __( 'All', 'woothemes') . ' ' . $label,
+			                    'parent_item' 				=> __( 'Parent', 'woothemes') . ' ' . $label,
+			                    'parent_item_colon' 		=> __( 'Parent', 'woothemes') . ' ' . $label . ':',
+			                    'edit_item' 				=> __( 'Edit', 'woothemes') . ' ' . $label,
+			                    'update_item' 				=> __( 'Update', 'woothemes') . ' ' . $label,
+			                    'add_new_item' 				=> __( 'Add New', 'woothemes') . ' ' . $label,
+			                    'new_item_name' 			=> __( 'New', 'woothemes') . ' ' . $label
+			            	),
+			            'show_ui' 					=> false,
+			            'query_var' 				=> true,
+			            'show_in_nav_menus' 		=> $show_in_nav_menus,
+			            'rewrite' 					=> array( 'slug' => $category_base . strtolower(sanitize_title($tax->attribute_name)), 'with_front' => false, 'hierarchical' => $hierarchical ),
 			        )
 			    );
 	    		
 	    	endif;
 	    endforeach;    	
     endif;
-    
-	register_post_type( "product",
-		array(
-			'labels' => array(
-				'name' => __( 'Products', 'woothemes' ),
-				'singular_name' => __( 'Product', 'woothemes' ),
-				'add_new' => __( 'Add Product', 'woothemes' ),
-				'add_new_item' => __( 'Add New Product', 'woothemes' ),
-				'edit' => __( 'Edit', 'woothemes' ),
-				'edit_item' => __( 'Edit Product', 'woothemes' ),
-				'new_item' => __( 'New Product', 'woothemes' ),
-				'view' => __( 'View Product', 'woothemes' ),
-				'view_item' => __( 'View Product', 'woothemes' ),
-				'search_items' => __( 'Search Products', 'woothemes' ),
-				'not_found' => __( 'No Products found', 'woothemes' ),
-				'not_found_in_trash' => __( 'No Products found in trash', 'woothemes' ),
-				'parent' => __( 'Parent Product', 'woothemes' )
-			),
-			'description' => __( 'This is where you can add new products to your store.', 'woothemes' ),
-			'public' => true,
-			'show_ui' => true,
-			'capability_type' => 'post',
-			'publicly_queryable' => true,
-			'exclude_from_search' => false,
-			'hierarchical' => true,
-			'rewrite' => array( 'slug' => $product_base, 'with_front' => false ),
-			'query_var' => true,			
-			'supports' => array( 'title', 'editor', 'excerpt', 'thumbnail', 'comments' ),
-			'has_archive' => $base_slug,
-			'show_in_nav_menus' => false,
-		)
-	);
-	
-	register_post_type( "product_variation",
-		array(
-			'labels' => array(
-				'name' => __( 'Variations', 'woothemes' ),
-				'singular_name' => __( 'Variation', 'woothemes' ),
-				'add_new' => __( 'Add Variation', 'woothemes' ),
-				'add_new_item' => __( 'Add New Variation', 'woothemes' ),
-				'edit' => __( 'Edit', 'woothemes' ),
-				'edit_item' => __( 'Edit Variation', 'woothemes' ),
-				'new_item' => __( 'New Variation', 'woothemes' ),
-				'view' => __( 'View Variation', 'woothemes' ),
-				'view_item' => __( 'View Variation', 'woothemes' ),
-				'search_items' => __( 'Search Variations', 'woothemes' ),
-				'not_found' => __( 'No Variations found', 'woothemes' ),
-				'not_found_in_trash' => __( 'No Variations found in trash', 'woothemes' ),
-				'parent' => __( 'Parent Variation', 'woothemes' )
-			),
-			'public' => true,
-			'show_ui' => false,
-			'capability_type' => 'post',
-			'publicly_queryable' => true,
-			'exclude_from_search' => true,
-			'hierarchical' => true,
-			'rewrite' => false,
-			'query_var' => true,			
-			'supports' => array( 'title', 'editor', 'custom-fields', 'page-attributes', 'thumbnail' ),
-			'show_in_nav_menus' => false,
-			//'show_in_menu' => 'edit.php?post_type=product'
-		)
-	);
-	
-    register_taxonomy( 'product_type',
-        array('product'),
-        array(
-            'hierarchical' => false,
-            'show_ui' => false,
-            'query_var' => true,
-            'show_in_nav_menus' => false,
-        )
-    );
-    
-    register_post_type( "shop_order",
-		array(
-			'labels' => array(
-				'name' => __( 'Orders', 'woothemes' ),
-				'singular_name' => __( 'Order', 'woothemes' ),
-				'add_new' => __( 'Add Order', 'woothemes' ),
-				'add_new_item' => __( 'Add New Order', 'woothemes' ),
-				'edit' => __( 'Edit', 'woothemes' ),
-				'edit_item' => __( 'Edit Order', 'woothemes' ),
-				'new_item' => __( 'New Order', 'woothemes' ),
-				'view' => __( 'View Order', 'woothemes' ),
-				'view_item' => __( 'View Order', 'woothemes' ),
-				'search_items' => __( 'Search Orders', 'woothemes' ),
-				'not_found' => __( 'No Orders found', 'woothemes' ),
-				'not_found_in_trash' => __( 'No Orders found in trash', 'woothemes' ),
-				'parent' => __( 'Parent Orders', 'woothemes' )
-			),
-			'description' => __( 'This is where store orders are stored.', 'woothemes' ),
-			'public' => true,
-			'show_ui' => true,
-			'capability_type' => 'post',
-			'publicly_queryable' => false,
-			'exclude_from_search' => true,
-			'show_in_menu' => $show_in_menu,
-			'hierarchical' => false,
-			'show_in_nav_menus' => false,
-			'rewrite' => false,
-			'query_var' => true,			
-			'supports' => array( 'title', 'comments', 'custom-fields' ),
-			'has_archive' => false
-		)
-	);
-
-    register_taxonomy( 'shop_order_status',
-        array('shop_order'),
-        array(
-            'hierarchical' => true,
-            'update_count_callback' => '_update_post_term_count',
-            'labels' => array(
-                    'name' => __( 'Order statuses', 'woothemes'),
-                    'singular_name' => __( 'Order status', 'woothemes'),
-                    'search_items' =>  __( 'Search Order statuses', 'woothemes'),
-                    'all_items' => __( 'All  Order statuses', 'woothemes'),
-                    'parent_item' => __( 'Parent Order status', 'woothemes'),
-                    'parent_item_colon' => __( 'Parent Order status:', 'woothemes'),
-                    'edit_item' => __( 'Edit Order status', 'woothemes'),
-                    'update_item' => __( 'Update Order status', 'woothemes'),
-                    'add_new_item' => __( 'Add New Order status', 'woothemes'),
-                    'new_item_name' => __( 'New Order status Name', 'woothemes')
-            ),
-            'show_ui' => false,
-            'show_in_nav_menus' => false,
-            'query_var' => true,
-            'rewrite' => false,
-        )
-    );
-    
-    register_post_type( "shop_coupon",
-		array(
-			'labels' => array(
-				'name' => __( 'Coupons', 'woothemes' ),
-				'singular_name' => __( 'Coupon', 'woothemes' ),
-				'add_new' => __( 'Add Coupon', 'woothemes' ),
-				'add_new_item' => __( 'Add New Coupon', 'woothemes' ),
-				'edit' => __( 'Edit', 'woothemes' ),
-				'edit_item' => __( 'Edit Coupon', 'woothemes' ),
-				'new_item' => __( 'New Coupon', 'woothemes' ),
-				'view' => __( 'View Coupons', 'woothemes' ),
-				'view_item' => __( 'View Coupon', 'woothemes' ),
-				'search_items' => __( 'Search Coupons', 'woothemes' ),
-				'not_found' => __( 'No Coupons found', 'woothemes' ),
-				'not_found_in_trash' => __( 'No Coupons found in trash', 'woothemes' ),
-				'parent' => __( 'Parent Coupon', 'woothemes' )
-			),
-			'description' => __( 'This is where you can add new coupons that customers can use in your store.', 'woothemes' ),
-			'public' => true,
-			'show_ui' => true,
-			'capability_type' => 'post',
-			'publicly_queryable' => true,
-			'exclude_from_search' => true,
-			'show_in_menu' => $show_in_menu,
-			'hierarchical' => false,
-			'rewrite' => false,
-			'query_var' => false,			
-			'supports' => array( 'title' ),
-			'show_in_nav_menus' => false,
-		)
-	);
 }