diff --git a/CHANGES.rst b/CHANGES.rst
index d2b37633d..78caa402d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,7 +6,8 @@ There's a frood who really knows where his towel is.
 2.0b2 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
-- Nothing changed yet.
+- Fix package uninstall.
+  [hvelarde]
 
 
 2.0b1 (2018-08-24)
diff --git a/src/collective/cover/profiles/default/controlpanel.xml b/src/collective/cover/profiles/default/controlpanel.xml
index f1988caa5..dcfaf8433 100644
--- a/src/collective/cover/profiles/default/controlpanel.xml
+++ b/src/collective/cover/profiles/default/controlpanel.xml
@@ -3,15 +3,15 @@
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     i18n:domain="collective.cover"
     purge="False">
-    <configlet title="Cover Settings"
-        action_id="cover"
-        appId="collective.cover"
-        category="Products"
-        condition_expr=""
-        url_expr="string:${portal_url}/@@cover-settings"
-        icon_expr="string:${portal_url}/++resource++collective.cover/img/frontpage_icon.png"
-        visible="True"
-        i18n:attributes="title">
-      <permission>collective.cover: Setup</permission>
-    </configlet>
+  <configlet title="Cover Settings"
+      action_id="cover"
+      appId="collective.cover"
+      category="Products"
+      condition_expr=""
+      url_expr="string:${portal_url}/@@cover-settings"
+      icon_expr="string:${portal_url}/++resource++collective.cover/img/frontpage_icon.png"
+      visible="True"
+      i18n:attributes="title">
+    <permission>collective.cover: Setup</permission>
+  </configlet>
 </object>
diff --git a/src/collective/cover/profiles/default/repositorytool.xml b/src/collective/cover/profiles/default/repositorytool.xml
index e463b9a58..1f6b3fb7d 100644
--- a/src/collective/cover/profiles/default/repositorytool.xml
+++ b/src/collective/cover/profiles/default/repositorytool.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <repositorytool>
- <policymap>
-  <type name="collective.cover.content">
-   <policy name="version_on_revert"/>
-  </type>
- </policymap>
+  <policymap>
+    <type name="collective.cover.content">
+      <policy name="version_on_revert" />
+    </type>
+  </policymap>
 </repositorytool>
diff --git a/src/collective/cover/profiles/default/tinymce.xml b/src/collective/cover/profiles/default/tinymce.xml
index 5ac0d8eec..f3d94dbe9 100644
--- a/src/collective/cover/profiles/default/tinymce.xml
+++ b/src/collective/cover/profiles/default/tinymce.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <object>
- <resourcetypes>
-  <linkable purge="False">
-   <element value="collective.cover.content"/>
-  </linkable>
- </resourcetypes>
+  <resourcetypes>
+    <linkable purge="False">
+      <element value="collective.cover.content" />
+    </linkable>
+  </resourcetypes>
 </object>
 
