diff --git a/web_tree_dynamic_colored_field/__openerp__.py b/web_tree_dynamic_colored_field/__openerp__.py
index 45c2be52..b4c13385 100644
--- a/web_tree_dynamic_colored_field/__openerp__.py
+++ b/web_tree_dynamic_colored_field/__openerp__.py
@@ -30,7 +30,7 @@
         'views/web_tree_dynamic_colored_field.xml',
     ],
     'qweb': [
-        'static/xml/*.xml',
+        'static/src/xml/*.xml',
     ],
     'auto_install': False,
     'installable': False,
diff --git a/web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js b/web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js
similarity index 54%
rename from web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js
rename to web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js
index 2c3b5e4f..c1a22d76 100644
--- a/web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js
+++ b/web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js
@@ -1,8 +1,4 @@
 openerp.web_tree_dynamic_colored_field = function(instance){
-    var _t = instance.web._t,
-        _lt = instance.web._lt;
-    var QWeb = instance.web.qweb;
-    
     var pair_colors = function(pair_color){
         if (pair_color != ""){
             var pair_list = pair_color.split(':'),
@@ -25,10 +21,7 @@ openerp.web_tree_dynamic_colored_field = function(instance){
             var ctx = _.extend(
                     {},
                     record.attributes,
-                    {
-                        uid: obj.session.uid,
-                        current_date: new Date().toString('yyyy-MM-dd')
-                    }    
+                    instance.web.pyeval.context()
             );
             for(i=0, len=colors.length; i<len; ++i) {
                 pair = colors[i];
@@ -41,46 +34,18 @@ openerp.web_tree_dynamic_colored_field = function(instance){
         }
         return result
     };
-    
+
     var colorize = function(record, column){
         var res = '';
         res += colorize_helper(this, record, column, 'bg_color', 'background-color');
         res += colorize_helper(this, record, column, 'fg_color', 'color');
         return res;
     };
-    
+
     instance.web.ListView.List.include({
         init: function(group, opts){
             this._super(group, opts);
             this.columns.fct_colorize = colorize;
         },
-        fct_colorize: colorize,
-        render: function() {
-            this.$current.empty().append(
-                QWeb.render('ListView.rows', _.extend({
-                        render_cell: function () {
-                            return self.render_cell.apply(self, arguments); },
-                        fct_colorize: function(){
-                            return self.fct_colorize.apply(self, arguments);
-                        }
-                    }, this)));
-            this.pad_table_to(4);
-        },
-        render_record: function(record) {
-            var self = this;
-            var index = this.records.indexOf(record);
-            return QWeb.render('ListView.row', {
-                columns: this.columns,
-                options: this.options,
-                record: record,
-                row_parity: (index % 2 === 0) ? 'even' : 'odd',
-                view: this.view,
-                render_cell: function () {
-                    return self.render_cell.apply(self, arguments); },
-                fct_colorize: function(){
-                    return self.fct_colorize.apply(self, arguments);
-                }
-            });
-        }
     });
 }
diff --git a/web_tree_dynamic_colored_field/static/xml/web_tree_dynamic_colored_field.xml b/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml
similarity index 64%
rename from web_tree_dynamic_colored_field/static/xml/web_tree_dynamic_colored_field.xml
rename to web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml
index 8a79e701..254172e8 100644
--- a/web_tree_dynamic_colored_field/static/xml/web_tree_dynamic_colored_field.xml
+++ b/web_tree_dynamic_colored_field/static/src/xml/web_tree_dynamic_colored_field.xml
@@ -4,8 +4,8 @@
 
     <tr t-extend="ListView.row">
         <t t-jquery="td[t-att-data-field='column.id']" t-operation="attributes">
-            <attribute name="t-att-style">fct_colorize(record, column)</attribute>
+            <attribute name="t-att-style">columns.fct_colorize(record, column)</attribute>
         </t>
     </tr>
 
-</templates>
\ No newline at end of file
+</templates>
diff --git a/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml b/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml
index 4d425fd9..7341731d 100644
--- a/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml
+++ b/web_tree_dynamic_colored_field/views/web_tree_dynamic_colored_field.xml
@@ -5,8 +5,8 @@
     <data>
         <template id="assets_backend" name="web_tree_dynamic_colored_field assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
-                <script type="text/javascript" src="/web_tree_dynamic_colored_field/static/js/web_tree_dynamic_colored_field.js"></script>
+                <script type="text/javascript" src="/web_tree_dynamic_colored_field/static/src/js/web_tree_dynamic_colored_field.js"></script>
             </xpath>
         </template>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>