diff --git a/templates/workflowstrings.tmpl b/templates/workflowstrings.tmpl
index e86f94d..6efe7e6 100644
--- a/templates/workflowstrings.tmpl
+++ b/templates/workflowstrings.tmpl
@@ -18,8 +18,8 @@ tables.
 
 %TMPL:DEF{workflow:wrongparams}%%MAKETEXT{"Wrong parameters to [_1]" args="%PARAM1%"}%%TMPL:END%
 
-%TMPL:DEF{workflow:lastversion}%#{
-}#<a href="%SCRIPTURL{"view" web="%%PARAM1%" topic="%PARAM2%" rev="%WORKFLOWLAST{"%PARAM3%" format="$rev"}%" web="%PARAM1%" topic="%PARAM2%"}%">%MAKETEXT{"revision [_1]" args="%WORKFLOWLAST{"%PARAM3%" format="$rev" web="%PARAM1%" topic="%PARAM2%"}%"}%</a>%TMPL:END%
+%TMPL:DEF{workflow:lastversion}%%{
+}%<a href="%SCRIPTURL{"view" web="%%PARAM1%" topic="%PARAM2%" rev="%WORKFLOWLAST{"%PARAM3%" format="$rev"}%" web="%PARAM1%" topic="%PARAM2%"}%">%MAKETEXT{"revision [_1]" args="%WORKFLOWLAST{"%PARAM3%" format="$rev" web="%PARAM1%" topic="%PARAM2%"}%"}%</a>%TMPL:END%
 
 %TMPL:DEF{workflow:badct}%%MAKETEXT{"Controlled topic [_1] could not be loaded" args="%PARAM1%"}%%TMPL:END%
 
@@ -46,47 +46,47 @@ tables.
 </form>%TMPL:END%
 
 #{ Button for edit, active and strike versions }#
-%TMPL:DEF{workflow:editbutton}%#{
-}#<a href="%PARAM1%"><strong>%MAKETEXT{"Edit"}%</strong></a> %TMPL:END%
+%TMPL:DEF{workflow:editbutton}%%{
+}%<a href="%PARAM1%"><strong>%MAKETEXT{"Edit"}%</strong></a> %TMPL:END%
 
 %TMPL:DEF{workflow:strikeedit}%<strike>%MAKETEXT{"Edit"}%</strike>%TMPL:END%
 
 #{ Button for attach, active and strike versions }#
-%TMPL:DEF{workflow:attachbutton}%#{
-}#<a href="%PARAM1%"><strong>%MAKETEXT{"Attach"}%</strong></a> %TMPL:END%
+%TMPL:DEF{workflow:attachbutton}%%{
+}%<a href="%PARAM1%"><strong>%MAKETEXT{"Attach"}%</strong></a> %TMPL:END%
 
 %TMPL:DEF{workflow:strikeattach}%<strike>%MAKETEXT{"Attach"}%</strike>%TMPL:END%
 
 #{ Components of the a transition trigger }#
-%TMPL:DEF{workflow:txformhead}%#{
-}#<form method="POST" action="%SCRIPTURL{"rest"}%/WorkflowPlugin/changeState">#{
-}#<input type="hidden" name="WORKFLOWSTATE" value="%PARAM1%" />#{
-}#<input type="hidden" name="topic" value="%PARAM2%.%PARAM3%" />#{
-}#<input type="hidden" name="t" value=%GMTIME{"$epoch"}% /> %TMPL:END%
+%TMPL:DEF{workflow:txformhead}%%{
+}%<form method="POST" action="%SCRIPTURL{"rest"}%/WorkflowPlugin/changeState">%{
+}%<input type="hidden" name="WORKFLOWSTATE" value="%PARAM1%" />%{
+}%<input type="hidden" name="topic" value="%PARAM2%.%PARAM3%" />%{
+}%<input type="hidden" name="t" value=%GMTIME{"$epoch"}% /> %TMPL:END%
 
 %TMPL:DEF{workflow:txformfoot}%</form>%TMPL:END%
 
