diff --git a/apps_product_creator/__manifest__.py b/apps_product_creator/__manifest__.py
index e1066a18..28a72622 100644
--- a/apps_product_creator/__manifest__.py
+++ b/apps_product_creator/__manifest__.py
@@ -12,10 +12,12 @@
         'github_connector_oca',
         'github_connector_odoo',
         'product',
+        'website_sale',
     ],
     'data': [
         'data/ir_cron.xml',
         'data/product_attribute.xml',
+        'data/product_public_categ_data.xml',
         'views/view_odoo_module.xml',
         'views/view_product_product.xml',
     ],
diff --git a/apps_product_creator/data/product_public_categ_data.xml b/apps_product_creator/data/product_public_categ_data.xml
new file mode 100644
index 00000000..213e77e6
--- /dev/null
+++ b/apps_product_creator/data/product_public_categ_data.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2016-Today: Odoo Community Association (OCA)
+@author: Oscar Alcala (https://twitter.com/oscarolar)
+License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
+<odoo noupdate="1">
+    <record id="accounting" model="product.public.category">
+        <field name="name">Accounting</field>
+        <field name="sequence">1</field>
+    </record>
+    <record id="discuss" model="product.public.category">
+        <field name="name">Discuss</field>
+        <field name="sequence">2</field>
+    </record>
+    <record id="document_management" model="product.public.category">
+        <field name="name">Document Management</field>
+        <field name="sequence">3</field>
+    </record>
+    <record id="ecommerce" model="product.public.category">
+        <field name="name">eCommerce</field>
+        <field name="sequence">4</field>
+    </record>
+    <record id="human_resources" model="product.public.category">
+        <field name="name">Human Resources</field>
+        <field name="sequence">5</field>
+    </record>
+    <record id="industries" model="product.public.category">
+        <field name="name">Industries</field>
+        <field name="sequence">6</field>
+    </record>
+    <record id="localization" model="product.public.category">
+        <field name="name">Localization</field>
+        <field name="sequence">7</field>
+    </record>
+    <record id="manufacturing" model="product.public.category">
+        <field name="name">Manufacturing</field>
+        <field name="sequence">8</field>
+    </record>
+    <record id="point_of_sale" model="product.public.category">
+        <field name="name">Point of Sale</field>
+        <field name="sequence">9</field>
+    </record>
+    <record id="productivity" model="product.public.category">
+        <field name="name">Productivity</field>
+        <field name="sequence">10</field>
+    </record>
+    <record id="project" model="product.public.category">
+        <field name="name">Project</field>
+        <field name="sequence">11</field>
+    </record>
+    <record id="purchases" model="product.public.category">
+        <field name="name">Purchases</field>
+        <field name="sequence">12</field>
+    </record>
+    <record id="sales" model="product.public.category">
+        <field name="name">Sales</field>
+        <field name="sequence">13</field>
+    </record>
+    <record id="warehouse" model="product.public.category">
+        <field name="name">Warehouse</field>
+        <field name="sequence">14</field>
+    </record>
+    <record id="website" model="product.public.category">
+        <field name="name">Website</field>
+        <field name="sequence">15</field>
+    </record>
+    <record id="extra_tools" model="product.public.category">
+        <field name="name">Extra Tools</field>
+        <field name="sequence">16</field>
+    </record>
+    <record id="other" model="product.public.category">
+        <field name="name">Other</field>
+        <field name="sequence">17</field>
+    </record>
+</odoo>
diff --git a/apps_product_creator/models/odoo_module.py b/apps_product_creator/models/odoo_module.py
index f089c170..74610a95 100644
--- a/apps_product_creator/models/odoo_module.py
+++ b/apps_product_creator/models/odoo_module.py
@@ -84,6 +84,7 @@ def _prepare_template(self):
         """
         self.ensure_one()
         attribute_obj = self.env['product.attribute.value']
+        categ_obj = self.env['product.public.category']
         series = self.module_version_ids.mapped(
             'repository_branch_id.organization_serie_id.name')
         attributes = attribute_obj.search([('name', 'in', series)])
@@ -93,6 +94,11 @@ def _prepare_template(self):
             'attribute_id': attribute.id,
             'value_ids': [(6, 0, attributes.ids)],
         }
+        version_categ = self.module_version_ids.mapped('category_id')
+        category = categ_obj.search(
+            [('name', '=', version_categ.name)], limit=1)
+        if not category:
+            category = self.env.ref('apps_product_creator.other')
         values = {
             'odoo_module_id': self.id,
             'type': 'service',
@@ -103,7 +109,8 @@ def _prepare_template(self):
             'image': self.image,
             'attribute_line_ids': [
                 (0, 0, attribute_line_values),
-            ]
+            ],
+            'public_categ_ids': [(4, category._ids)] or None,
         }
         return values
 
diff --git a/website_apps_store/views/templates.xml b/website_apps_store/views/templates.xml
index 3fa68cfa..76af2355 100644
--- a/website_apps_store/views/templates.xml
+++ b/website_apps_store/views/templates.xml
@@ -13,6 +13,9 @@
                     <span class="caret"></span>
                 </a>
                 <ul class="dropdown-menu" role="menu">
+                    <li t-att-class="'active' if not category else ''">
+                        <a href="/shop">All</a>
+                    </li>
                     <t t-foreach="category_all" t-as="c">
                         <li t-att-class="'active' if c.id == int(category or 0) else None">
                             <a t-att-href="keep('/shop/category/' + slug(c), category=0)" t-field="c.name"></a>
@@ -47,6 +50,18 @@
                 <t t-call="website_apps_store.category_display"/>
                 <t t-call="website_apps_store.version_display"/>
             </xpath>
+            <xpath expr="//t[@t-set='website_sale_sortable']" position="replace">
+                <t t-set="website_sale_sortable" t-value="[
+                (name_asc_label, 'name asc'),
+                (name_desc_label, 'name desc')
+            ]"/>
+            </xpath>
+        </template>
+
+        <template id="search_placeholder" inherit_id="website.website_search_box">
+            <xpath expr="//input" position="attributes">
+                <attribute name="placeholder">Name, Author, Version...</attribute>
+            </xpath>
         </template>
 
         <template id="products_item_customize" inherit_id="website_sale.products_item">
@@ -149,6 +164,14 @@
                         <span class="tech_detail" t-esc="product_var_id.odoo_module_version_id.module_id.technical_name"/>
                     </div>
                 </div>
+                <div class="col-xs-12 padd_0" t-if="product.odoo_module_id and len(product.odoo_module_id.organization_serie_ids) == 1">
+                    <div class="pull-left text-left col-xs-4 padd_0">
+                        <b>Version: </b>
+                    </div>
+                    <div class="pull-right col-xs-8 padd_0">
+                        <span class="tech_detail" t-esc="product_var_id.odoo_module_id.organization_serie_ids[0].name"/>
+                    </div>
+                </div>
                 <div class="col-xs-12 padd_0" t-if="product.odoo_module_id">
                     <div class="pull-left text-left col-xs-4 padd_0">
                         <b>License: </b>