diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 97e7a31..8236f30 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -4,7 +4,7 @@ name: Build and test
 on: [push]
 
 jobs:
-  build:
+   test-and-check:
     strategy:
       matrix:
         python-version:
diff --git a/src/collective/bbcodesnippets/controlpanel.py b/src/collective/bbcodesnippets/controlpanel.py
index 81cd43a..bcd2c7c 100644
--- a/src/collective/bbcodesnippets/controlpanel.py
+++ b/src/collective/bbcodesnippets/controlpanel.py
@@ -34,7 +34,6 @@ class IBBCodeSnippetsSettings(Interface):
 
 
 class BBCodeControlPanelForm(controlpanel.RegistryEditForm):
-
     id = "BBCodeControlPanel"
     label = _("BBCode Snippets")
     description = _("BBCode snippets settings.")
diff --git a/src/collective/bbcodesnippets/menu.py b/src/collective/bbcodesnippets/menu.py
index 198a01c..73e85de 100644
--- a/src/collective/bbcodesnippets/menu.py
+++ b/src/collective/bbcodesnippets/menu.py
@@ -18,9 +18,9 @@ class BBCodeSnippetesMainMenuItem(BrowserSubMenuItem):
     # This is in fact a submenu item of the parent menu, thus the name
     # of the inherited class tells it, don't be confused.
 
-    title = _(u"label_bbcodesnippets_menu", default=u"BBCode Snippets")
+    title = _("label_bbcodesnippets_menu", default="BBCode Snippets")
     description = _(
-        u"title_bbcodesnippets_menu", default=u"Copy BBCode snippets to clipboard"
+        "title_bbcodesnippets_menu", default="Copy BBCode snippets to clipboard"
     )
     submenuId = "bbcodesnippets_menu"
 
diff --git a/src/collective/bbcodesnippets/profiles/default/browserlayer.xml b/src/collective/bbcodesnippets/profiles/default/browserlayer.xml
index 5492f5b..08374bf 100644
--- a/src/collective/bbcodesnippets/profiles/default/browserlayer.xml
+++ b/src/collective/bbcodesnippets/profiles/default/browserlayer.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layers>
-  <layer
-      name="collective.bbcodesnippets"
-      interface="collective.bbcodesnippets.interfaces.IBBCodeSnippetsLayer"
-      />
+  <layer interface="collective.bbcodesnippets.interfaces.IBBCodeSnippetsLayer"
+         name="collective.bbcodesnippets"
+  />
 </layers>
diff --git a/src/collective/bbcodesnippets/profiles/default/catalog.xml b/src/collective/bbcodesnippets/profiles/default/catalog.xml
index b006288..71aac7e 100644
--- a/src/collective/bbcodesnippets/profiles/default/catalog.xml
+++ b/src/collective/bbcodesnippets/profiles/default/catalog.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
-<object
-    meta_type="Plone Catalog Tool"
-    name="portal_catalog">
+<?xml version="1.0" encoding="utf-8"?>
+<object meta_type="Plone Catalog Tool"
+        name="portal_catalog"
+>
 
-  <index
-      meta_type="BooleanIndex"
-      name="has_bbcode">
+  <index meta_type="BooleanIndex"
+         name="has_bbcode"
+  >
     <indexed_attr value="has_bbcode" />
   </index>
 
-</object>
\ No newline at end of file
+</object>
diff --git a/src/collective/bbcodesnippets/profiles/default/controlpanel.xml b/src/collective/bbcodesnippets/profiles/default/controlpanel.xml
index 04d4fb9..e819313 100644
--- a/src/collective/bbcodesnippets/profiles/default/controlpanel.xml
+++ b/src/collective/bbcodesnippets/profiles/default/controlpanel.xml
@@ -1,16 +1,19 @@
-<?xml version="1.0"?>
-<object name="portal_controlpanel" 
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
         meta_type="Plone Control Panel Tool"
-        i18n:domain="collective.bbcodesnippets" 
-        xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <configlet title="BBCode Snippets" 
-            action_id="BBCodeSnippets" 
-            appId="BBCodeSnippets"
-            category="Products" 
-            condition_expr=""
-            icon_expr="string:"
-            url_expr="string:${portal_url}/@@bbcodesnippets-controlpanel" visible="True"
-            i18n:attributes="title">
-  <permission>"Plone Site Setup: Markup</permission>
- </configlet>
-</object>
\ No newline at end of file
+        name="portal_controlpanel"
+        i18n:domain="collective.bbcodesnippets"
+>
+  <configlet action_id="BBCodeSnippets"
+             appId="BBCodeSnippets"
+             category="Products"
+             condition_expr=""
+             icon_expr="string:"
+             title="BBCode Snippets"
+             url_expr="string:${portal_url}/@@bbcodesnippets-controlpanel"
+             visible="True"
+             i18n:attributes="title"
+  >
+    <permission>"Plone Site Setup: Markup</permission>
+  </configlet>
+</object>
diff --git a/src/collective/bbcodesnippets/profiles/default/metadata.xml b/src/collective/bbcodesnippets/profiles/default/metadata.xml
index 8595c50..e3df6cc 100644
--- a/src/collective/bbcodesnippets/profiles/default/metadata.xml
+++ b/src/collective/bbcodesnippets/profiles/default/metadata.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <metadata>
   <version>1</version>
   <dependencies>
     <dependency>profile-plone.restapi:default</dependency>
-  </dependencies>  
+  </dependencies>
 </metadata>