-%TMPL:DEF{workflow:txformone}%#{
-}#<input type="hidden" name='WORKFLOWACTION' value="%PARAM1%" />#{
-}#<input type="submit" class="%IF{"defined WORKFLOWTRANSITIONCSSCLASS" else="foswikiChangeFormButton foswikiSubmit" then="%WORKFLOWTRANSITIONCSSCLASS%"}%" name="%PARAM1%" value="%PARAM1%" /> %TMPL:END%
+%TMPL:DEF{workflow:txformone}%%{
+}%<input type="hidden" name='WORKFLOWACTION' value="%PARAM1%" />%{
+}%<input type="submit" class="%IF{"defined WORKFLOWTRANSITIONCSSCLASS" else="foswikiChangeFormButton foswikiSubmit" then="%WORKFLOWTRANSITIONCSSCLASS%"}%" name="%PARAM1%" value="%PARAM1%" /> %TMPL:END%
 
-%TMPL:DEF{workflow:txformmany}%<select name="WORKFLOWACTION">#{
-}#%PARAM1%#{
-}#</select>#{
-}#<input type="submit" class="%IF{"defined WORKFLOWTRANSITIONCSSCLASS=''" then="foswikiChangeFormButton foswikiSubmit" else="%WORKFLOWTRANSITIONCSSCLASS%"}%" value="%MAKETEXT{"Change status"}%" />%TMPL:END%
+%TMPL:DEF{workflow:txformmany}%<select name="WORKFLOWACTION">%{
+}%%PARAM1%%{
+}%</select>%{
+}%<input type="submit" class="%IF{"defined WORKFLOWTRANSITIONCSSCLASS=''" then="foswikiChangeFormButton foswikiSubmit" else="%WORKFLOWTRANSITIONCSSCLASS%"}%" value="%MAKETEXT{"Change status"}%" />%TMPL:END%
 
 %TMPL:DEF{workflow:txformeach}% <option>%PARAM1%</option> %TMPL:END%
 
 %TMPL:DEF{workflow:txformnone}%%MAKETEXT{"No transitions available"}%%TMPL:END%
 
 #{ Button to trigger a fork }#
-%TMPL:DEF{workflow:txforkbutton}%#{
-}#<form name="forkWorkflow" action="%SCRIPTURL{"rest"}%/WorkflowPlugin/fork" method="POST">#{
-}#<input type="hidden" name="topic" value="%PARAM1%" />#{
-}#<input type="hidden" name="newnames" value="%PARAM2%" />#{
-}#<input type="hidden" name="lockdown" value="%PARAM3%" />#{
-}#<input type="submit" name="fork" class="%IF{"defined WORKFLOWTRANSITIONCSSCLASS" else="foswikiChangeFormButton foswikiSubmit" then="%WORKFLOWTRANSITIONCSSCLASS%"}%" value="%IF{"'%PARAM4%'='Fork'" then="%MAKETEXT{"Fork"}%" else="%PARAM4%"}%">#{
-}#</form> %TMPL:END%
+%TMPL:DEF{workflow:txforkbutton}%%{
+}%<form name="forkWorkflow" action="%SCRIPTURL{"rest"}%/WorkflowPlugin/fork" method="POST">%{
+}%<input type="hidden" name="topic" value="%PARAM1%" />%{
+}%<input type="hidden" name="newnames" value="%PARAM2%" />%{
+}%<input type="hidden" name="lockdown" value="%PARAM3%" />%{
+}%<input type="submit" name="fork" class="%IF{"defined WORKFLOWTRANSITIONCSSCLASS" else="foswikiChangeFormButton foswikiSubmit" then="%WORKFLOWTRANSITIONCSSCLASS%"}%" value="%IF{"'%PARAM4%'='Fork'" then="%MAKETEXT{"Fork"}%" else="%PARAM4%"}%">%{
+}%</form> %TMPL:END%
 
 #{ Email sent on a transition }#
 %TMPL:DEF{workflow:transitionemail}%