diff --git a/src/collective/cover/profiles/uninstall/browserlayer.xml b/src/collective/cover/profiles/uninstall/browserlayer.xml
new file mode 100644
index 000000000..8a1206052
--- /dev/null
+++ b/src/collective/cover/profiles/uninstall/browserlayer.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<layers>
+  <layer remove="True" name="collective.cover" />
+</layers>
diff --git a/src/collective/cover/profiles/uninstall/controlpanel.xml b/src/collective/cover/profiles/uninstall/controlpanel.xml
new file mode 100644
index 000000000..bebcb42cb
--- /dev/null
+++ b/src/collective/cover/profiles/uninstall/controlpanel.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<object name="portal_controlpanel">
+  <configlet
+      remove="True"
+      title="Cover Settings"
+      action_id="cover"
+      appId="collective.cover"
+      category="Products"
+      />
+</object>
diff --git a/src/collective/cover/profiles/uninstall/cssregistry.xml b/src/collective/cover/profiles/uninstall/cssregistry.xml
new file mode 100644
index 000000000..040bea49e
--- /dev/null
+++ b/src/collective/cover/profiles/uninstall/cssregistry.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<object name="portal_css">
+  <stylesheet remove="True" id="++resource++collective.cover/css/contentchooser.css" />
+  <stylesheet remove="True" id="++resource++collective.cover/css/cover.css" />
+</object>
diff --git a/src/collective/cover/profiles/uninstall/jsregistry.xml b/src/collective/cover/profiles/uninstall/jsregistry.xml
new file mode 100644
index 000000000..0a82629dc
--- /dev/null
+++ b/src/collective/cover/profiles/uninstall/jsregistry.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<object name="portal_javascripts">
+  <javascript remove="True" id="++resource++collective.cover/js/contentchooser.js" />
+  <javascript remove="True" id="++resource++collective.js.bootstrap/js/bootstrap.min.js" />
+  <javascript remove="True" id="++resource++collective.cover/js/vendor/jquery.endless-scroll.js" />
+  <javascript remove="True" id="++resource++collective.cover/js/layout_edit.js" />
+  <javascript remove="True" id="++resource++collective.cover/js/main.js" />
+</object>
diff --git a/src/collective/cover/profiles/uninstall/repositorytool.xml b/src/collective/cover/profiles/uninstall/repositorytool.xml
new file mode 100644
index 000000000..a9e519566
--- /dev/null
+++ b/src/collective/cover/profiles/uninstall/repositorytool.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<repositorytool>
+  <policymap>
+    <type purge="true" name="collective.cover.content" />
+  </policymap>
+</repositorytool>
diff --git a/src/collective/cover/profiles/uninstall/tinymce.xml b/src/collective/cover/profiles/uninstall/tinymce.xml
new file mode 100644
index 000000000..de279dec4
--- /dev/null
+++ b/src/collective/cover/profiles/uninstall/tinymce.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<object>
+  <resourcetypes>
+    <linkable purge="False">
+      <element remove="true" value="collective.cover.content" />
+    </linkable>
+  </resourcetypes>
+</object>
+
diff --git a/src/collective/cover/tests/test_controlpanel.py b/src/collective/cover/tests/test_controlpanel.py
index 4ea7c0c62..3c25ee5da 100644
--- a/src/collective/cover/tests/test_controlpanel.py
+++ b/src/collective/cover/tests/test_controlpanel.py
@@ -34,16 +34,14 @@ def test_controlpanel_view_is_protected(self):
             self.portal.restrictedTraverse('@@cover-settings')
 
     def test_controlpanel_installed(self):
-        actions = [a.getAction(self)['id']
-                   for a in self.controlpanel.listActions()]
+        actions = [a.id for a in self.controlpanel.listActions()]
         self.assertIn('cover', actions)
 
     def test_controlpanel_removed_on_uninstall(self):
         qi = self.portal['portal_quickinstaller']
         with api.env.adopt_roles(['Manager']):
             qi.uninstallProducts(products=[PROJECTNAME])
-        actions = [a.getAction(self)['id']
-                   for a in self.controlpanel.listActions()]
+        actions = [a.id for a in self.controlpanel.listActions()]
         self.assertNotIn('cover', actions)
 
     def test_controlpanel_permissions(self):
diff --git a/src/collective/cover/tests/test_setup.py b/src/collective/cover/tests/test_setup.py
index 752ef36f9..f020c980e 100644
--- a/src/collective/cover/tests/test_setup.py
+++ b/src/collective/cover/tests/test_setup.py
@@ -10,8 +10,10 @@
 
 JS = [
     '++resource++collective.cover/js/contentchooser.js',
-    '++resource++collective.js.bootstrap/js/bootstrap.min.js',
+    '++resource++collective.cover/js/layout_edit.js',
+    '++resource++collective.cover/js/main.js',
     '++resource++collective.cover/js/vendor/jquery.endless-scroll.js',
+    '++resource++collective.js.bootstrap/js/bootstrap.min.js',
 ]
 
 CSS = [
@@ -60,6 +62,16 @@ def test_reinstall_with_changed_registry(self):
         except AttributeError:
             self.fail('Reinstall fails when the record was changed')
 
+    def test_versioning_policy(self):
+        repository = self.portal['portal_repository']
+        policy_map = repository.getPolicyMap()['collective.cover.content']
+        self.assertEqual(policy_map, [u'version_on_revert'])
+
+    def test_tinymce_linkable(self):
+        tinymce = self.portal['portal_tinymce']
+        linkable = tinymce.linkable.split('\n')
+        self.assertIn('collective.cover.content', linkable)
+
 
 class UninstallTestCase(unittest.TestCase):
 
@@ -90,3 +102,14 @@ def test_cssregistry_removed(self):
         resource_ids = self.portal.portal_css.getResourceIds()
         for id in CSS:
             self.assertNotIn(id, resource_ids, '{0} not removed'.format(id))
+
+    @unittest.expectedFailure  # XXX: not pretty sure how to test this
+    def test_versioning_policy_removed(self):
+        repository = self.portal['portal_repository']
+        policy_map = repository.getPolicyMap()
+        self.assertNotIn('collective.cover.content', policy_map)
+
+    def test_tinymce_linkable_removed(self):
+        tinymce = self.portal['portal_tinymce']
+        linkable = tinymce.linkable.split('\n')
+        self.assertNotIn('collective.cover.content', linkable)