diff --git a/src/collective/bbcodesnippets/profiles/default/registry.xml b/src/collective/bbcodesnippets/profiles/default/registry.xml
index 935d9a3..56363fc 100644
--- a/src/collective/bbcodesnippets/profiles/default/registry.xml
+++ b/src/collective/bbcodesnippets/profiles/default/registry.xml
@@ -1,25 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <registry>
   <records interface="collective.bbcodesnippets.controlpanel.IBBCodeSnippetsSettings"
-    prefix="bbcodesnippets" />
+           prefix="bbcodesnippets"
+  />
 
-  <records prefix="plone.resources/collective-bbcodesnippets"
-    interface='Products.CMFPlone.interfaces.IResourceRegistry'>
+  <records interface="Products.CMFPlone.interfaces.IResourceRegistry"
+           prefix="plone.resources/collective-bbcodesnippets"
+  >
     <value key="js">++plone++collective.bbcodesnippets/collective.bbcodesnippets.js</value>
   </records>
 
-  <records prefix="plone.bundles/collective-bbcodesnippets-app"
-    interface="Products.CMFPlone.interfaces.IBundleRegistry">
+  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+           prefix="plone.bundles/collective-bbcodesnippets-app"
+  >
     <value key="resources">
       <element>collective-bbcodesnippets</element>
     </value>
     <value key="last_compilation">2020-08-19 12:53:00</value>
     <value key="jscompilation">++plone++collective.bbcodesnippets/collective.bbcodesnippets.js</value>
-    <value key="csscompilation"></value>
+    <value key="csscompilation" />
     <value key="develop_javascript">False</value>
     <value key="develop_css">False</value>
     <value key="depends">plone-tinymce</value>
-    <value key="merge_with"></value>
+    <value key="merge_with" />
     <value key="enabled">True</value>
     <value key="expression">python: member is not None</value>
     <value key="compile">False</value>
@@ -27,12 +30,13 @@
     <value key="load_defer">False</value>
   </records>
 
-  <record name="plone.custom_plugins"
-    interface="Products.CMFPlone.interfaces.controlpanel.ITinyMCESchema"
-    field="custom_plugins">
+  <record field="custom_plugins"
+          interface="Products.CMFPlone.interfaces.controlpanel.ITinyMCESchema"
+          name="plone.custom_plugins"
+  >
     <value purge="False">
       <element>collectivebbcodesnippets|++plone++collective.bbcodesnippets/collective.bbcodesnippets.js</element>
     </value>
   </record>
 
-</registry>
\ No newline at end of file
+</registry>
diff --git a/src/collective/bbcodesnippets/profiles/uninstall/browserlayer.xml b/src/collective/bbcodesnippets/profiles/uninstall/browserlayer.xml
index a5a11bf..443e9a7 100644
--- a/src/collective/bbcodesnippets/profiles/uninstall/browserlayer.xml
+++ b/src/collective/bbcodesnippets/profiles/uninstall/browserlayer.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layers>
-  <layer
-      name="collective.bbcodesnippets"
-      remove="true"
-      />
+  <layer name="collective.bbcodesnippets"
+         remove="true"
+  />
 </layers>
diff --git a/src/collective/bbcodesnippets/profiles/uninstall/controlpanel.xml b/src/collective/bbcodesnippets/profiles/uninstall/controlpanel.xml
index c69640f..9d27a61 100644
--- a/src/collective/bbcodesnippets/profiles/uninstall/controlpanel.xml
+++ b/src/collective/bbcodesnippets/profiles/uninstall/controlpanel.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <object name="portal_controlpanel">
   <configlet action_id="BBCodeSnippets"
              appId="BBCodeSnippets"
@@ -7,5 +7,5 @@
              remove="True"
              title="BBCode Snippets"
   >
-  </configlet>
-</object>
\ No newline at end of file
+</configlet>
+</object>
diff --git a/src/collective/bbcodesnippets/profiles/uninstall/registry.xml b/src/collective/bbcodesnippets/profiles/uninstall/registry.xml
index 1e9b132..b52fa28 100644
--- a/src/collective/bbcodesnippets/profiles/uninstall/registry.xml
+++ b/src/collective/bbcodesnippets/profiles/uninstall/registry.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <registry>
   <records interface="collective.bbcodesnippets.controlpanel.IBBCodeSnippetsSettings"
            prefix="bbcodesnippets"
@@ -22,4 +22,4 @@
     </record>
   -->
 
-</registry>
\ No newline at end of file
+</registry>
diff --git a/src/collective/bbcodesnippets/testing.py b/src/collective/bbcodesnippets/testing.py
index 3533df6..3cc3365 100644
--- a/src/collective/bbcodesnippets/testing.py
+++ b/src/collective/bbcodesnippets/testing.py
@@ -6,7 +6,6 @@
 
 
 class CollectiveBbcodesnippetsLayer(PloneSandboxLayer):
-
     defaultBases = (PLONE_APP_CONTENTTYPES_FIXTURE,)
 
     def setUpZope(self, app, configurationContext):
diff --git a/src/collective/bbcodesnippets/transform.py b/src/collective/bbcodesnippets/transform.py
index 7325f7f..00d7a12 100644
--- a/src/collective/bbcodesnippets/transform.py
+++ b/src/collective/bbcodesnippets/transform.py
@@ -25,7 +25,6 @@
 @implementer(ITransform)
 @adapter(Interface, IBBCodeSnippetsLayer)
 class BBCodeSnippetsTransform(object):
-
     # after diazo (plone.app.theming) which is 8850
     order = 8960