diff --git a/docs/changes.rst b/docs/changes.rst
index 0f228dfa..4ba050c3 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -4,6 +4,12 @@ Changelog
 11.0.0 (unreleased)
 -------------------
 
+- Add ``quaive-publish`` page with the text for publishing a survey to the client.
+  [maurits]
+
+- Add views to create or edit content from within Quaive.
+  [maurits]
+
 - Add ``@navtree`` REST API endpoint.
   [maurits]
 
diff --git a/src/osha/oira/configure.zcml b/src/osha/oira/configure.zcml
index 2af2dcbd..5b55a357 100644
--- a/src/osha/oira/configure.zcml
+++ b/src/osha/oira/configure.zcml
@@ -33,6 +33,7 @@
   <include package=".content" />
   <include package=".tiles" />
   <include package=".nuplone" />
+  <include package=".ploneintranet" />
   <include package=".upgrade" />
   <include package=".statistics" />
   <include package=".services" />
diff --git a/src/osha/oira/ploneintranet/__init__.py b/src/osha/oira/ploneintranet/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/osha/oira/ploneintranet/configure.zcml b/src/osha/oira/ploneintranet/configure.zcml
new file mode 100644
index 00000000..4a7f8615
--- /dev/null
+++ b/src/osha/oira/ploneintranet/configure.zcml
@@ -0,0 +1,155 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    i18n_domain="euphorie"
+    >
+
+  <include package=".z3cform" />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.country.ICountry"
+      class=".quaive_edit.CountryQuaiveEditForm"
+      template="templates/quaive-form.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.module.IModule"
+      class=".quaive_edit.ModuleQuaiveEditForm"
+      template="templates/quaive-form.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.profilequestion.IProfileQuestion"
+      class=".quaive_edit.ProfileQuestionQuaiveEditForm"
+      template="templates/quaive-form.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.risk.IRisk"
+      class=".quaive_edit.RiskQuaiveEditForm"
+      template="templates/quaive-form.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.sector.ISector"
+      class=".quaive_edit.SectorQuaiveEditForm"
+      template="templates/quaive-form.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.solution.ISolution"
+      class=".quaive_edit.SolutionQuaiveEditForm"
+      template="templates/quaive-form.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.survey.ISurvey"
+      class=".quaive_edit.SurveyQuaiveEditForm"
+      template="templates/quaive-form.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.surveygroup.ISurveyGroup"
+      class=".quaive_edit.SurveyGroupQuaiveEditForm"
+      template="templates/quaive-form.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-publish"
+      for="euphorie.content.survey.ISurvey"
+      class=".quaive_publish.PublishSurveyQuaiveForm"
+      template="templates/quaive-publish.pt"
+      permission="euphorie.client.PublishSurvey"
+      layer="plonetheme.nuplone.skin.interfaces.NuPloneSkin"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.sector"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieSectorView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.country"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieCountryView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.risk"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieRiskView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.surveygroup"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieSurveyGroupView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.survey"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieSurveyView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.module"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieModuleView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.profilequestion"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieProfileQuestionView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.solution"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieSolutionView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+</configure>
diff --git a/src/osha/oira/ploneintranet/interfaces.py b/src/osha/oira/ploneintranet/interfaces.py
new file mode 100644
index 00000000..1b1c481e
--- /dev/null
+++ b/src/osha/oira/ploneintranet/interfaces.py
@@ -0,0 +1,5 @@
+from zope.interface import Interface
+
+
+class IQuaiveForm(Interface):
+    """Marker interface for views that are designed to be embedded in Quaive"""
diff --git a/src/osha/oira/ploneintranet/quaive_create.py b/src/osha/oira/ploneintranet/quaive_create.py
new file mode 100644
index 00000000..1b296dbe
--- /dev/null
+++ b/src/osha/oira/ploneintranet/quaive_create.py
@@ -0,0 +1,128 @@
+from euphorie.content.browser.country import AddView as EuphorieCountryAddView
+from euphorie.content.browser.module import AddView as EuphorieModuleAddView
+from euphorie.content.browser.survey import AddView as EuphorieSurveyAddView
+from euphorie.content.browser.surveygroup import AddView as EuphorieSurveyGroupAddView
+from osha.oira.content.browser.risk import AddView as EuphorieRiskAddView
+from osha.oira.content.browser.sector import AddView as EuphorieSectorAddView
+from osha.oira.content.browser.solution import AddView as EuphorieSolutionAddView
+from osha.oira.ploneintranet.interfaces import IQuaiveForm
+from plone import api
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+from zope.i18nmessageid import MessageFactory
+from zope.interface import alsoProvides
+from zope.interface import implementer
+
+
+from euphorie.content.browser.profilequestion import (  # isort:skip
+    AddView as EuphorieProfileQuestionAddView,
+)
+
+_ = MessageFactory("nuplone")
+
+
+@implementer(IQuaiveForm)
+class QuaiveCreateFormMixin:
+    template = ViewPageTemplateFile("templates/quaive-panel-form.pt")
+
+    def update(self):
+        super().update()
+        for group in getattr(self, "groups", []):
+            #  This is needed to pick up the custom Quaive widgets
+            alsoProvides(group, IQuaiveForm)
+
+
+class QuaiveCreateViewMixin:
+    def __init__(self, context, request):
+        portal_type = self.__name__.rpartition("-")[-1]
+        fti = api.portal.get_tool("portal_types")[portal_type]
+        super().__init__(context, request, fti)
+
+
+class QuaiveCreateEuphorieSectorForm(QuaiveCreateFormMixin, EuphorieSectorAddView.form):
+    template = ViewPageTemplateFile("templates/quaive-form.pt")
+
+    def updateWidgets(self):
+        super().updateWidgets()
+        self.widgets["logo"].field.description = _(
+            "help_sector_logo",
+            default=(
+                "The logo will appear on the client side app "
+                "that your user group will see. "
+                "Make sure your image is of format png, jpg or gif "
+                "and does not contain any special characters. "
+                "The new logo will only become visible "
+                "after you've saved your changes and published the OiRA tool."
+            ),
+        )
+
+
+class QuaiveCreateEuphorieSectorView(QuaiveCreateViewMixin, EuphorieSectorAddView):
+    form = QuaiveCreateEuphorieSectorForm
+
+
+class QuaiveCreateEuphorieCountryForm(
+    QuaiveCreateFormMixin, EuphorieCountryAddView.form
+):
+    pass
+
+
+class QuaiveCreateEuphorieCountryView(QuaiveCreateViewMixin, EuphorieCountryAddView):
+    form = QuaiveCreateEuphorieCountryForm
+
+
+class QuaiveCreateEuphorieRiskForm(QuaiveCreateFormMixin, EuphorieRiskAddView.form):
+    template = ViewPageTemplateFile("templates/quaive-form.pt")
+
+
+class QuaiveCreateEuphorieRiskView(QuaiveCreateViewMixin, EuphorieRiskAddView):
+    form = QuaiveCreateEuphorieRiskForm
+
+
+class QuaiveCreateEuphorieSurveyGroupForm(
+    QuaiveCreateFormMixin, EuphorieSurveyGroupAddView.form
+):
+    pass
+
+
+class QuaiveCreateEuphorieSurveyGroupView(
+    QuaiveCreateViewMixin, EuphorieSurveyGroupAddView
+):
+    form = QuaiveCreateEuphorieSurveyGroupForm
+
+
+class QuaiveCreateEuphorieSurveyForm(QuaiveCreateFormMixin, EuphorieSurveyAddView.form):
+    template = ViewPageTemplateFile("templates/quaive-form.pt")
+
+
+class QuaiveCreateEuphorieSurveyView(QuaiveCreateViewMixin, EuphorieSurveyAddView):
+    form = QuaiveCreateEuphorieSurveyForm
+
+
+class QuaiveCreateEuphorieModuleForm(QuaiveCreateFormMixin, EuphorieModuleAddView.form):
+    template = ViewPageTemplateFile("templates/quaive-form.pt")
+
+
+class QuaiveCreateEuphorieModuleView(QuaiveCreateViewMixin, EuphorieModuleAddView):
+    form = QuaiveCreateEuphorieModuleForm
+
+
+class QuaiveCreateEuphorieProfileQuestionForm(
+    QuaiveCreateFormMixin, EuphorieProfileQuestionAddView.form
+):
+    template = ViewPageTemplateFile("templates/quaive-form.pt")
+
+
+class QuaiveCreateEuphorieProfileQuestionView(
+    QuaiveCreateViewMixin, EuphorieProfileQuestionAddView
+):
+    form = QuaiveCreateEuphorieProfileQuestionForm
+
+
+class QuaiveCreateEuphorieSolutionForm(
+    QuaiveCreateFormMixin, EuphorieSolutionAddView.form
+):
+    template = ViewPageTemplateFile("templates/quaive-form.pt")
+
+
+class QuaiveCreateEuphorieSolutionView(QuaiveCreateViewMixin, EuphorieSolutionAddView):
+    form = QuaiveCreateEuphorieSolutionForm
diff --git a/src/osha/oira/ploneintranet/quaive_edit.py b/src/osha/oira/ploneintranet/quaive_edit.py
new file mode 100644
index 00000000..563609af
--- /dev/null
+++ b/src/osha/oira/ploneintranet/quaive_edit.py
@@ -0,0 +1,41 @@
+from euphorie.content.browser.country import EditForm as CountryEditForm
+from euphorie.content.browser.module import EditForm as ModuleEditForm
+from euphorie.content.browser.profilequestion import EditForm as ProfileQuestionEditForm
+from osha.oira.content.browser.risk import EditForm as RiskEditForm
+from osha.oira.content.browser.sector import EditForm as SectorEditForm
+from osha.oira.content.browser.solution import EditForm as SolutionEditForm
+from osha.oira.content.browser.survey import EditForm as SurveyEditForm
+from osha.oira.ploneintranet.quaive_mixin import QuaiveEditFormMixin
+from plone.dexterity.browser.edit import DefaultEditForm
+
+
+class CountryQuaiveEditForm(QuaiveEditFormMixin, CountryEditForm):
+    """Custom edit form designed to be embedded in Quaive"""
+
+
+class ModuleQuaiveEditForm(QuaiveEditFormMixin, ModuleEditForm):
+    """Custom edit form designed to be embedded in Quaive"""
+
+
+class ProfileQuestionQuaiveEditForm(QuaiveEditFormMixin, ProfileQuestionEditForm):
+    """Custom edit form designed to be embedded in Quaive"""
+
+
+class RiskQuaiveEditForm(QuaiveEditFormMixin, RiskEditForm):
+    """Custom edit form designed to be embedded in Quaive"""
+
+
+class SectorQuaiveEditForm(QuaiveEditFormMixin, SectorEditForm):
+    """Custom edit form designed to be embedded in Quaive"""
+
+
+class SolutionQuaiveEditForm(QuaiveEditFormMixin, SolutionEditForm):
+    """Custom edit form designed to be embedded in Quaive"""
+
+
+class SurveyQuaiveEditForm(QuaiveEditFormMixin, SurveyEditForm):
+    """Custom edit form designed to be embedded in Quaive"""
+
+
+class SurveyGroupQuaiveEditForm(QuaiveEditFormMixin, DefaultEditForm):
+    """Custom edit form designed to be embedded in Quaive"""
diff --git a/src/osha/oira/ploneintranet/quaive_mixin.py b/src/osha/oira/ploneintranet/quaive_mixin.py
new file mode 100644
index 00000000..ebc148a5
--- /dev/null
+++ b/src/osha/oira/ploneintranet/quaive_mixin.py
@@ -0,0 +1,24 @@
+from osha.oira.ploneintranet.interfaces import IQuaiveForm
+from zope.interface import alsoProvides
+from zope.interface import implementer
+
+
+@implementer(IQuaiveForm)
+class QuaiveEditFormMixin:
+    @property
+    def template(self):
+        return self.index
+
+    def nextURL(self):
+        return f"{self.context.absolute_url()}/@@{self.__name__}"
+
+    @property
+    def is_edit_form(self):
+        """Is this the main edit form or is it some other form?"""
+        return self.__name__ == "quaive-edit"
+
+    def update(self):
+        super().update()
+        for group in getattr(self, "groups", []):
+            #  This is needed to pick up the custom Quaive widgets
+            alsoProvides(group, IQuaiveForm)
diff --git a/src/osha/oira/ploneintranet/quaive_publish.py b/src/osha/oira/ploneintranet/quaive_publish.py
new file mode 100644
index 00000000..c5d6ca35
--- /dev/null
+++ b/src/osha/oira/ploneintranet/quaive_publish.py
@@ -0,0 +1,52 @@
+from euphorie.client.browser.publish import PublishSurvey
+from osha.oira.ploneintranet.quaive_mixin import QuaiveEditFormMixin
+
+
+class PublishSurveyQuaiveForm(QuaiveEditFormMixin, PublishSurvey):
+    """Page for publishing a survey, designed to be embedded in Quaive.
+
+    Note: this only displays some text, it does not actually do anything.
+    This text snippets are copied from 'euphorie.client.browser.templates.publish.pt'.
+    The logic for which text snippets to show, is defined in the PublishSurvey
+    view that we inherit from.
+
+    Now some background on what happens when publishing a survey, to make it a
+    bit easier to follow.
+
+    You have this path:
+
+      sectors/country/sector/surveygroup/survey
+
+    Here 'surveygroup' is of type euphorie.surveygroup, which in portal_types
+    has title 'OiRA Tool' and description 'A survey'.
+
+    'survey' is of type euphorie.survey, which in portal_type has title
+    'OiRA Tool version' and description 'A version of an OiRA Tool.'
+
+    So if you get confused, you are not the only one...
+
+    On the OiRA client side, you have this path:
+
+      client/country/sector/survey
+
+    So on the client side, survey groups do not exist.
+    When you publish a survey, its review_state is set to 'published'
+    and its contents are copied to client/country/sector/survey
+    where it overrides whatever is there.
+    So when you publish a new version of a tool, the old version is gone
+    from the client.  So only one tool version can really be seen as
+    being published.
+
+    But: the review_state of the old version as it was within the sector's
+    folder, is not changed: it is still 'published'.
+
+    An event handler in src/euphorie/content/surveygroup.py sets the id of
+    the survey as 'published' on the survey group:
+
+        >>> app.Plone.sectors.eu['covid-19']['covid-19'].published
+        'second-version-based-on-import'
+
+    I think this should change the review state of the previous survey to
+    'draft' though.  Or really of all sibling surveys (tool versions).
+    But that may be too drastic.
+    """
diff --git a/src/osha/oira/ploneintranet/templates/quaive-form.pt b/src/osha/oira/ploneintranet/templates/quaive-form.pt
new file mode 100644
index 00000000..039eeeba
--- /dev/null
+++ b/src/osha/oira/ploneintranet/templates/quaive-form.pt
@@ -0,0 +1,551 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:meta="http://xml.zope.org/namespaces/meta"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      meta:interpolation="true"
+      metal:use-macro="context/@@layout/macros/layout"
+      tal:define="
+        actions view/actions/values|nothing;
+      "
+      i18n:domain="nuplone"
+>
+
+  <metal:title fill-slot="title">${view/label}</metal:title>
+  <metal:content fill-slot="content">
+    <div id="quaive-content">
+      <form class="pat-form pat-inject"
+            id="${view/id}"
+            action="${python: request.get('quaive_edit_url') or request.getURL()}"
+            enctype="${view/enctype}"
+            method="${view/method}"
+            data-pat-inject="
+              source: #application-body; target: #application-body; history: record; &amp;&amp;
+              source: #sidebar-assessments; target: #sidebar-assessments
+            "
+      >
+
+        <!--! Editing toolbar -->
+        <div class="pat-toolbar sticky">
+          <div class="toolbar-functions-area">
+
+            <div class="toolbar-section editor">
+              <div class="editor-toolbar tiptap"
+                    id="editor-toolbar">
+
+                <div class="pat-collapsible pat-context-menu formatting-menu align-left no-label icon-paragraph closed"
+                     data-pat-collapsible="
+                        store: none;
+                        scroll-selector: none;
+                        trigger: #context-menu-trigger-formatting-editor-toolbar;
+                        close-trigger: .context-menu:not(.formatting-menu),.close-menu;"
+                >
+                  <strong class="context-menu-label menu-trigger pat-tooltip"
+                          id="context-menu-trigger-formatting-editor-toolbar"
+                          data-pat-tooltip="
+                            trigger: hover;
+                            source: content;
+                            position-list: tm;
+                            class: label"
+                          i18n:translate=""
+                  >Formatting</strong>
+                  <div class="panel-content">
+                    <p class="close-menu">Close</p>
+                    <ul class="menu-list">
+                      <li>
+                        <button class="button-heading-level-2 icon-header"
+                                type="button"
+                        >Header level 2</button>
+                      </li>
+                      <li>
+                        <button class="button-heading-level-3 icon-header"
+                                type="button"
+                        >Header level 3</button>
+                      </li>
+                      <li>
+                        <button class="button-heading-level-4 icon-header"
+                                type="button"
+                        >Header level 4</button>
+                      </li>
+                      <li>
+                        <button class="button-paragraph icon-paragraph"
+                                type="button"
+                        >Normal</button>
+                      </li>
+                      <li>
+                        <button class="button-blockquote icon-quote-left"
+                                type="button"
+                        >Quote</button>
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+
+                <button class="icon icon-bold button-bold pat-tooltip"
+                        type="button"
+                        data-pat-tooltip="trigger: hover; source: content; position-list: tm; class: label"
+                >Bold</button>
+
+                <button class="icon icon-italic button-italic pat-tooltip"
+                        type="button"
+                        data-pat-tooltip="trigger: hover; source: content; position-list: tm; class: label"
+                >Italic</button>
+
+                <button class="icon icon-strike button-strike pat-tooltip"
+                        type="button"
+                        data-pat-tooltip="trigger: hover; source: content; position-list: tm; class: label"
+                >Strikethrough</button>
+
+                <a class="icon icon-link button-link pat-modal pat-tooltip"
+                   href="#tiptap-modal-hyperlink"
+                   data-pat-modal="class: medium panel panel-hyperlink"
+                   data-pat-tooltip="trigger: hover; source: content; position-list: tm; class: label"
+                >Hyperlink</a>
+
+                <button class="button-horizontal-rule icon icon-minus pat-tooltip"
+                        type="button"
+                        data-pat-tooltip="trigger: hover; source: content; position-list: tm; class: label"
+                >Horizontal line</button>
+
+                <div class="pat-collapsible pat-context-menu list-menu closed align-left no-label icon-list"
+                     type="button"
+                     data-pat-collapsible="
+                        store: none;
+                        scroll-selector: none;
+                        trigger: #context-menu-trigger-list-editor-toolbar;
+                        close-trigger: .context-menu:not(.list-menu),.close-menu;"
+                >
+                  <strong class="context-menu-label menu-trigger pat-tooltip"
+                          id="context-menu-trigger-list-editor-toolbar"
+                          data-pat-tooltip="
+                            trigger: hover;
+                            source: content;
+                            position-list: tm;
+                            class: label"
+                  >Lists</strong>
+                  <div class="panel-content">
+                    <p class="close-menu">Close</p>
+                    <ul class="menu-list">
+                      <li>
+                        <button class="button-unordered-list icon-list-bullet"
+                                type="button"
+                        >Bullet list</button>
+                      </li>
+                      <li>
+                        <button class="button-ordered-list icon-list-numbered"
+                                type="button"
+                        >Ordered liste</button>
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+
+                <a class="icon icon-picture-1 button-image pat-modal pat-tooltip"
+                   href="#tiptap-modal-image"
+                   data-pat-modal="class: large panel image-picker"
+                   data-pat-tooltip="trigger: hover; source: content; position-list: tm; class: label"
+                >Picture</a>
+
+                <a class="icon icon-video button-embed pat-modal pat-tooltip"
+                   href="#tiptap-modal-embed"
+                   data-pat-modal="class: medium panel embed-video"
+                   data-pat-tooltip="trigger: hover; source: content; position-list: tm; class: label"
+                >Video</a>
+
+                <div class="pat-collapsible pat-context-menu closed align-right table-menu no-label icon-table"
+                     id="table-menu-editor-toolbar"
+                     data-pat-collapsible="
+                        store: none;
+                        scroll-selector: none;
+                        trigger: #context-menu-trigger-table-editor-toolbar;
+                        close-trigger: .context-menu:not(.table-menu),.close-menu;"
+                >
+                  <strong class="context-menu-label menu-trigger pat-tooltip"
+                          id="context-menu-trigger-table-editor-toolbar"
+                          data-pat-tooltip="trigger: hover; source: content; position-list: tm; class: label"
+                  >Table</strong>
+                  <div class="panel-content">
+                    <p class="close-menu">Close</p>
+                    <ul class="menu-list">
+                      <li>
+                        <button class="button-table-create icon-plus-squared"
+                                type="button"
+                        >New table</button>
+                      </li>
+                      <li>
+                        <button class="button-table-remove icon-minus-squared"
+                                type="button"
+                        >Remove table</button>
+                      </li>
+                      <li>
+                        <button class="button-table-add-column-left icon-add-column-left"
+                                type="button"
+                        >Add left column</button>
+                      </li>
+                      <li>
+                        <button class="button-table-add-column-right icon-add-column"
+                                type="button"
+                        >Add right columnt</button>
+                      </li>
+                      <li>
+                        <button class="button-table-remove-column icon-remove-column"
+                                type="button"
+                        >Remove column</button>
+                      </li>
+                      <li>
+                        <button class="button-table-add-row-above icon-add-row-above"
+                                type="button"
+                        >Add top row</button>
+                      </li>
+                      <li>
+                        <button class="button-table-add-row-below icon-add-row"
+                                type="button"
+                        >Add bottom row</button>
+                      </li>
+                      <li>
+                        <button class="button-table-remove-row icon-remove-row"
+                                type="button"
+                        >Remove row</button>
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+
+              </div>
+
+            </div>
+            <div class="toolbar-section quick-functions"
+                 id="module-toolbar-quick-functions"
+            >
+              <tal:action repeat="action python: reversed(actions)"
+                          replace="structure action/render"
+              />
+            </div>
+          </div>
+        </div>
+
+        <div class="container">
+
+          <div class="pat-well pat-collapsible borderless open"
+               id="fieldset--${view/id}"
+               data-pat-collapsible="
+                   trigger: #well-header--${view/id};
+                   store: local;
+                   scroll-selector: self;
+                   scroll-offset: 120px;
+               "
+          >
+            <div class="well-title-group">
+              <h2 class="well-header"
+                  id="well-header--${view/id}">
+                  ${view/label}
+              </h2>
+              <div class="buttons">
+                <dfn class="icon help help-icon pat-tooltip tooltip-active-click"
+                     data-pat-tooltip="class: info; trigger: click; source: content; position-list: tl"
+                     tal:define="
+                       description view/description;
+                     "
+                     tal:condition="description"
+                >
+                    ${description}
+                </dfn>
+              </div>
+            </div>
+
+            <div class="panel-content">
+              <p class="message ${python:'error' if view.widgets.errors else 'notice'}"
+                 tal:define="
+                   status view/status;
+                 "
+                 tal:condition="status"
+                 tal:content="status"
+                 i18n:domain="plone"
+              >Form-global message</p>
+              <fieldset class="section horizontal">
+                <tal:widget tal:repeat="widget view/widgets/values">
+                  <tal:widget define="
+                                error nocall: widget/error|nothing;
+                              ">
+                    ${structure: widget/render}
+                    <p class="pat-notice error"
+                       tal:condition="python: error"
+                    >
+                      ${structure: error/render}
+                    </p>
+                  </tal:widget>
+                </tal:widget>
+              </fieldset>
+            </div>
+          </div>
+
+          <div class="pat-well pat-collapsible borderless closed"
+               id="fieldset-${group/__name__}"
+               data-pat-collapsible="
+                   trigger: #well-header--${group/__name__};
+                   store: local;
+                   scroll-selector: self;
+                   scroll-offset: 120px;
+               "
+               tal:repeat="group view/groups|nothing"
+          >
+            <div class="well-title-group">
+              <h2 class="well-header"
+                  id="well-header--${group/__name__}">
+                  ${group/label}
+              </h2>
+              <div class="buttons">
+                <dfn class="icon help help-icon pat-tooltip tooltip-active-click"
+                     data-pat-tooltip="class: info; trigger: click; source: content; position-list: tl"
+                     tal:define="
+                       description group/description;
+                     "
+                     tal:condition="description"
+                >
+                    ${description}
+                </dfn>
+              </div>
+            </div>
+            <div class="panel-content">
+              <fieldset class="horizontal">
+                <tal:widget tal:repeat="widget group/widgets/values">
+                  <tal:widget define="
+                                error nocall: widget/error|nothing;
+                              ">
+                    ${structure: widget/render}
+                    <p class="pat-notice error"
+                       tal:condition="python: error"
+                    >
+                      ${structure: error/render}
+                    </p>
+                  </tal:widget>
+                </tal:widget>
+              </fieldset>
+            </div>
+          </div>
+        </div>
+        <input name="oira_type"
+               type="hidden"
+               value="${python: view.__name__.rpartition('-')[-1]}"
+        />
+      </form>
+
+      <!-- modal image editor -->
+      <template id="tiptap-modal-image">
+        <h1>Edit Image</h1>
+        <div class="panel-body image-panel">
+          <div class="container">
+            <form class="pat-form">
+              <fieldset class="horizontal">
+                <label class="image-url">
+                  <tal:i18n i18n:translate="">Image URL</tal:i18n>
+                  <span class="button-field type-url">
+                    <input class="pat-autofocus"
+                           name="tiptap-src"
+                           oninput="if (this.value) { this.nextElementSibling.href = this.value; } else { this.nextElementSibling.removeAttribute('href'); }"
+                           type="url"
+                           value=""
+                    />
+                    <a class="follow"
+                       id="event-url-follow-button"
+                       href=""
+                       target="_blank"
+                       title="Visit linked web page"
+                       i18n:attributes="title"
+                       i18n:translate=""
+                    >Follow</a>
+                  </span>
+                </label>
+                <label class="image-title">
+                  <tal:i18n i18n:translate="">Title</tal:i18n>
+                  <input name="tiptap-title"
+                         type="text"
+                  />
+                </label>
+                <label class="image-alt">
+                  <tal:i18n i18n:translate="">Alternative text</tal:i18n>
+                  <input name="tiptap-alt"
+                         type="text"
+                  />
+                </label>
+                <label class="image-caption">
+                  <tal:i18n i18n:translate="">Image caption</tal:i18n>
+                  <textarea name="tiptap-caption"></textarea>
+                </label>
+              </fieldset>
+            </form>
+            <div class="buttons button-bar pat-bumper">
+              <button class="pat-button default close-panel icon-ok-circle"
+                      name="tiptap-confirm"
+                      type="submit"
+                      i18n:translate=""
+              >Insert</button>
+              <button class="pat-button close-panel icon-cancel-circle"
+                      type="button"
+                      i18n:translate=""
+              >Cancel</button>
+            </div>
+          </div>
+        </div>
+      </template>
+
+      <!-- context menu image -->
+      <template id="context-menu-image">
+        <ul class="menu tiptap-image-context-menu">
+          <li>
+            <button
+              type="button"
+              class="close-panel tiptap-edit-image">Edit image</button>
+          </li>
+          <li>
+            <button
+              type="button"
+              class="close-panel tiptap-remove-image">Remove image</button>
+          </li>
+        </ul>
+      </template>
+
+      <!-- modal embed editor -->
+      <template id="tiptap-modal-embed">
+        <h1>Edit Embed</h1>
+        <div class="panel-body embed-panel">
+          <div class="container">
+            <form class="pat-form">
+              <fieldset class="horizontal">
+                <label class="embed-url">
+                  <tal:i18n i18n:translate="">Video/Audio URL</tal:i18n>
+                  <span class="button-field type-url">
+                    <input class="pat-autofocus"
+                           name="tiptap-src"
+                           oninput="if (this.value) { this.nextElementSibling.href = this.value; } else { this.nextElementSibling.removeAttribute('href'); }"
+                           type="url"
+                           value=""
+                    />
+                    <a class="follow"
+                       id="event-url-follow-button"
+                       href=""
+                       target="_blank"
+                       title="Visit linked web page"
+                       i18n:attributes="title"
+                       i18n:translate=""
+                    >Follow</a>
+                  </span>
+                </label>
+                <label class="embed-title">
+                  <tal:i18n i18n:translate="">Title</tal:i18n>
+                  <input name="tiptap-title"
+                         type="text"
+                  />
+                </label>
+                <label class="embed-caption">
+                  <tal:i18n i18n:translate="">Video/Audio caption</tal:i18n>
+                  <textarea name="tiptap-caption"></textarea>
+                </label>
+              </fieldset>
+            </form>
+            <div class="buttons button-bar pat-bumper">
+              <button class="pat-button default close-panel icon-ok-circle"
+                      name="tiptap-confirm"
+                      type="submit"
+                      i18n:translate=""
+              >Insert</button>
+              <button class="pat-button close-panel icon-cancel-circle"
+                      type="button"
+                      i18n:translate=""
+              >Cancel</button>
+            </div>
+          </div>
+        </div>
+      </template>
+
+      <!-- context menu embed -->
+      <template id="context-menu-embed">
+        <ul class="menu tiptap-embed-context-menu">
+          <li>
+            <button
+              type="button"
+              class="close-panel tiptap-edit-embed">Edit embed</button>
+          </li>
+          <li>
+            <button
+              type="button"
+              class="close-panel tiptap-remove-embed">Remove embed</button>
+          </li>
+        </ul>
+      </template>
+
+      <!-- modal link editor -->
+      <template id="tiptap-modal-hyperlink">
+        <h1>Edit Link</h1>
+        <div class="panel-body embed-panel">
+          <div class="container">
+            <form class="pat-form">
+              <fieldset class="horizontal">
+                <label class="url">
+                  <tal:i18n i18n:translate="">URL</tal:i18n>
+                  <span class="button-field type-url">
+                    <input class="pat-autofocus"
+                           name="tiptap-href"
+                           oninput="if (this.value) { this.nextElementSibling.href = this.value; } else { this.nextElementSibling.removeAttribute('href'); }"
+                           type="url"
+                           value=""
+                    />
+                    <a class="follow"
+                       id="event-url-follow-button"
+                       href=""
+                       target="_blank"
+                       title="Visit linked web page"
+                       i18n:attributes="title"
+                       i18n:translate=""
+                    >Follow</a>
+                  </span>
+                </label>
+                <label class="url--text">
+                  <tal:i18n i18n:translate="">Link text</tal:i18n>
+                  <input name="tiptap-text"
+                         type="text"
+                  />
+                </label>
+              </fieldset>
+            </form>
+            <div class="buttons button-bar pat-bumper">
+              <button class="pat-button default close-panel icon-ok-circle"
+                      name="tiptap-confirm"
+                      type="submit"
+                      i18n:translate=""
+              >Insert</button>
+              <button class="pat-button close-panel icon-cancel-circle"
+                      type="button"
+                      i18n:translate=""
+              >Cancel</button>
+            </div>
+          </div>
+        </div>
+      </template>
+
+      <!-- context menu link -->
+      <template id="tiptap-context-menu-hyperlink">
+        <ul class="menu tiptap-link-context-menu">
+          <li>
+            <a class="icon-link close-panel tiptap-open-new-link"
+               href=""
+               target="_blank"
+               i18n:translate=""
+            >Visit linked web page</a>
+          </li>
+          <li>
+            <a class="icon-pencil close-panel tiptap-edit-link"
+               i18n:translate=""
+            >Edit link</a>
+          </li>
+          <li>
+            <a class="icon-unlink close-panel tiptap-unlink"
+               i18n:translate=""
+            >Unlink</a>
+          </li>
+        </ul>
+      </template>
+
+    </div>
+  </metal:content>
+</html>
diff --git a/src/osha/oira/ploneintranet/templates/quaive-panel-form.pt b/src/osha/oira/ploneintranet/templates/quaive-panel-form.pt
new file mode 100644
index 00000000..2506d86d
--- /dev/null
+++ b/src/osha/oira/ploneintranet/templates/quaive-panel-form.pt
@@ -0,0 +1,53 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:meta="http://xml.zope.org/namespaces/meta"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      meta:interpolation="true"
+      metal:use-macro="context/@@layout/macros/layout"
+      tal:define="
+        actions view/actions/values|nothing;
+      "
+      i18n:domain="nuplone"
+>
+
+  <metal:title fill-slot="title" />
+  <metal:content fill-slot="content">
+    <div class="modal-panel-contents"
+         id="quaive-content"
+    >
+      <div class="modal-panel-header">
+        <h1 class="modal-panel-title">${view/label}</h1>
+      </div>
+
+      <form class="pat-inject pat-form modal-panel-body"
+            id="${view/id}"
+            action="${python: request.get('quaive_edit_url') or request.getURL()}"
+            enctype="${view/enctype}"
+            method="${view/method}"
+            data-pat-inject="source: #pat-modal-panel-space::element; target: #pat-modal-panel-space::element"
+      >
+
+        <fieldset class="horizontal">
+          <tal:widget tal:repeat="widget view/widgets/values"
+                      content="structure widget/render"
+          />
+          <input name="oira_type"
+                 type="hidden"
+                 value="${python: view.__name__.rpartition('-')[-1]}"
+          />
+
+        </fieldset>
+
+        <div class="modal-panel-footer modal-panel-main-button-bar pat-button-bar pat-bumper bumped bumped-right bumped-left">
+          <tal:action repeat="action actions"
+                      replace="structure action/render"
+          />
+        </div>
+
+      </form>
+
+    </div>
+
+  </metal:content>
+</html>
diff --git a/src/osha/oira/ploneintranet/templates/quaive-publish.pt b/src/osha/oira/ploneintranet/templates/quaive-publish.pt
new file mode 100644
index 00000000..7c71b34a
--- /dev/null
+++ b/src/osha/oira/ploneintranet/templates/quaive-publish.pt
@@ -0,0 +1,33 @@
+<tal:comment condition="TODO|nothing">
+  This is copied from 'euphorie.client.browser.templates.publish.pt'.
+  It could be nice to have these texts shared.
+</tal:comment>
+<div id="quaive-content"
+     i18n:domain="euphorie"
+>
+  <p tal:condition="not:view/is_surveygroup_published"
+     i18n:translate="intro_publish_first_time"
+  >Are you sure you want to publish this OiRA Tool? After publication
+    the OiRA Tool will appear in the online client and be accessible by all users.</p>
+  <tal:block condition="view/is_surveygroup_published">
+    <p tal:condition="view/is_this_survey_published"
+       i18n:translate="intro_publish_survey_published"
+    >Are you sure you want to republish this OiRA Tool? This will make
+      all changes made public.</p>
+    <p tal:condition="not:view/is_this_survey_published"
+       i18n:translate="intro_publish_other_survey_published"
+    >Are you sure you want to publish this OiRA Tool version? This will
+      replace the current version.</p>
+    <p class="message warning"
+       tal:condition="view/is_structure_changed"
+       i18n:translate="intro_publish_survey_structure_changed"
+    >The structure of your OiRA tool has changed.
+     If you publish now, existing users of this OiRA tool will lose parts of their answers.
+     Please contact the OiRA team if you need assistance on this subject.
+      You can also refer to the chapter &ldquo;Re-working a published OiRA tool&rdquo; of the OiRA manual.</p>
+  </tal:block>
+  <tal:comment condition="nothing">We must generate the authenticator token on this side.</tal:comment>
+  <p i18n:translate="help_publish_url">After publication the OiRA Tool will be available at
+    <strong i18n:name="url">${view/client_url}</strong>.</p>
+  <span tal:replace="structure context/@@authenticator/authenticator"></span>
+</div>
diff --git a/src/osha/oira/ploneintranet/z3cform/__init__.py b/src/osha/oira/ploneintranet/z3cform/__init__.py
new file mode 100644
index 00000000..e34dce71
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/__init__.py
@@ -0,0 +1,9 @@
+_applied = False
+
+if not _applied:
+    from z3c.form.form import Form
+
+    # Zap the totally useless 'There were some errors' message.
+    Form.formErrorsMessage = None
+    del Form
+    _applied = True
diff --git a/src/osha/oira/ploneintranet/z3cform/configure.zcml b/src/osha/oira/ploneintranet/z3cform/configure.zcml
new file mode 100644
index 00000000..c8c4449b
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/configure.zcml
@@ -0,0 +1,176 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:z3c="http://namespaces.zope.org/z3c"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    >
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.ISingleCheckBoxWidget"
+      template="templates/checkbox_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.ICheckBoxWidget"
+      template="templates/checkboxlist_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.IPasswordWidget"
+      template="templates/password_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.IRadioWidget"
+      template="templates/radio_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.ISelectWidget"
+      template="templates/select_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.ISubmitWidget"
+      template="templates/submit_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.ITextWidget"
+      template="templates/text_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="euphorie.content.dependency.IConditionalTextWidget"
+      template="templates/conditional_text_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.ITextAreaWidget"
+      template="templates/textarea_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.ITextLinesWidget"
+      template="templates/textarea_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="euphorie.content.dependency.IConditionalHtmlTextWidget"
+      template="templates/conditional_textarea_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.ITextLinesWidget"
+      template="templates/textlines_display.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="display"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.IMultiWidget"
+      template="templates/multi_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.IObjectWidget"
+      template="templates/object_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="plone.app.z3cform.wysiwyg.widget.IWysiwygWidget"
+      template="templates/wysiwyg_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="z3c.form.interfaces.IOrderedSelectWidget"
+      template="templates/orderedselect_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="plone.formwidget.namedfile.interfaces.INamedFileWidget"
+      template="templates/namedfile_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="plone.formwidget.namedfile.interfaces.INamedImageWidget"
+      template="templates/namedimage_input.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="euphorie.content.widgets.survey_source_selection.ISurveySourceSelectionWidget"
+      template="templates/survey_source_selection.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <z3c:widgetTemplate
+      view="..interfaces.IQuaiveForm"
+      widget="euphorie.content.widgets.logo.LogoWidget"
+      template="templates/logo.pt"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      mode="input"
+      />
+
+  <browser:page
+      name="quaive_form_macros"
+      for="*"
+      template="templates/quaive_form_macros.pt"
+      permission="zope2.View"
+      layer="osha.oira.nuplone.interfaces.IOiRAFormLayer"
+      />
+
+</configure>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/checkbox_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/checkbox_input.pt
new file mode 100644
index 00000000..61a3085b
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/checkbox_input.pt
@@ -0,0 +1,46 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+        label view/field/label_content|nothing;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+
+  <fieldset class="pat-form-field-toggle group ${dependencies/ploneintranet_classes}"
+            data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    <legend>
+      ${python: view.items[0]['label']}
+    </legend>
+    <label class="pat-toggle-switch"
+           tal:repeat="item view/items"
+    >
+      <tal:if condition="label">
+          ${label}
+      </tal:if>
+      <tal:if condition="not:label">
+        <tal:i18n i18n:translate="">On</tal:i18n>
+      </tal:if>
+      <input class="${view/klass}"
+             id="${view/id}"
+             checked="${python:'checked' if item['checked'] else None}"
+             disabled="${view/disabled}"
+             name="${item/name}"
+             readonly="${view/readonly}"
+             type="checkbox"
+             value="${item/value}"
+      />
+    </label>
+    <input name="${view/name}-empty-marker"
+           type="hidden"
+           value="1"
+    />
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+
+  </fieldset>
+
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/checkboxlist_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/checkboxlist_input.pt
new file mode 100644
index 00000000..26bb13ae
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/checkboxlist_input.pt
@@ -0,0 +1,46 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <fieldset class="pat-form-field-toggle group ${dependencies/ploneintranet_classes}"
+            data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    <legend>
+      ${view/label}
+    </legend>
+    <div class="pat-checklist">
+      <label class="pat-toggle-switch"
+             tal:repeat="item view/items"
+      >
+        <tal:if condition="item/label">
+            ${item/label}
+        </tal:if>
+        <tal:if condition="not:item/label">
+          <tal:i18n i18n:translate="">On</tal:i18n>
+        </tal:if>
+        <input class="${view/klass}"
+               id="${item/id}"
+               checked="${python:'checked' if item['checked'] else None}"
+               disabled="${view/disabled}"
+               name="${item/name}"
+               readonly="${view/readonly}"
+               type="checkbox"
+               value="${item/value}"
+        />
+      </label>
+      <input name="${view/name}-empty-marker"
+             type="hidden"
+             value="1"
+      />
+    </div>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+
+  </fieldset>
+
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/conditional_text_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/conditional_text_input.pt
new file mode 100644
index 00000000..123bc720
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/conditional_text_input.pt
@@ -0,0 +1,43 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <tal:comment condition="nothing">
+    This is a conditional text input widget.
+
+    It is used to display a text input that is only visible when a certain condition is met.
+    The condition is defined in the schema of the form.
+
+    Never set the required attribute to true here.
+    Backend validation takes care of that.
+
+    If you set the required attributehere, the form will not submit if the input is not visible
+    and pat-validation is active.
+  </tal:comment>
+  <label class="${dependencies/ploneintranet_classes}"
+         title="${view/field/description}"
+         data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    ${view/label}
+    <input class="${view/klass}"
+           id="${view/id}"
+           disabled="${view/disabled}"
+           maxlength="${view/maxlength}"
+           name="${view/name}"
+           readonly="${view/readonly}"
+           required="${never_set_as_required_backend_validation_takes_care_of_that|nothing}"
+           size="${view/size}"
+           type="${view/type|string:text}"
+           value="${view/value}"
+    />
+
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+
+  </label>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/conditional_textarea_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/conditional_textarea_input.pt
new file mode 100644
index 00000000..a793e99f
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/conditional_textarea_input.pt
@@ -0,0 +1,41 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <tal:comment condition="nothing">
+    This is a conditional text area widget.
+
+    It is used to display a textarea that is only visible when a certain condition is met.
+    The condition is defined in the schema of the form.
+
+    Never set the required attribute to true here.
+    Backend validation takes care of that.
+
+    If you set the required attributehere, the form will not submit if the textarea is not visible
+    and pat-validation is active.
+  </tal:comment>
+  <label class="${dependencies/ploneintranet_classes}"
+         title="${view/field/description}"
+         data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    ${view/label}
+    <textarea class="${view/klass}"
+              id="${view/id}"
+              cols="${view/cols}"
+              disabled="${view/disabled}"
+              name="${view/name}"
+              readonly="${view/readonly}"
+              required="${never_set_as_required_backend_validation_takes_care_of_that|nothing}"
+              rows="${view/rows}"
+    >${view/value}</textarea>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+
+  </label>
+
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/date_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/date_input.pt
new file mode 100644
index 00000000..5a202ef2
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/date_input.pt
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <label class="${dependencies/ploneintranet_classes}"
+         data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    ${view/label}
+    <input id="${view/id}"
+           name="${view/name}"
+           type="date"
+           value="${view/value}"
+    />
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+  </label>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/datetime_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/datetime_input.pt
new file mode 100644
index 00000000..c667161b
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/datetime_input.pt
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <label class="${dependencies/ploneintranet_classes}"
+         data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    ${view/label}
+    <input id="${view/id}"
+           name="${view/name}"
+           type="datetime-local"
+           value="${view/value}"
+    />
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+  </label>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/error.pt b/src/osha/oira/ploneintranet/z3cform/templates/error.pt
new file mode 100644
index 00000000..fb4ed5c2
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/error.pt
@@ -0,0 +1,8 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:omit-tag=""
+>
+  <em class="message warning"
+      tal:content="view/message"
+  >Error</em>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/form.pt b/src/osha/oira/ploneintranet/z3cform/templates/form.pt
new file mode 100644
index 00000000..85e523dc
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/form.pt
@@ -0,0 +1,72 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      metal:use-macro="context/@@layout/macros/layout"
+      i18n:domain="nuplone"
+>
+
+  <metal:title fill-slot="title">${view/label}</metal:title>
+  <metal:content fill-slot="content">
+    <p class="message ${python:'error' if view.widgets.errors else 'notice'}"
+       tal:define="
+         status view/status;
+       "
+       tal:condition="status"
+       tal:content="status"
+       i18n:domain="plone"
+    >Form-global message</p>
+    <p class="discrete"
+       tal:condition="python:getattr(view, 'description', None)"
+    >${view/description}</p>
+
+    <form class="concise"
+          id="${view/id}"
+          action="${request/getURL}"
+          enctype="${view/enctype}"
+          method="${view/method}"
+    >
+      <fieldset>
+        <tal:widget repeat="widget view/widgets/values"
+                    replace="structure widget/render"
+        />
+      </fieldset>
+
+      <tal:groupform condition="python:getattr(view, 'groups', None)">
+        <fieldset class="${group/layout|nothing}"
+                  tal:repeat="group view/groups"
+        >
+          <legend tal:define="
+                    legend group/label;
+                  "
+                  tal:condition="legend"
+                  i18n:domain="plone"
+                  i18n:translate=""
+          >${legend}</legend>
+          <p class="discrete"
+             tal:define="
+               description group/description;
+             "
+             tal:condition="description"
+          >${description}</p>
+          <tal:widget repeat="widget group/widgets/values">
+            <tal:render replace="structure widget/render" />
+          </tal:widget>
+        </fieldset>
+      </tal:groupform>
+
+      <div class="buttonBar"
+           tal:define="
+             actions view/actions/values|nothing;
+           "
+           tal:condition="actions"
+      >
+        <tal:action repeat="action actions"
+                    replace="structure action/render"
+        />
+      </div>
+    </form>
+  </metal:content>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/layout.pt b/src/osha/oira/ploneintranet/z3cform/templates/layout.pt
new file mode 100644
index 00000000..9401c029
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/layout.pt
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      metal:use-macro="context/@@layout/macros/layout"
+      i18n:domain="nuplone"
+>
+  <metal:title fill-slot="title">${view/label}</metal:title>
+  <metal:content fill-slot="content">
+    <tal:form replace="structure view/contents" />
+  </metal:content>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/logo.pt b/src/osha/oira/ploneintranet/z3cform/templates/logo.pt
new file mode 100644
index 00000000..c5ccacd1
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/logo.pt
@@ -0,0 +1,65 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <fieldset class="group">
+    <legend>${view/label}</legend>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+    <fieldset class="vertical pat-checklist">
+      <p class="legend"
+         i18n:translate="label_logo_selection"
+      >Which logo you would like to display in the lower left corner?</p>
+
+      <label>
+        <input checked="${python:'checked' if not view.allow_nochange else None}"
+               name="${view/name}.action"
+               type="radio"
+               value="remove"
+        /><tal:translate i18n:translate="Official OiRA Logo">Official OiRA Logo</tal:translate>
+      </label>
+      <label>
+        <input checked="${python:'checked' if view.allow_nochange else None}"
+               name="${view/name}.action"
+               type="radio"
+               value="update"
+        /><tal:translate i18n:translate="logo_my_own">My own</tal:translate>
+      </label>
+      <fieldset class="vertical pat-checklist pat-depends"
+                data-pat-depends="condition: ${view/name}.action=update"
+      >
+        <input name="${view/name}"
+               type="file"
+        />
+        <img accept="image/*"
+             alt="'${python: view.field.__name__}"
+             src="${scale/url}"
+             style="width: 100%;margin-top: 1em;"
+             tal:define="
+               images context/@@images;
+               scale python:images.scale('logo', height=300, width=300, direction='thumbnail');
+             "
+             tal:condition="scale"
+             tal:on-error="nothing"
+        />
+        <p class="message notice"
+           style="width:100%"
+           i18n:translate="logo_instructions"
+        >
+          You may get the best results if you upload a logo as a
+          <strong i18n:name="transparent"
+                  i18n:translate="logo_instructions_transparent"
+          >transparent</strong>
+          PNG file of at least 100 pixels in height. Uploading larger images is fine, the logo will be scaled down to the right size automatically.
+        </p>
+      </fieldset>
+      <input name="${view/name}.action-empty-marker"
+             type="hidden"
+             value="1"
+      />
+    </fieldset>
+
+  </fieldset>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/multi_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/multi_input.pt
new file mode 100644
index 00000000..311014d7
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/multi_input.pt
@@ -0,0 +1,31 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <fieldset class="concise multiWidget ${dependencies/ploneintranet_classes}"
+            data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    <legend>${view/label}
+      <sup class="required"
+           tal:condition="view/required"
+      >*</sup></legend>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+    <input type="hidden"
+           tal:replace="structure view/counterMarker"
+    />
+    <tal:field repeat="widget view/widgets"><tal:widget condition="python:widget.mode!='hidden'"
+                  replace="structure widget/render"
+      /></tal:field>
+    <button class="add jsOnly"
+            type="button"
+            value="${view/form/action}/++widget++${view/field/__name__}/new-entry"
+            i18n:translate=""
+    >Add new</button>
+  </fieldset>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/namedfile_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/namedfile_input.pt
new file mode 100644
index 00000000..0dc4e40c
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/namedfile_input.pt
@@ -0,0 +1,31 @@
+<fieldset xmlns="http://www.w3.org/1999/xhtml"
+          xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+          xmlns:metal="http://xml.zope.org/namespaces/metal"
+          xmlns:tal="http://xml.zope.org/namespaces/tal"
+          class="group ${dependencies/ploneintranet_classes}"
+          data-pat-depends="${dependencies/data_pat_depends}"
+          tal:define="
+            download_url view/download_url;
+            dependencies nocall:view/@@dependencies;
+          "
+          i18n:domain="nuplone"
+>
+  <p class="legend">${view/label}</p>
+  <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+  <tal:has-file condition="view/allow_nochange">
+    <p class="floatAfter"><a href="${view/download_url}">${view/filename}</a>
+      (${view/file_size})</p>
+    <label><input name="${view/name}.action"
+             type="checkbox"
+             value="remove"
+      />
+      <tal:span i18n:translate="">Remove file</tal:span></label>
+  </tal:has-file>
+  <input class="${view/klass}"
+         id="${view/id}"
+         disabled="${view/disabled}"
+         name="${view/name}"
+         readonly="${view/readonly}"
+         type="file"
+  />
+</fieldset>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/namedimage_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/namedimage_input.pt
new file mode 100644
index 00000000..a361d89a
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/namedimage_input.pt
@@ -0,0 +1,46 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:meta="http://xml.zope.org/namespaces/meta"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      class="comprehensive filefield ${view/@@dependencies}"
+      meta:interpolation="true"
+      tal:define="
+        download_url view/download_url;
+        dependencies nocall:view/@@dependencies;
+      "
+      i18n:domain="nuplone"
+>
+  <fieldset class="group ${dependencies/ploneintranet_classes}"
+            data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    <legend>${view/label}</legend>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+    <input class="${view/klass}"
+           id="${view/id}"
+           disabled="${view/disabled}"
+           name="${view/name}"
+           readonly="${view/readonly}"
+           type="file"
+    />
+    <tal:has-image condition="view/allow_nochange">
+      <img class="floatAfter"
+           alt=""
+           src="${scale/url}"
+           width="${scale/width}"
+           tal:define="
+             images context/@@images;
+             scale python:images.scale(view.field.getName(), height=64, width=64, direction='thumbnail');
+           "
+           tal:condition="scale"
+      />
+      <label class="pat-checklist">
+        <input name="${view/name}.action"
+               type="checkbox"
+               value="remove"
+        />
+        <tal:span i18n:translate="">Remove image</tal:span>
+      </label>
+    </tal:has-image>
+  </fieldset>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/object_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/object_input.pt
new file mode 100644
index 00000000..698edad4
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/object_input.pt
@@ -0,0 +1,31 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <fieldset class="concise ${dependencies/ploneintranet_classes}"
+            data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    <legend>${view/label}
+      <sup class="required"
+           tal:condition="view/required"
+      >*</sup></legend>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+    <tal:field repeat="widget view/subform/widgets/values"
+               replace="structure widget/render"
+    />
+    <input name="${view/name}-empty-marker"
+           type="hidden"
+           value="1"
+    />
+    <button class="remove jsOnly micro floatAfter"
+            type="button"
+            i18n:translate=""
+    >Remove</button>
+  </fieldset>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/orderedselect_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/orderedselect_input.pt
new file mode 100644
index 00000000..578ede3a
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/orderedselect_input.pt
@@ -0,0 +1,175 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+>
+  <script src="++resource++orderedselect_input.js"
+          type="text/javascript"
+  ></script>
+
+  <fieldset class="concise ${dependencies/ploneintranet_classes}"
+            data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    <legend>${view/label}
+      <sup class="required"
+           tal:condition="view/required"
+      >*</sup></legend>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+
+
+    <table class="ordered-selection-field"
+           border="0"
+           tal:attributes="
+             id view/id;
+           "
+    >
+      <tr>
+        <td>
+          <select class=""
+                  id="from"
+                  multiple
+                  name="from"
+                  size="8"
+                  tal:attributes="
+                    id string:${view/id}-from;
+                    name string:${view/name}.from;
+                    class view/klass;
+                    style view/style;
+                    title view/title;
+                    lang view/lang;
+                    onclick view/onclick;
+                    ondblclick view/ondblclick;
+                    onmousedown view/onmousedown;
+                    onmouseup view/onmouseup;
+                    onmouseover view/onmouseover;
+                    onmousemove view/onmousemove;
+                    onmouseout view/onmouseout;
+                    onkeypress view/onkeypress;
+                    onkeydown view/onkeydown;
+                    onkeyup view/onkeyup;
+                    disabled view/disabled;
+                    tabindex view/tabindex;
+                    onfocus view/onfocus;
+                    onblur view/onblur;
+                    onchange view/onchange;
+                    multiple view/multiple;
+                    size view/size;
+                  "
+          >
+            <option tal:repeat="entry view/notselectedItems"
+                    tal:content="nocall:entry/content"
+                    tal:attributes="
+                      value entry/value;
+                    "
+                    i18n:translate=""
+            ></option>
+          </select>
+        </td>
+        <td>
+          <button name="from2toButton"
+                  onclick="javascript:from2to()"
+                  type="button"
+                  value="&rarr;"
+                  tal:attributes="
+                    onClick string:javascript:from2to('${view/id}');
+                  "
+          >&rarr;</button>
+          <br />
+          <button name="to2fromButton"
+                  onclick="javascript:to2from()"
+                  type="button"
+                  value="&larr;"
+                  tal:attributes="
+                    onClick string:javascript:to2from('${view/id}');
+                  "
+          >&larr;</button>
+        </td>
+        <td>
+          <select class=""
+                  id="to"
+                  multiple
+                  name="to"
+                  size="8"
+                  tal:attributes="
+                    id string:${view/id}-to;
+                    name string:${view/name}.to;
+                    class view/klass;
+                    style view/style;
+                    title view/title;
+                    lang view/lang;
+                    onclick view/onclick;
+                    ondblclick view/ondblclick;
+                    onmousedown view/onmousedown;
+                    onmouseup view/onmouseup;
+                    onmouseover view/onmouseover;
+                    onmousemove view/onmousemove;
+                    onmouseout view/onmouseout;
+                    onkeypress view/onkeypress;
+                    onkeydown view/onkeydown;
+                    onkeyup view/onkeyup;
+                    disabled view/disabled;
+                    tabindex view/tabindex;
+                    onfocus view/onfocus;
+                    onblur view/onblur;
+                    onchange view/onchange;
+                    multiple view/multiple;
+                    size view/size;
+                  "
+          >
+            <option tal:repeat="entry view/selectedItems"
+                    tal:content="nocall:entry/content"
+                    tal:attributes="
+                      value entry/value;
+                    "
+                    i18n:translate=""
+            ></option>
+          </select>
+          <input name="foo-empty-marker"
+                 type="hidden"
+                 tal:attributes="
+                   name string:${view/name}-empty-marker;
+                 "
+          />
+          <span id="toDataContainer"
+                style="display: none"
+                tal:attributes="
+                  id string:${view/id}-toDataContainer;
+                "
+          >
+            <script type="text/javascript"
+                    tal:content="string:copyDataForSubmit('${view/id}');"
+            >
+              /*  <![CDATA[ */
+              // initial copying of field "field.to" --> "field"
+              copyDataForSubmit("<i tal:replace="${view/id}"/>");
+              /* ]]> */
+            </script>
+          </span>
+        </td>
+        <td>
+          <button name="upButton"
+                  onclick="javascript:moveUp()"
+                  type="button"
+                  value="&uarr;"
+                  tal:attributes="
+                    onClick string:javascript:moveUp('${view/id}');
+                  "
+          >&uarr;</button>
+          <br />
+          <button name="downButton"
+                  onclick="javascript:moveDown()"
+                  type="button"
+                  value="&darr;"
+                  tal:attributes="
+                    onClick string:javascript:moveDown('${view/id}');
+                  "
+          >&darr;</button>
+        </td>
+      </tr>
+    </table>
+  </fieldset>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/password_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/password_input.pt
new file mode 100644
index 00000000..8daa00b4
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/password_input.pt
@@ -0,0 +1,32 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <span class="${dependencies/ploneintranet_classes}"
+        data-pat-depends="${dependencies/data_pat_depends}"
+        tal:omit-tag="not:view/@@dependencies"
+  >
+    <label class="${python:'error' if view.error is not None else None}">${view/label}
+      <sup class="required"
+           tal:condition="view/required"
+      >*</sup>
+      <input class="${view/klass}"
+             id="${view/id}"
+             disabled="${view/disabled}"
+             maxlength="${view/maxlength"
+             name="${view/name}"
+             readonly="${view/readonly}"
+             size="${view/size}"
+             type="password"
+             value="${view/value}"
+      />
+    </label>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+  </span>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/passwordconfirm_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/passwordconfirm_input.pt
new file mode 100644
index 00000000..9f450acb
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/passwordconfirm_input.pt
@@ -0,0 +1,42 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <span class="${dependencies/ploneintranet_classes}"
+        data-pat-depends="${dependencies/data_pat_depends}"
+        tal:omit-tag="not:view/@@dependencies"
+  >
+    <label class="${python:'error' if view.error is not None else None}">${view/label}
+      <sup class="required"
+           tal:condition="view/required"
+      >*</sup>
+      <input class="${view/klass}"
+             id="${view/id}"
+             disabled="${view/disabled}"
+             maxlength="${view/maxlength}"
+             name="${view/name}"
+             readonly="${view/readonly}"
+             size="${view/size}"
+             type="password"
+      />
+    </label>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+    <label><tal:span i18n:translate="">Confirm password</tal:span>
+      <input class="${view/klass}"
+             id="${view/id}.confirm"
+             disabled="${view/disabled}"
+             maxlength="${view/maxlength}"
+             name="${view/name}.confirm"
+             readonly="${view/readonly}"
+             size="${view/size}"
+             type="password"
+      />
+    </label>
+  </span>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/quaive_form_macros.pt b/src/osha/oira/ploneintranet/z3cform/templates/quaive_form_macros.pt
new file mode 100644
index 00000000..f7031073
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/quaive_form_macros.pt
@@ -0,0 +1,24 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:meta="http://xml.zope.org/namespaces/meta"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      metal:use-macro="context/@@layout/macros/layout"
+      i18n:domain="nuplone"
+>
+
+  <metal:dfn define-macro="help_tooltip">
+    <dfn class="help-icon pat-tooltip tooltip-inactive"
+         aria-expanded="false"
+         title="Information"
+         data-pat-tooltip="class: info; trigger: click; source: content; position-list: tl"
+         tal:define="
+           hidden python:view.mode == 'hidden';
+           description view/field/description;
+         "
+         tal:condition="python:description and not hidden"
+         i18n:attributes="title"
+    >${description}</dfn>
+  </metal:dfn>
+
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/radio_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/radio_input.pt
new file mode 100644
index 00000000..3dd45b81
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/radio_input.pt
@@ -0,0 +1,60 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <fieldset class="group ${dependencies/ploneintranet_classes}"
+            data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    <p class="legend">${view/label}</p>
+    <div class="pat-checklist">
+
+      <tal:items repeat="item view/items">
+        <tal:item define="
+                    term python: view.terms.getTermByToken(item['value']);
+                    description term/description|nothing;
+                    extra_help term/extra_help|nothing;
+                  ">
+          <label>
+            ${item/label}
+            <input id="${item/id}"
+                   checked="${python:'checked' if checked else None}"
+                   disabled="${view/disabled}"
+                   name="${item/name}"
+                   readonly="${view/readonly}"
+                   type="radio"
+                   value="${item/value}"
+                   tal:define="
+                     checked item/checked;
+                   "
+            />
+            <dfn class="help-icon pat-tooltip tooltip-inactive"
+                 aria-expanded="false"
+                 title="Information"
+                 data-pat-tooltip="class: info; trigger: click; source: content; position-list: tl"
+                 tal:condition="extra_help"
+                 i18n:attributes="title"
+            >${extra_help}</dfn>
+          </label>
+          <p class="pat-message notice"
+             tal:condition="description"
+          >
+            ${description}
+          </p>
+
+        </tal:item>
+      </tal:items>
+      <input name="${view/name}-empty-marker"
+             type="hidden"
+             value="1"
+      />
+    </div>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+
+  </fieldset>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/select_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/select_input.pt
new file mode 100644
index 00000000..23b5d4ac
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/select_input.pt
@@ -0,0 +1,33 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <label class="pat-select ${dependencies/ploneintranet_classes}"
+         data-pat-depends="${dependencies/data_pat_depends}"
+  >
+  	${view/label}
+    <select class="has-value"
+            name="${view/name}"
+            data-value
+    >
+      <option class=""
+              id="${item/id}"
+              disabled="${view/disabled}"
+              readonly="${view/readonly|nothing}"
+              selected="${python:'selected' if item.get('selected', False) else None}"
+              value="${item/value}"
+              tal:repeat="item view/items"
+      >
+					${item/content}
+      </option>
+
+    </select>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+  </label>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/submit_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/submit_input.pt
new file mode 100644
index 00000000..93914260
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/submit_input.pt
@@ -0,0 +1,16 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        is_secondary python: 'secondary' in view.klass.split();
+      "
+      tal:omit-tag=""
+>
+  <button class="pat-button ${python: 'icon-ok-circle default' if not is_secondary else 'icon-cancel-circle'}"
+          id="${view/id}"
+          formnovalidate="${python: 'formnovalidate' if is_secondary else None}"
+          name="${view/name}"
+          type="submit"
+          value="${view/value}"
+  >${view/title}</button>
+
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/survey_source_selection.pt b/src/osha/oira/ploneintranet/z3cform/templates/survey_source_selection.pt
new file mode 100644
index 00000000..4b39cb8c
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/survey_source_selection.pt
@@ -0,0 +1,179 @@
+<fieldset xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+          xmlns:tal="http://xml.zope.org/namespaces/tal"
+          class="${view/klass} pat-subform pat-autosubmit pat-inject"
+          id="${widget_id}-wrapper"
+          data-pat-inject="source: #${widget_id}-wrapper; target: #${widget_id}-wrapper; url: ${request/getURL}/++widget++source_selection/render; history: none;"
+          tal:define="
+            widget_id string:${view/id};
+            countries view/form/buildSurveyTree;
+          "
+>
+  <fieldset class="group pat-checklist"
+            tal:define="
+              value python:request.form.get('source', 'scratch');
+            "
+  >
+    <legend i18n:translate="label_survey_source">How would you like to start</legend>
+    <label>
+      <input checked="${python:'checked' if value=='scratch' else None}"
+             name="source"
+             type="radio"
+             value="scratch"
+      />
+      <tal:span i18n:translate="survey_source_scratch">Create a new OiRA Tool from scratch</tal:span>
+    </label>
+    <label tal:condition="view/form/my_group">
+      <input checked="${python:'checked' if value=='local' else None}"
+             name="source"
+             type="radio"
+             value="local"
+      />
+      <tal:span i18n:translate="survey_source_local">Base my new OiRA Tool on an existing OiRA
+        Tool of my organisation</tal:span>
+    </label>
+    <label>
+      <input checked="${python:'checked' if value=='other' else None}"
+             name="source"
+             type="radio"
+             value="other"
+      />
+      <tal:span i18n:translate="survey_source_other">Base my new OiRA Tool on an existing OiRA
+        Tool of another organisation</tal:span>
+    </label>
+  </fieldset>
+  <tal:countries repeat="country countries">
+    <tal:mycountry condition="python:country['id']==view.form.my_country">
+      <tal:sectors repeat="sector country/sectors">
+        <tal:mysector tal:define="
+                        default_surveygroup_id python:sector['groups'][0]['id'];
+                      "
+                      condition="python:sector['id']==view.form.my_sector"
+        >
+          <fieldset class="group pat-checklist"
+                    tal:condition="python: request.get('source') == 'local'"
+          >
+            <p class="legend"
+               i18n:translate="label_choose_surveygroup"
+            >Choose an OiRA Tool</p>
+            <select name="surveygroup.local"
+                    tal:define="
+                      value python:request.form.get('surveygroup.local');
+                    "
+            >
+              <tal:group repeat="group sector/groups">
+                <option selected="${python:'selected' if value==group['id'] else None}"
+                        value="${group/id}"
+                >${group/title}</option>
+              </tal:group>
+            </select>
+          </fieldset>
+          <tal:group repeat="group sector/groups">
+            <fieldset class="group pat-checklist"
+                      tal:define="
+                        default_survey_id python:group['surveys'][0]['id'];
+                        value python:request.form.get('survey.local', default_survey_id);
+                      "
+                      tal:condition="python: request.get('source') == 'local' and request.get('surveygroup.local', default_surveygroup_id) == group['id']"
+            >
+              <legend i18n:translate="label_choose_survey">Choose a revision of
+                the selected OiRA Tool</legend>
+              <label tal:repeat="survey group/surveys"><input checked="${python:'checked' if repeat.survey.start else None}"
+                       name="survey.local.${group/id}"
+                       type="radio"
+                       value="${survey/id}"
+                />${survey/title}
+                <a class="floatAfter"
+                    href="${python: request['HTTP_REFERER'].partition('@@')[0] + '@@oira-edit-survey/' + '/'.join(survey['url'].split('/')[-4:])}"
+                    target="_blank"
+                    i18n:translate="label_view_revision_in_new_window"
+                >
+                  View revision in new window
+              </a>
+              </label>
+            </fieldset>
+          </tal:group>
+        </tal:mysector>
+      </tal:sectors>
+    </tal:mycountry>
+  </tal:countries>
+
+  <fieldset class="group pat-checklist"
+            tal:condition="python: request.get('source') == 'other'"
+  >
+    <p class="legend"
+       i18n:translate="label_choose_country"
+    >Choose a country</p>
+    <select id="country"
+            name="country"
+            tal:define="
+              value python:request.form.get('country', view.form.my_country);
+            "
+    >
+      <option></option>
+      <option selected="${python:'selected' if value==country['id'] else None}"
+              value="${country/id}"
+              tal:repeat="country countries"
+      >${country/title}</option>
+    </select>
+  </fieldset>
+
+  <tal:country repeat="country countries">
+    <fieldset class="pat-checklist group"
+              tal:condition="python: request.get('source') == 'other' and request.get('country', view.form.my_country) == country['id']"
+    >
+      <p class="legend"
+         i18n:translate="label_choose_surveygroup"
+      >Choose an OiRA Tool</p>
+
+      <select name="${name}"
+              tal:define="
+                name string:sector.${country/id};
+                value python:request.form.get(name, '%s.%s' % (view.form.my_sector, view.form.my_group));
+              "
+      >
+        <tal:sector repeat="sector country/sectors">
+          <optgroup label="${sector/title}">
+            <tal:group repeat="group sector/groups">
+              <option selected="${python:'selected' if value==ovalue else None}"
+                      value="${ovalue}"
+                      tal:define="
+                        ovalue string:${sector/id}.${group/id};
+                      "
+              >
+                ${group/title}</option>
+            </tal:group>
+          </optgroup>
+        </tal:sector>
+      </select>
+    </fieldset>
+
+    <tal:sector repeat="sector country/sectors">
+      <tal:group repeat="group sector/groups">
+        <fieldset class="group pat-checklist dependsOn-source-equals-other dependsOn-country-equals-${country/id} dependsOn-sector.${country/id}-equals-${sector/id}.${group/id}"
+                  tal:define="
+                    name string:survey.${country/id}.${group/id};
+                    value python:request.form.get(name, group['surveys'][0]['id']);
+                  "
+                  tal:condition="python: request.get('source') == 'other' and request.get('country', view.form.my_country) == country['id'] and request.get('sector.%s' % country['id'], '%s.%s' % (view.form.my_sector, view.form.my_group)) == '%s.%s' % (sector['id'], group['id'])"
+        >
+          <legend i18n:translate="label_choose_survey">Choose a revision of the
+            selected OiRA Tool</legend>
+          <label tal:repeat="survey group/surveys"><input checked="${python:'checked' if repeat.survey.start else None}"
+                   name="${name}"
+                   type="radio"
+                   value="${survey/id}"
+            />${survey/title}
+            <a class="floatAfter"
+               href="${python: request['HTTP_REFERER'].partition('@@')[0] + '@@oira-edit-survey/' + '/'.join(survey['url'].split('/')[-4:])}"
+               target="_blank"
+               i18n:translate="label_view_revision_in_new_window"
+            >
+              View revision in new window
+            </a>
+          </label>
+        </fieldset>
+      </tal:group>
+    </tal:sector>
+  </tal:country>
+
+</fieldset>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/text_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/text_input.pt
new file mode 100644
index 00000000..812213e0
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/text_input.pt
@@ -0,0 +1,30 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <label class="${dependencies/ploneintranet_classes}"
+         title="${view/field/description}"
+         data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    ${view/label}
+    <input class="${view/klass}"
+           id="${view/id}"
+           disabled="${view/disabled}"
+           maxlength="${view/maxlength}"
+           name="${view/name}"
+           readonly="${view/readonly}"
+           required="${python: view.required and 'required' or None}"
+           size="${view/size}"
+           type="${view/type|string:text}"
+           value="${view/value}"
+    />
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+
+  </label>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/textarea_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/textarea_input.pt
new file mode 100644
index 00000000..2607edfe
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/textarea_input.pt
@@ -0,0 +1,28 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <label class="${dependencies/ploneintranet_classes}"
+         title="${view/field/description}"
+         data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    ${view/label}
+    <textarea class="${view/klass}"
+              id="${view/id}"
+              cols="${view/cols}"
+              disabled="${view/disabled}"
+              name="${view/name}"
+              readonly="${view/readonly}"
+              rows="${view/rows}"
+    >${view/value}</textarea>
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+
+  </label>
+
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/textlines_display.pt b/src/osha/oira/ploneintranet/z3cform/templates/textlines_display.pt
new file mode 100644
index 00000000..87eeed62
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/textlines_display.pt
@@ -0,0 +1,35 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+>
+  <div class="${dependencies/ploneintranet_classes}"
+       data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    <legend>${view/label}</legend>
+    <span class=""
+          id=""
+          tal:attributes="
+            id view/id;
+            class view/klass;
+            style view/style;
+            title view/title;
+            lang view/lang;
+            onclick view/onclick;
+            ondblclick view/ondblclick;
+            onmousedown view/onmousedown;
+            onmouseup view/onmouseup;
+            onmouseover view/onmouseover;
+            onmousemove view/onmousemove;
+            onmouseout view/onmouseout;
+            onkeypress view/onkeypress;
+            onkeydown view/onkeydown;
+            onkeyup view/onkeyup;
+          "
+    ><tal:block condition="view/value"
+                 content="structure python:view.value.replace('\r\n', '<br/>')"
+      /></span>
+  </div>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/wrappedform.pt b/src/osha/oira/ploneintranet/z3cform/templates/wrappedform.pt
new file mode 100644
index 00000000..2c997740
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/wrappedform.pt
@@ -0,0 +1,81 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+  <p class="message ${python:'error' if view.widgets.errors else 'notice'}"
+     tal:define="
+       status view/status;
+     "
+     tal:condition="status"
+     i18n:domain="plone"
+     i18n:translate=""
+  >${status}</p>
+  <tal:errors define="
+                errors view/widgets/errors;
+              "
+              condition="errors"
+  >
+    <tal:error repeat="error errors">
+      <p class="message field error"
+         tal:condition="not:nocall:error/widget"
+         tal:content="structure error/message"
+         i18n:domain="plone"
+         i18n:translate=""
+      >
+                  Error
+      </p>
+    </tal:error>
+  </tal:errors>
+  <p class="discrete"
+     tal:condition="python:getattr(view, 'description', None)"
+  >${view/description}</p>
+  <form class="concise"
+        id="${view/id}"
+        action="${request/getURL}"
+        enctype="${view/enctype}"
+        method="${view/method}"
+  >
+    <fieldset>
+      <tal:widget repeat="widget view/widgets/values"
+                  replace="structure widget/render"
+      />
+    </fieldset>
+
+    <tal:groupform condition="python:getattr(view, 'groups', None)">
+      <fieldset class="${group/layout|nothing}"
+                tal:repeat="group view/groups"
+      >
+        <legend tal:define="
+                  legend group/label;
+                "
+                tal:condition="legend"
+                i18n:domain="plone"
+                i18n:translate=""
+        >${legend}</legend>
+        <p class="discrete"
+           tal:define="
+             description group/description;
+           "
+           tal:condition="description"
+        >${description}</p>
+        <tal:widget repeat="widget group/widgets/values">
+          <tal:render replace="structure widget/render" />
+        </tal:widget>
+      </fieldset>
+    </tal:groupform>
+
+    <div class="buttonBar"
+         tal:define="
+           actions view/actions/values|nothing;
+         "
+         tal:condition="actions"
+    >
+      <tal:action repeat="action actions"
+                  replace="structure action/render"
+      />
+    </div>
+  </form>
+</html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/wysiwyg_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/wysiwyg_input.pt
new file mode 100644
index 00000000..c3b9eb6c
--- /dev/null
+++ b/src/osha/oira/ploneintranet/z3cform/templates/wysiwyg_input.pt
@@ -0,0 +1,47 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:define="
+        dependencies nocall:view/@@dependencies;
+      "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
+>
+
+  <fieldset class="group ${dependencies/ploneintranet_classes}"
+            data-pat-depends="${dependencies/data_pat_depends}"
+  >
+    <legend title="${view/field/description}">
+      ${view/label}
+    </legend>
+
+    <div class="pat-rich-editor toolbar-detached">
+      <div class="pat-rich">
+
+        <textarea class="${view/klass} pat-tiptap"
+                  id="${view/id}"
+                  cols="${view/cols}"
+                  disabled="${view/disabled}"
+                  name="${view/name}"
+                  readonly="${view/readonly}"
+                  rows="${view/rows}"
+                  data-pat-tiptap="
+                      toolbar-external: #editor-toolbar;
+                      link-panel: #tiptap-modal-hyperlink .link-panel;
+                      link-menu: #tiptap-context-menu-hyperlink;
+                      image-panel: #tiptap-modal-image .image-panel;
+                      image-menu: #context-menu-image;
+                      embed-panel: #tiptap-modal-embed .embed-panel;
+                      embed-menu: #context-menu-embed;
+                  "
+        >${view/value}</textarea>
+
+      </div>
+    </div>
+
+    <metal:help use-macro="view/@@quaive_form_macros/help_tooltip" />
+
+  </fieldset>
+
+</html>