diff --git a/mail_debrand/README.rst b/mail_debrand/README.rst
index d9f21516..be9de7de 100644
--- a/mail_debrand/README.rst
+++ b/mail_debrand/README.rst
@@ -1,4 +1,4 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
    :alt: License: AGPL-3
 
@@ -21,7 +21,7 @@ To use this module, you need to:
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/205/10.0
+   :target: https://runbot.odoo-community.org/runbot/205/11.0
 
 
 Known issues / Roadmap
@@ -50,6 +50,7 @@ Contributors
 * Jordi Ballester Alomar <jordi.ballester@eficent.com>
 * Darshan Patel <darshan.patel.serpentcs@gmail.com>
 * Pedro M. Baeza <pedro.baeza@tecnativa.com>
+* Lois Rilo <lois.rilo@eficent.com>
 
 Images
 ------
diff --git a/mail_debrand/__init__.py b/mail_debrand/__init__.py
index a77a6fcb..83e553ac 100644
--- a/mail_debrand/__init__.py
+++ b/mail_debrand/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import models
diff --git a/mail_debrand/__openerp__.py b/mail_debrand/__manifest__.py
similarity index 91%
rename from mail_debrand/__openerp__.py
rename to mail_debrand/__manifest__.py
index 9445ac5d..e60d41f0 100644
--- a/mail_debrand/__openerp__.py
+++ b/mail_debrand/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016 Tecnativa - Jairo Llopis
 # Copyright 2017 SerpentCS - Darshan Patel
 # Copyright 2017 Tecnativa - Pedro M. Baeza
@@ -7,7 +6,7 @@
 {
     "name": "Mail Debrand",
     "summary": "Remove Odoo branding in sent emails",
-    "version": "10.0.1.0.0",
+    "version": "11.0.1.0.0",
     "category": "Social Network",
     "website": "https://www.tecnativa.com",
     "author": "Tecnativa, "
diff --git a/mail_debrand/models/__init__.py b/mail_debrand/models/__init__.py
index c290298c..74b31310 100644
--- a/mail_debrand/models/__init__.py
+++ b/mail_debrand/models/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import mail_template
diff --git a/mail_debrand/models/mail_template.py b/mail_debrand/models/mail_template.py
index d4b984db..974a4180 100644
--- a/mail_debrand/models/mail_template.py
+++ b/mail_debrand/models/mail_template.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
@@ -35,9 +34,9 @@ class MailTemplate(models.Model):
             template_txt, model, res_ids, post_process=post_process,
         )
         if post_process and self.env.context.get('mail_debrand'):
-            if isinstance(res, basestring):
+            if isinstance(res, str):
                 res = self._debrand_body(res)
             else:
-                for res_id, body in res.iteritems():
+                for res_id, body in res.items():
                     res[res_id] = self._debrand_body(body)
         return res
diff --git a/mail_debrand/tests/__init__.py b/mail_debrand/tests/__init__.py
index 62fe23ea..df718027 100644
--- a/mail_debrand/tests/__init__.py
+++ b/mail_debrand/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import test_mail_debrand
diff --git a/mail_debrand/tests/test_mail_debrand.py b/mail_debrand/tests/test_mail_debrand.py
index 4878adf9..116b8b79 100644
--- a/mail_debrand/tests/test_mail_debrand.py
+++ b/mail_debrand/tests/test_mail_debrand.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
@@ -23,4 +22,4 @@ class TestMailDebrand(common.SavepointCase):
         res = self.template.generate_email(
             self.env.user.ids, fields=['body_html'],
         )
-        self.assertNotIn('using', res[res.keys()[0]])
+        self.assertNotIn('using', res[[*res.keys()][0]])