diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index 3a332fb..0717f97 100644
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -291,7 +291,8 @@
                     tal:condition="stTrans"
                     tal:attributes="name string:state.$stDef">
               <option i18n:translate="" value="-">No change</option>
-              <option tal:repeat="trans stTrans"
+              <option i18n:translate=""
+                      tal:repeat="trans stTrans"
                       tal:attributes="value trans/name"
                       tal:content="trans/title">publish</option>
             </select>
diff --git a/expert/browser/search.pt b/expert/browser/search.pt
index ac45dd4..2a83202 100644
--- a/expert/browser/search.pt
+++ b/expert/browser/search.pt
@@ -368,7 +368,8 @@
         i18n:translate=""></td>
     <td colspan="2">
       <tal:states repeat="state def/states">
-        <tal:state define="name string:state.$deftype.${def/name};
+        <tal:state define="xx_name string:state.$deftype.${def/name};
+                           name string:state.${def/name};
                            value state/name">
             <input type="checkbox"
                    tal:attributes="name string:$name:list;
diff --git a/expert/browser/search.py b/expert/browser/search.py
index a892395..af4f437 100644
--- a/expert/browser/search.py
+++ b/expert/browser/search.py
@@ -196,8 +196,9 @@ class Search(ConceptView):
 
     @Lazy
     def statesDefinitions(self):
-        return [component.getUtility(IStatesDefinition, name=n)
-                    for n in self.globalOptions('organize.stateful.resource', ())]
+        stdnames = (self.globalOptions('organize.stateful.resource', []) +
+                    self.globalOptions('organize.stateful.special', []))
+        return [component.getUtility(IStatesDefinition, name=n) for n in stdnames]
 
     @Lazy
     def selectedStates(self):
@@ -259,6 +260,8 @@ class Search(ConceptView):
         for std, states in self.selectedStates.items():
             if std.startswith('state.resource.'):
                 std = std[len('state.resource.'):]
+            elif std.startswith('state.'):
+                std = std[len('state.'):]
             else:
                 continue
             stf = component.queryAdapter(obj, IStateful, name=std)
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo
index 845ab89..e863d65 100644
Binary files a/locales/de/LC_MESSAGES/loops.mo and b/locales/de/LC_MESSAGES/loops.mo differ
diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po
index f849adc..6eec2d7 100644
--- a/locales/de/LC_MESSAGES/loops.po
+++ b/locales/de/LC_MESSAGES/loops.po
@@ -704,9 +704,6 @@ msgstr "Deckungsgrad"
 msgid "Create loops Note"
 msgstr "loops-Notiz anlegen"
 
-msgid "State information for $definition: $title"
-msgstr "Status ($definition): $title"
-
 msgid "User ID"
 msgstr "Benutzerkennung"
 
@@ -885,8 +882,26 @@ msgstr "nach"
 
 # state definitions
 
+msgid "Restrict to objects with certain states"
+msgstr "Auf Objekte mit bestimmtem Status beschränken"
+
+msgid "Workflow"
+msgstr "Statusdefinition/Workflow"
+
+msgid "States"
+msgstr "Statuswerte"
+
+msgid "State information for $definition: $title"
+msgstr "Status ($definition): $title"
+
+msgid "classification_quality"
+msgstr "Klassifizierung"
+
+msgid "simple_publishing"
+msgstr "Veröffentlichung"
+
 msgid "task_states"
-msgstr "Status"
+msgstr "Aufgabe"
 
 # state names
 
@@ -896,9 +911,15 @@ msgstr "angenommen"
 msgid "active"
 msgstr "aktiv"
 
+msgid "archived"
+msgstr "Archiv"
+
 msgid "cancelled"
 msgstr "abgebrochen"
 
+msgid "classified"
+msgstr "klassifiziert"
+
 msgid "closed"
 msgstr "abgeschlossen"
 
@@ -923,40 +944,96 @@ msgstr "neu"
 msgid "planned"
 msgstr "geplant"
 
+msgid "private"
+msgstr "privat"
+
+msgid "published"
+msgstr "veröffentlicht"
+
+msgid "removed"
+msgstr "gelöscht"
+
 msgid "replaced"
 msgstr "ersetzt"
 
 msgid "running"
 msgstr "in Arbeit"
 
-# transitions
+msgid "unclassified"
+msgstr "unklassifiziert"
 
-msgid "plan"
-msgstr "planen"
+msgid "verified"
+msgstr "verifiziert"
+
+# transitions
 
 msgid "accept"
 msgstr "annehmen"
 
-msgid "start working"
-msgstr "Arbeit beginnen"
+msgid "archive"
+msgstr "archivieren"
 
-msgid "work"
-msgstr "bearbeiten"
+msgid "classify"
+msgstr "klassifizieren"
 
-msgid "finish"
-msgstr "beenden"
+msgid "change_classification"
+msgstr "Klassifizierung ändern"
 
 msgid "cancel"
 msgstr "abbrechen"
 
+msgid "close"
+msgstr "abschließen"
+
 msgid "delegate"
 msgstr "delegieren"
 
+msgid "finish"
+msgstr "beenden"
+
+msgid "hide"
+msgstr "verstecken"
+
 msgid "move"
 msgstr "verschieben"
 
-msgid "close"
-msgstr "abschließen"
+msgid "No change"
+msgstr "keine Änderung"
+
+msgid "plan"
+msgstr "planen"
+
+msgid "publish"
+msgstr "veröffentlichen"
+
+msgid "remove"
+msgstr "entfernen"
+
+msgid "release"
+msgstr "freigeben"
+
+msgid "re-open"
+msgstr "zurücksetzen"
+
+msgid "remove_classification"
+msgstr "Klassifizierung entfernen"
+
+msgid "retract"
+msgstr "zurückziehen"
+
+msgid "show"
+msgstr "anzeigen"
+
+msgid "start working"
+msgstr "Arbeit beginnen"
+
+msgid "verify"
+msgstr "verifizieren"
+
+msgid "work"
+msgstr "bearbeiten"
+
+# calendar
 
 msgid "Monday"
 msgstr "Montag"
diff --git a/organize/stateful/task.py b/organize/stateful/task.py
index 6a02fcd..330263a 100644
--- a/organize/stateful/task.py
+++ b/organize/stateful/task.py
@@ -35,17 +35,17 @@ from loops.organize.stateful.base import StatefulLoopsObject
 @implementer(IStatesDefinition)
 def taskStates():
     return StatesDefinition('task_states',
-        State('draft', 'draft', ('start', 'cancel',),
-              color='yellow'),
+        State('draft', 'draft', ('release', 'cancel',),
+              color='blue'),
         State('active', 'active', ('finish', 'cancel',),
               color='yellow'),
         State('finished', 'finished', ('reopen', 'archive',),
               color='green'),
         State('cancelled', 'cancelled', ('reopen',),
-              color='grey'),
+              color='x'),
         State('archived', 'archived', ('reopen',),
               color='grey'),
-        Transition('start', 'start', 'active'),
+        Transition('release', 'release', 'active'),
         Transition('finish', 'finish', 'finished'),
         Transition('cancel', 'cancel', 'cancelled'),
         Transition('reopen', 're-open', 'draft'),