diff --git a/plone/app/intid/configure.zcml b/plone/app/intid/configure.zcml
index bddfd9e..15fcf4e 100644
--- a/plone/app/intid/configure.zcml
+++ b/plone/app/intid/configure.zcml
@@ -2,27 +2,34 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:five="http://namespaces.zope.org/five"
     xmlns:zcml="http://namespaces.zope.org/zcml"
-    i18n_domain="plone.app.intid">
+    i18n_domain="plone.app.intid"
+    >
 
-  <include package="five.intid" file="base.zcml" />
-  <include package="five.intid" file="cmfdirectoryview.zcml" />
+  <include
+      package="five.intid"
+      file="base.zcml"
+      />
+  <include
+      package="five.intid"
+      file="cmfdirectoryview.zcml"
+      />
   <include file="profiles.zcml" />
 
   <!-- Register intid handlers for all CMF/Plone content -->
   <subscriber
-      handler="five.intid.intid.addIntIdSubscriber"
       for="Products.CMFCore.interfaces.IDynamicType
            zope.lifecycleevent.interfaces.IObjectAddedEvent"
+      handler="five.intid.intid.addIntIdSubscriber"
       />
   <subscriber
-      handler="five.intid.intid.removeIntIdSubscriber"
       for="Products.CMFCore.interfaces.IDynamicType
            zope.lifecycleevent.interfaces.IObjectRemovedEvent"
+      handler="five.intid.intid.removeIntIdSubscriber"
       />
   <subscriber
-      handler="five.intid.intid.moveIntIdSubscriber"
       for="Products.CMFCore.interfaces.IDynamicType
            zope.lifecycleevent.interfaces.IObjectMovedEvent"
+      handler="five.intid.intid.moveIntIdSubscriber"
       />
 
 </configure>
diff --git a/plone/app/intid/profiles.zcml b/plone/app/intid/profiles.zcml
index 0874b27..9e2db0b 100644
--- a/plone/app/intid/profiles.zcml
+++ b/plone/app/intid/profiles.zcml
@@ -1,32 +1,35 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
-    i18n_domain="plone.app.intid">
+    i18n_domain="plone.app.intid"
+    >
 
-    <genericsetup:registerProfile
-        name="default"
-        title="plone.app.intid: install utility"
-        directory="profiles/default"
-        description="Extension profile to install an intid utility in a Plone site"
-        for="Products.CMFCore.interfaces.ISiteRoot"
-        provides="Products.GenericSetup.interfaces.EXTENSION"
-        />
+  <genericsetup:registerProfile
+      name="default"
+      title="plone.app.intid: install utility"
+      description="Extension profile to install an intid utility in a Plone site"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      for="Products.CMFCore.interfaces.ISiteRoot"
+      directory="profiles/default"
+      />
 
-    <genericsetup:importStep
-        name="import-intid-util"
-        title="Import IntId Utility"
-        description="Import intid utility."
-        handler=".setuphandlers.installIntIds">
-      <depends name="toolset"/>
-    </genericsetup:importStep>
+  <genericsetup:importStep
+      name="import-intid-util"
+      title="Import IntId Utility"
+      description="Import intid utility."
+      handler=".setuphandlers.installIntIds"
+      >
+    <depends name="toolset" />
+  </genericsetup:importStep>
 
-    <genericsetup:importStep
-        name="intid-register-content"
-        title="Register content with IntId utility"
-        description="Register all plone content with intid utility."
-        handler=".setuphandlers.registerContent">
-      <depends name="catalog"/>
-      <depends name="import-intid-util"/>
-    </genericsetup:importStep>
+  <genericsetup:importStep
+      name="intid-register-content"
+      title="Register content with IntId utility"
+      description="Register all plone content with intid utility."
+      handler=".setuphandlers.registerContent"
+      >
+    <depends name="catalog" />
+    <depends name="import-intid-util" />
+  </genericsetup:importStep>
 
-</configure>
\ No newline at end of file
+</configure>
diff --git a/plone/app/intid/profiles/default/metadata.xml b/plone/app/intid/profiles/default/metadata.xml
index cf4492a..08b37b6 100644
--- a/plone/app/intid/profiles/default/metadata.xml
+++ b/plone/app/intid/profiles/default/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <metadata>
   <version>1</version>
 </metadata>