Index: /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/__init__.py
===================================================================
--- /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/__init__.py	(revision 1214)
+++ /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/__init__.py	(revision 1215)
@@ -1,5 +1,5 @@
+# -*- coding: utf-8 -*-
 #import weblogfolder_patch, keywords_widget_patch
 import keywords_widget_patch
 from zope.i18nmessageid import MessageFactory
 quintagroupQuillsMessageFactory = MessageFactory('quintagroup.quills.extras')
-
Index: /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/browser/comments.py
===================================================================
--- /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/browser/comments.py	(revision 1214)
+++ /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/browser/comments.py	(revision 1215)
@@ -1,4 +1,8 @@
+# -*- coding: utf-8 -*-
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from Products.qPloneComments.browser import comments
+try:
+    from Products.qPloneComments.browser import comments
+except ImportError:
+    from quintagroup.plonecomments.browser import comments
 
 class CommentsViewlet(comments.CommentsViewlet):
Index: /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/browser/overrides.zcml
===================================================================
--- /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/browser/overrides.zcml	(revision 1214)
+++ /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/browser/overrides.zcml	(revision 1215)
@@ -3,4 +3,5 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="quintagroup.quills.extras">
 
@@ -38,24 +39,41 @@
 
       <browser:page
-	  for="*"
-	  name="discussion_reply_redirect"
-	  class=".discussionreply.DiscussionReply"
-	  permission="zope.Public"
-	  allowed_attributes="__call__"
-	  />
+          for="*"
+          name="discussion_reply_redirect"
+          class=".discussionreply.DiscussionReply"
+          permission="zope.Public"
+          allowed_attributes="__call__"
+          />
 
-      <include package="Products.qPloneComments" file="overrides.zcml" />
+      <include zcml:condition="installed Products.qPloneComments"
+          package="Products.qPloneComments" file="overrides.zcml" />
       <browser:viewlet
-	  name="plone.comments"
-	  for="Products.CMFCore.interfaces.IContentish"
-	  manager="plone.app.layout.viewlets.interfaces.IBelowContent"
-	  view="plone.app.layout.globals.interfaces.IViewView"
-	  class=".comments.CommentsViewlet"
-	  layer="Products.qPloneComments.interfaces.IPloneCommentsLayer"
-	  permission="zope2.View"
-	  />
+          zcml:condition="installed Products.qPloneComments"
+          name="plone.comments"
+          for="Products.CMFCore.interfaces.IContentish"
+          manager="plone.app.layout.viewlets.interfaces.IBelowContent"
+          view="plone.app.layout.globals.interfaces.IViewView"
+          class=".comments.CommentsViewlet"
+          layer="Products.qPloneComments.interfaces.IPloneCommentsLayer"
+          permission="zope2.View"
+          />
+
+      <include zcml:condition="installed quintagroup.plonecomments"
+          package="quintagroup.plonecomments" file="overrides.zcml" />
+
+      <browser:viewlet
+          zcml:condition="installed quintagroup.plonecomments"
+          name="plone.comments"
+          for="Products.CMFCore.interfaces.IContentish"
+          manager="plone.app.layout.viewlets.interfaces.IBelowContent"
+          view="plone.app.layout.globals.interfaces.IViewView"
+          class=".comments.CommentsViewlet"
+          layer="quintagroup.plonecomments.interfaces.IPloneCommentsLayer"
+          permission="zope2.View"
+          />
 
     <!-- metal macros -->
-    <view for="*"
+    <browser:page
+        for="*"
         name="quills_header_macros"
         class=".macros.HeaderMacros"
Index: intagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/tests.py
===================================================================
--- /quintagroup.quills.extras/branches/no_webresults/quintagroup/quills/extras/tests.py	(revision 1214)
+++ 	(revision )
@@ -1,54 +1,0 @@
-import unittest
-
-from zope.testing import doctestunit
-from zope.component import testing
-from Testing import ZopeTestCase as ztc
-
-from Products.Five import zcml
-from Products.Five import fiveconfigure
-from Products.PloneTestCase import PloneTestCase as ptc
-from Products.PloneTestCase.layer import PloneSite
-ptc.setupPloneSite()
-
-import quintagroup.quills.extras
-
-class TestCase(ptc.PloneTestCase):
-    class layer(PloneSite):
-        @classmethod
-        def setUp(cls):
-            fiveconfigure.debug_mode = True
-            zcml.load_config('configure.zcml',
-                             quintagroup.quills.extras)
-            fiveconfigure.debug_mode = False
-
-        @classmethod
-        def tearDown(cls):
-            pass
-
-
-def test_suite():
-    return unittest.TestSuite([
-
-        # Unit tests
-        #doctestunit.DocFileSuite(
-        #    'README.txt', package='quintagroup.quills.extras',
-        #    setUp=testing.setUp, tearDown=testing.tearDown),
-
-        #doctestunit.DocTestSuite(
-        #    module='quintagroup.quills.extras.mymodule',
-        #    setUp=testing.setUp, tearDown=testing.tearDown),
-
-
-        # Integration tests that use PloneTestCase
-        #ztc.ZopeDocFileSuite(
-        #    'README.txt', package='quintagroup.quills.extras',
-        #    test_class=TestCase),
-
-        #ztc.FunctionalDocFileSuite(
-        #    'browser.txt', package='quintagroup.quills.extras',
-        #    test_class=TestCase),
-
-        ])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')