3 files changed, 30 insertions, 18 deletions
diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
index 9f3aca3c0..d6d493827 100644
--- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl
+++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
@@ -29,7 +29,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% style_urls = [ "extensions/BMO/web/styles/choose_product.css" ] %] 
+[% style_urls = [ "extensions/BMO/web/styles/choose_product.css" ] %]
 
 [% IF target == "enter_bug.cgi" %]
   [% title = "Enter $terms.Bug" %]
@@ -68,7 +68,7 @@
   ProdCompSearch.script_name = '[% target FILTER js %]';
 </script>
 <div id="prod_comp_search_main">
-  [% PROCESS prodcompsearch/form.html.tmpl 
+  [% PROCESS prodcompsearch/form.html.tmpl
      input_label = "Find product:"
   %]
 </div>
@@ -90,32 +90,37 @@
    icon="firefox.png"
 %]
 [% INCLUDE easyproduct
-   name="Thunderbird"
-   icon="thunderbird.png"
+   name="Boot2Gecko"
+   icon="firefox.png"
+   caption="Firefox OS"
 %]
 [% INCLUDE easyproduct
-   name="Calendar"
-   icon="sunbird.png"
+   name="Firefox for Android"
+   icon="firefox.png"
 %]
 [% INCLUDE easyproduct
-   name="Camino"
-   icon="camino.png"
+   name="Firefox for Metro"
+   icon="firefox.png"
 %]
 [% INCLUDE easyproduct
-   name="SeaMonkey"
-   icon="seamonkey.png"
+   name="Toolkit"
+   icon="dino.png"
 %]
 [% INCLUDE easyproduct
-   name="Firefox for Android"
-   icon="firefox.png"
+   name="Marketplace"
+   icon="marketplace.png"
 %]
 [% INCLUDE easyproduct
-   name="Mozilla Localizations"
-   icon="dino.png"
+   name="Thunderbird"
+   icon="thunderbird.png"
 %]
 [% INCLUDE easyproduct
-   name="Mozilla Labs"
-   icon="labs.png"
+   name="SeaMonkey"
+   icon="seamonkey.png"
+%]
+[% INCLUDE easyproduct
+   name="Mozilla Localizations"
+   icon="dino.png"
 %]
 [% INCLUDE easyproduct
    name="Mozilla Services"
@@ -182,7 +187,7 @@
 
 <br>
 [% IF target == "enter_bug.cgi" AND user.settings.product_chooser.value != 'full_product_chooser' %]
-<p>You can choose to get this screen by default when you click "New [% terms.Bug %]" 
+<p>You can choose to get this screen by default when you click "New [% terms.Bug %]"
 by changing your <a href="userprefs.cgi?tab=settings">preferences</a>.</p>
 [% END %]
 [% END %]
@@ -190,6 +195,13 @@ by changing your <a href="userprefs.cgi?tab=settings">preferences</a>.</p>
 
 </div>
 
+<div id="guided">
+  <a id="guided_img" href="enter_bug.cgi?format=guided"><img
+   src="extensions/BMO/web/images/guided.png" width="16" height="16" border="0" align="absmiddle"></a>
+  <a id="guided_link" href="enter_bug.cgi?format=guided"
+   >Switch to the [% terms.Bugzilla %] Helper</a>
+</div>
+
 [% PROCESS global/footer.html.tmpl %]
 
 [%###########################################################################%]
@@ -208,7 +220,7 @@ by changing your <a href="userprefs.cgi?tab=settings">preferences</a>.</p>
           <td><h2 align="left" style="margin-bottom: 0px"><a href="[% target FILTER uri %]?product=[% p.name FILTER uri %]
                   [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%]
                   [%- IF format %]&amp;format=[% format FILTER uri %][% END %]">
-              [% p.name FILTER html FILTER no_break %]</a>:</h2>
+              [% caption || name FILTER html FILTER no_break %]</a>:</h2>
               [% IF p.description %]
                 <p style="margin-top: 0px;">[% p.description FILTER html_light %]</p>
               [% END %]
diff --git a/extensions/BMO/web/core.png b/extensions/BMO/web/core.png
new file mode 100644
index 000000000..b9c5053f6
--- /dev/null
+++ b/extensions/BMO/web/core.png
diff --git a/extensions/BMO/web/marketplace.png b/extensions/BMO/web/marketplace.png
new file mode 100644
index 000000000..62025a2a8
--- /dev/null
+++ b/extensions/BMO/web/marketplace.png