diff --git a/cybertools/composer/layout/base.py b/cybertools/composer/layout/base.py
index 5634a69..e4b7152 100644
--- a/cybertools/composer/layout/base.py
+++ b/cybertools/composer/layout/base.py
@@ -1,30 +1,11 @@
-#
-#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
+# cybertools.composer.layout.base
 
-"""
-Basic classes for layouts and layout components.
-
-$Id$
+""" Basic classes for layouts and layout components.
 """
 
 from zope.cachedescriptors.property import Lazy
 from zope import component
-from zope.interface import implements
+from zope.interface import implementer
 
 from cybertools.composer.base import Component, Element, Compound
 from cybertools.composer.base import Template
@@ -34,10 +15,9 @@ from cybertools.composer.layout.region import Region
 from cybertools.util.jeep import Jeep
 
 
+@implementer(ILayoutManager)
 class LayoutManager(object):
 
-    implements(ILayoutManager)
-
     @Lazy
     def regions(self):
         result = {}
@@ -53,10 +33,9 @@ class LayoutManager(object):
                       key=lambda x: x.template.order)
 
 
+@implementer(ILayout)
 class Layout(Template):
 
-    implements(ILayout)
-
     title = description = u''
     category = 'default'
     renderer = None
@@ -79,10 +58,9 @@ class Layout(Template):
         component.provideUtility(self, provides=ILayout, name=self.name)
 
 
+@implementer(ILayoutInstance)
 class LayoutInstance(object):
 
-    implements(ILayoutInstance)
-
     template = None
 
     def __init__(self, context):
diff --git a/cybertools/composer/layout/region.py b/cybertools/composer/layout/region.py
index 12a1ff8..9c73099 100644
--- a/cybertools/composer/layout/region.py
+++ b/cybertools/composer/layout/region.py
@@ -1,37 +1,17 @@
-#
-#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
+# cybertools.composer.layout.region
 
-"""
-Region implementation.
-
-$Id$
+""" Region implementation.
 """
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from cybertools.composer.layout.interfaces import IRegion
 from cybertools.util.jeep import Jeep
 
 
+@implementer(IRegion)
 class Region(object):
 
-    implements(IRegion)
-
     allowedLayoutCategories = None
 
     def __init__(self, name):