diff --git a/web_m2x_options/README.rst b/web_m2x_options/README.rst
index 98cefc3c..f0e78aa4 100644
--- a/web_m2x_options/README.rst
+++ b/web_m2x_options/README.rst
@@ -6,6 +6,9 @@
 Add new options for many2one field
 ==================================
 
+Description
+-----------
+
 This modules modifies "many2one" and "many2manytags" form widgets so as to add some new display
 control options.
 
@@ -147,6 +150,7 @@ Contributors
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
 * Zakaria Makrelouf <z.makrelouf@gmail.com>
 * Jairo Llopis <jairo.llopis@tecnativa.com>
+* David Vidal <david.vidal@tecnativa.com>
 
 Maintainer
 ----------
diff --git a/web_m2x_options/__openerp__.py b/web_m2x_options/__manifest__.py
similarity index 92%
rename from web_m2x_options/__openerp__.py
rename to web_m2x_options/__manifest__.py
index 7206c3ca..ac436e6a 100644
--- a/web_m2x_options/__openerp__.py
+++ b/web_m2x_options/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": 'web_m2x_options',
-    "version": "9.0.1.1.0",
+    "version": "10.0.1.0.0",
     "depends": [
         'base',
         'web',
diff --git a/web_m2x_options/static/src/js/form.js b/web_m2x_options/static/src/js/form.js
index 4fb83da3..13ec3a6e 100644
--- a/web_m2x_options/static/src/js/form.js
+++ b/web_m2x_options/static/src/js/form.js
@@ -4,13 +4,11 @@
 odoo.define('web_m2x_options.web_m2x_options', function (require) {
     "use strict";
 
-    var $ = require("$");
     var core = require('web.core'),
         data = require('web.data'),
         Dialog = require('web.Dialog'),
         Model = require('web.Model'),
         form_relational = require('web.form_relational'),
-        _ = require('_'),
         _t  = core._t;
 
     var OPTIONS = ['web_m2x_options.create',
diff --git a/web_m2x_options/static/src/xml/base.xml b/web_m2x_options/static/src/xml/base.xml
index 094e942e..c095218b 100644
--- a/web_m2x_options/static/src/xml/base.xml
+++ b/web_m2x_options/static/src/xml/base.xml
@@ -4,8 +4,10 @@
 
 <templates xml:space="preserve">
     <t t-extend="FieldMany2One">
-        <t t-jquery=".oe_m2o_cm_button" t-operation="attributes">
-            <attribute name="t-if">!(widget.options.no_open || widget.options.no_open_edit)</attribute>
+        <t t-jquery=".o_external_button" t-operation="attributes">
+            <attribute name="t-if">
+                !(widget.options.no_open || widget.options.no_open_edit)
+            </attribute>
         </t>
     </t>
 </templates>
diff --git a/web_m2x_options/views/view.xml b/web_m2x_options/views/view.xml
index 9628625b..85d435c1 100644
--- a/web_m2x_options/views/view.xml
+++ b/web_m2x_options/views/view.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
-<openerp>
-    <data>
-        <template id="assets_backend" name="m2x options assets" inherit_id="web.assets_backend">
+
+<odoo>
+
+        <template id="assets_backend" name="m2x options assets"
+                  inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
-                <script type="text/javascript" src="/web_m2x_options/static/src/js/form.js"></script>
+                <script type="text/javascript"
+                        src="/web_m2x_options/static/src/js/form.js"></script>
             </xpath>
         </template>
-    </data>
-</openerp>
+
+</odoo>