From fd3f221e0e86a1b70d7de2735d45302ef7aa55a1 Mon Sep 17 00:00:00 2001
From: anbr <vdr07@deltab.de>
Date: Sat, 4 May 2013 11:01:12 +0200
Subject: Use default FOREACH syntax  #1355

---
 skins/deltab/alist.tmpl              |  6 +++---
 skins/deltab/clist.tmpl              |  6 +++---
 skins/deltab/display.tmpl            |  6 +++---
 skins/deltab/help.tmpl               |  4 ++--
 skins/deltab/logger.tmpl             |  6 +++---
 skins/deltab/mlist.tmpl              | 10 +++++-----
 skins/deltab/movetimerlist.tmpl      |  4 ++--
 skins/deltab/now.tmpl                | 12 ++++++------
 skins/deltab/program.tmpl            |  8 ++++----
 skins/deltab/rdisplay.tmpl           |  8 ++++----
 skins/deltab/report.tmpl             | 10 +++++-----
 skins/deltab/rlist.tmpl              |  8 ++++----
 skins/deltab/schema.tmpl             | 14 +++++++-------
 skins/deltab/search.tmpl             |  6 +++---
 skins/deltab/tlist.tmpl              |  6 +++---
 skins/deltab/topten.tmpl             |  4 ++--
 skins/deltab/ulist.tmpl              |  4 ++--
 skins/deltab/vdrlist.tmpl            |  4 ++--
 skins/deltab/vtxpage.tmpl            |  4 ++--
 skins/deltab/widgets/checkbox.tmpl   |  2 +-
 skins/deltab/widgets/date.tmpl       |  4 ++--
 skins/deltab/widgets/list.tmpl       |  6 +++---
 skins/deltab/widgets/littlemenu.tmpl |  2 +-
 skins/deltab/widgets/menu.tmpl       |  2 +-
 skins/deltab/widgets/message.tmpl    |  2 +-
 skins/deltab/widgets/radio.tmpl      |  2 +-
 skins/deltab/widgets/remote.tmpl     |  4 ++--
 skins/deltab/widgets/table.tmpl      |  8 ++++----
 skins/html/alist.tmpl                |  8 ++++----
 skins/html/clist.tmpl                |  2 +-
 skins/html/cmdlist.tmpl              |  6 +++---
 skins/html/display.tmpl              |  4 ++--
 skins/html/filesys.tmpl              | 10 +++++-----
 skins/html/help.tmpl                 | 10 +++++-----
 skins/html/logger.tmpl               |  6 +++---
 skins/html/memory.tmpl               |  2 +-
 skins/html/mldisplay.tmpl            |  8 ++++----
 skins/html/mledit.tmpl               |  2 +-
 skins/html/mlist.tmpl                | 12 ++++++------
 skins/html/mllistmedias.tmpl         |  2 +-
 skins/html/mlnavcontainer.tmpl       |  2 +-
 skins/html/movetimerlist.tmpl        |  4 ++--
 skins/html/network.tmpl              |  8 ++++----
 skins/html/now.tmpl                  |  6 +++---
 skins/html/program.tmpl              | 10 +++++-----
 skins/html/rdisplay.tmpl             |  8 ++++----
 skins/html/report.tmpl               | 10 +++++-----
 skins/html/rlist.tmpl                | 12 ++++++------
 skins/html/schema.tmpl               |  6 +++---
 skins/html/search.tmpl               |  8 ++++----
 skins/html/tlist.tmpl                |  8 ++++----
 skins/html/topten.tmpl               |  6 +++---
 skins/html/ulist.tmpl                |  6 +++---
 skins/html/vdrlist.tmpl              |  6 +++---
 skins/html/vitals.tmpl               |  4 ++--
 skins/html/vtxpage.tmpl              |  4 ++--
 skins/html/widgets/checkbox.tmpl     |  4 ++--
 skins/html/widgets/date.tmpl         |  4 ++--
 skins/html/widgets/dir.tmpl          |  2 +-
 skins/html/widgets/file.tmpl         |  2 +-
 skins/html/widgets/footer.tmpl       |  4 ++--
 skins/html/widgets/host.tmpl         |  2 +-
 skins/html/widgets/integer.tmpl      |  2 +-
 skins/html/widgets/list.tmpl         | 10 +++++-----
 skins/html/widgets/littlemenu.tmpl   |  2 +-
 skins/html/widgets/menu.tmpl         |  2 +-
 skins/html/widgets/password.tmpl     |  4 ++--
 skins/html/widgets/radio.tmpl        |  4 ++--
 skins/html/widgets/remote.tmpl       |  4 ++--
 skins/html/widgets/string.tmpl       |  4 ++--
 skins/html/widgets/table.tmpl        |  8 ++++----
 skins/html/widgets/textfield.tmpl    |  4 ++--
 skins/html/widgets/time.tmpl         |  4 ++--
 skins/jason/index.tmpl               |  2 +-
 skins/jason/login.tmpl               |  2 +-
 skins/stone/alist.tmpl               |  6 +++---
 skins/stone/clist.tmpl               |  6 +++---
 skins/stone/display.tmpl             |  6 +++---
 skins/stone/filesys.tmpl             | 10 +++++-----
 skins/stone/help.tmpl                |  4 ++--
 skins/stone/logger.tmpl              |  6 +++---
 skins/stone/memory.tmpl              |  4 ++--
 skins/stone/mldisplay.tmpl           |  6 +++---
 skins/stone/mledit.tmpl              |  2 +-
 skins/stone/mlist.tmpl               |  6 +++---
 skins/stone/mllist.tmpl              |  6 +++---
 skins/stone/mlresearch.tmpl          |  4 ++--
 skins/stone/mlsave.tmpl              |  2 +-
 skins/stone/movetimerlist.tmpl       |  4 ++--
 skins/stone/network.tmpl             |  8 ++++----
 skins/stone/now.tmpl                 | 12 ++++++------
 skins/stone/program.tmpl             |  8 ++++----
 skins/stone/rdisplay.tmpl            |  8 ++++----
 skins/stone/report.tmpl              | 10 +++++-----
 skins/stone/rlist.tmpl               |  8 ++++----
 skins/stone/schema.tmpl              | 14 +++++++-------
 skins/stone/search.tmpl              |  6 +++---
 skins/stone/tlist.tmpl               |  6 +++---
 skins/stone/topten.tmpl              |  4 ++--
 skins/stone/ulist.tmpl               |  4 ++--
 skins/stone/vdrlist.tmpl             |  4 ++--
 skins/stone/vitals.tmpl              |  6 +++---
 skins/stone/vtxpage.tmpl             |  4 ++--
 skins/stone/widgets/checkbox.tmpl    |  2 +-
 skins/stone/widgets/date.tmpl        |  4 ++--
 skins/stone/widgets/footer.tmpl      |  2 +-
 skins/stone/widgets/list.tmpl        |  6 +++---
 skins/stone/widgets/littlemenu.tmpl  |  2 +-
 skins/stone/widgets/menu.tmpl        |  2 +-
 skins/stone/widgets/message.tmpl     |  2 +-
 skins/stone/widgets/radio.tmpl       |  2 +-
 skins/stone/widgets/remote.tmpl      |  4 ++--
 skins/stone/widgets/table.tmpl       |  8 ++++----
 skins/stone_flat/alist.tmpl          |  6 +++---
 skins/stone_flat/clist.tmpl          |  6 +++---
 skins/stone_flat/filesys.tmpl        | 10 +++++-----
 skins/stone_flat/help.tmpl           |  4 ++--
 skins/stone_flat/logger.tmpl         |  6 +++---
 skins/stone_flat/memory.tmpl         |  4 ++--
 skins/stone_flat/mldisplay.tmpl      |  6 +++---
 skins/stone_flat/mledit.tmpl         |  2 +-
 skins/stone_flat/mlist.tmpl          |  6 +++---
 skins/stone_flat/mllist.tmpl         |  6 +++---
 skins/stone_flat/mlresearch.tmpl     |  4 ++--
 skins/stone_flat/mlsave.tmpl         |  2 +-
 skins/stone_flat/movetimerlist.tmpl  |  4 ++--
 skins/stone_flat/network.tmpl        |  8 ++++----
 skins/stone_flat/now.tmpl            | 12 ++++++------
 skins/stone_flat/program.tmpl        |  8 ++++----
 skins/stone_flat/report.tmpl         | 10 +++++-----
 skins/stone_flat/rlist.tmpl          |  8 ++++----
 skins/stone_flat/schema.tmpl         | 14 +++++++-------
 skins/stone_flat/search.tmpl         |  6 +++---
 skins/stone_flat/tlist.tmpl          |  6 +++---
 skins/stone_flat/topten.tmpl         |  4 ++--
 skins/stone_flat/ulist.tmpl          |  4 ++--
 skins/stone_flat/vdrlist.tmpl        |  4 ++--
 skins/stone_flat/vitals.tmpl         |  6 +++---
 skins/wml/now.tmpl                   |  2 +-
 skins/wml/program.tmpl               |  6 +++---
 skins/wml/search.tmpl                |  2 +-
 skins/wml/tlist.tmpl                 |  2 +-
 skins/wml/widgets/checkbox.tmpl      |  4 ++--
 skins/wml/widgets/err.tmpl           |  2 +-
 skins/wml/widgets/formEnd.tmpl       |  2 +-
 skins/wml/widgets/list.tmpl          |  6 +++---
 skins/wml/widgets/littlemenu.tmpl    |  2 +-
 skins/wml/widgets/menu.tmpl          |  2 +-
 skins/wml/widgets/message.tmpl       |  2 +-
 skins/wml/widgets/radio.tmpl         |  4 ++--
 skins/wml/widgets/table.tmpl         |  8 ++++----
 skins/xstyle/alist.tmpl              |  8 ++++----
 skins/xstyle/bloecke/event_row.tmpl  |  2 +-
 skins/xstyle/clist.tmpl              |  2 +-
 skins/xstyle/cmdlist.tmpl            |  6 +++---
 skins/xstyle/display.tmpl            |  4 ++--
 skins/xstyle/filesys.tmpl            | 10 +++++-----
 skins/xstyle/help.tmpl               |  4 ++--
 skins/xstyle/logger.tmpl             |  6 +++---
 skins/xstyle/mainmenu.inc            |  8 ++++----
 skins/xstyle/memory.tmpl             |  2 +-
 skins/xstyle/mldisplay.tmpl          |  8 ++++----
 skins/xstyle/mledit.tmpl             |  2 +-
 skins/xstyle/mlist.tmpl              | 12 ++++++------
 skins/xstyle/mllistmedias.tmpl       |  2 +-
 skins/xstyle/mlnavcontainer.tmpl     |  2 +-
 skins/xstyle/movetimerlist.tmpl      |  4 ++--
 skins/xstyle/network.tmpl            |  8 ++++----
 skins/xstyle/now.tmpl                |  6 +++---
 skins/xstyle/program.tmpl            |  8 ++++----
 skins/xstyle/rdisplay.tmpl           |  8 ++++----
 skins/xstyle/report.tmpl             | 10 +++++-----
 skins/xstyle/rlist.tmpl              | 12 ++++++------
 skins/xstyle/schema.tmpl             |  6 +++---
 skins/xstyle/search.tmpl             |  8 ++++----
 skins/xstyle/tlist.tmpl              |  8 ++++----
 skins/xstyle/topten.tmpl             |  4 ++--
 skins/xstyle/ulist.tmpl              |  6 +++---
 skins/xstyle/vdrlist.tmpl            |  6 +++---
 skins/xstyle/vitals.tmpl             |  4 ++--
 skins/xstyle/vtxpage.tmpl            |  4 ++--
 skins/xstyle/widgets/checkbox.tmpl   |  4 ++--
 skins/xstyle/widgets/date.tmpl       |  4 ++--
 skins/xstyle/widgets/dir.tmpl        |  2 +-
 skins/xstyle/widgets/file.tmpl       |  2 +-
 skins/xstyle/widgets/footer.tmpl     |  4 ++--
 skins/xstyle/widgets/host.tmpl       |  2 +-
 skins/xstyle/widgets/integer.tmpl    |  2 +-
 skins/xstyle/widgets/list.tmpl       | 10 +++++-----
 skins/xstyle/widgets/littlemenu.tmpl |  2 +-
 skins/xstyle/widgets/menu.tmpl       |  2 +-
 skins/xstyle/widgets/password.tmpl   |  4 ++--
 skins/xstyle/widgets/radio.tmpl      |  4 ++--
 skins/xstyle/widgets/remote.tmpl     |  4 ++--
 skins/xstyle/widgets/string.tmpl     |  4 ++--
 skins/xstyle/widgets/table.tmpl      |  8 ++++----
 skins/xstyle/widgets/textfield.tmpl  |  4 ++--
 skins/xstyle/widgets/time.tmpl       |  4 ++--
 198 files changed, 533 insertions(+), 533 deletions(-)

diff --git a/skins/deltab/alist.tmpl b/skins/deltab/alist.tmpl
index f2712e7..3e76322 100644
--- a/skins/deltab/alist.tmpl
+++ b/skins/deltab/alist.tmpl
@@ -85,8 +85,8 @@
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
 <table summary=""  width="100%">
-<?% FOREACH zeile = data %?>
-    <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+<?% FOREACH zeile IN data %?>
+    <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
     <?% id=zeile.0;act=zeile.1;title=zeile.2;channels=zeile.3;directory=zeile.4;start=zeile.5;stop=zeile.6;minlength=zeile.7 %?>
     <?% IF act == 'y' %?><?% aktiv = 1 %?><?% ELSE %?><?% aktiv = 0 %?><?% END %?>
@@ -131,7 +131,7 @@
             <td style="padding:0px;" width="20"><a href="?cmd=<?% cmd %?><?% datas %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></td>
         </tr>
 <?% END %?>
-    <?% FOREACH row = fields %?>
+    <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=chop(row,20) %?>
       <?% END %?>
diff --git a/skins/deltab/clist.tmpl b/skins/deltab/clist.tmpl
index 53f772e..9572e59 100644
--- a/skins/deltab/clist.tmpl
+++ b/skins/deltab/clist.tmpl
@@ -104,8 +104,8 @@
     <?% END %?>
 </h1>
 <form name="clist" action="">
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?%- id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3;
              source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8;
              CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14;
@@ -161,7 +161,7 @@
     <p class="section"><?% gettext("Sorting") %?></td></tr>
     <p>
         <table summary="">
-      <?% FOREACH row = fields %?>
+      <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=chop(row,20) %?>
       <?% END %?>
diff --git a/skins/deltab/display.tmpl b/skins/deltab/display.tmpl
index f8eb17a..65a71ae 100644
--- a/skins/deltab/display.tmpl
+++ b/skins/deltab/display.tmpl
@@ -1,7 +1,7 @@
 <!-- display -->
 <?% IF verbose  %?>
-<!-- First: <?% FOREACH x = data.first %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
-<!-- Last: <?% FOREACH x = data.last %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
+<!-- First: <?% FOREACH x IN data.first %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
+<!-- Last: <?% FOREACH x IN data.last %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
 <?% END %?>
 <?%
   USE date;
@@ -62,7 +62,7 @@ END %?>
 		<?% IF description != "" || bild != "" %?>
         <p class="description">
 		<?% IF bild != "" %?>
-        <?% FOREACH img = bild.split("\n") %?>
+        <?% FOREACH img IN bild.split("\n") %?>
             <img class="epgimages" src="?cmd=eimage&data=<?% img %?>" alt="" />
         <?% END %?>
     <?% END %?>
diff --git a/skins/deltab/help.tmpl b/skins/deltab/help.tmpl
index da65a3b..26aac57 100644
--- a/skins/deltab/help.tmpl
+++ b/skins/deltab/help.tmpl
@@ -16,8 +16,8 @@
 <p><?% data.shift %?></p>
 <?% IF data.size > 1 %?>
 <table summary=""  width="100%">
-    <?% FOREACH zeile = data %?>
-    <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+    <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
         <?% short=zeile.0;long=zeile.1;modul=zeile.2;desc=zeile.3 %?>
         <?% IF allow(long) %?>
diff --git a/skins/deltab/logger.tmpl b/skins/deltab/logger.tmpl
index 18e60df..70c5ac7 100644
--- a/skins/deltab/logger.tmpl
+++ b/skins/deltab/logger.tmpl
@@ -8,17 +8,17 @@
     <table summary=""  width="100%">
 <?% fields = data.shift %?>
     <tr>
-    <?% FOREACH field = fields %?>
+    <?% FOREACH field IN fields %?>
         <?% NEXT IF field.match('^__') %?>
         <th>
             <?% field %?>
         </th>
     <?% END %?>
     </tr>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
     <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
         <?% c = -1 %?>
-        <?% FOREACH field = zeile %?>
+        <?% FOREACH field IN zeile %?>
             <?% c = c + 1 %?>
             <?% NEXT IF fields.$c.match('^__') %?>
             <td>
diff --git a/skins/deltab/mlist.tmpl b/skins/deltab/mlist.tmpl
index 857a49c..a7e76d6 100644
--- a/skins/deltab/mlist.tmpl
+++ b/skins/deltab/mlist.tmpl
@@ -108,8 +108,8 @@
         <th></th>
         <th width="100" align="right"></th>
     </tr>
-    <?% FOREACH zeile = data %?>
-    <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+    <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
         <?% id=zeile.0;artist=zeile.1;album=zeile.2;title=zeile.3;track=zeile.4;year=zeile.5;playtime=zeile.6;genre=zeile.7;comment=zeile.8 %?>
 
@@ -143,17 +143,17 @@
     <form name="genreform" action="">
     <p>
     <?% gettext("Genres",20) %?>:<br /><select name="genres" onchange="di('?cmd=ml&amp;data=','genre:' + this.form.genres.options[this.form.genres.options.selectedIndex].value)">
-    <?% FOREACH ch = param.genres %?>
+    <?% FOREACH ch IN param.genres %?>
         <option value="<?% url( ch.1 ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.1 %?>><?% ch.0 %?></option>
     <?% END %?>
     </select>
     <?% gettext("Artists",20) %?>:<br /><select name="artists" onchange="di('?cmd=ml&amp;data=','artist:' + this.form.artists.options[this.form.artists.options.selectedIndex].value)">
-    <?% FOREACH ch = param.artists %?>
+    <?% FOREACH ch IN param.artists %?>
         <option value="<?% url( ch.0 ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'artist' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 %?></option>
     <?% END %?>
     </select>
     <?% gettext("Albums",20) %?>:<br /><select name="albums" onchange="di('?cmd=ml&amp;data=','album:' + this.form.albums.options[this.form.albums.options.selectedIndex].value)">
-    <?% FOREACH ch = param.albums %?>
+    <?% FOREACH ch IN param.albums %?>
         <option value="<?% url( ch.0 ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'album' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 %?></option>
     <?% END %?>
     </select>
diff --git a/skins/deltab/movetimerlist.tmpl b/skins/deltab/movetimerlist.tmpl
index c52af24..85b552e 100644
--- a/skins/deltab/movetimerlist.tmpl
+++ b/skins/deltab/movetimerlist.tmpl
@@ -61,8 +61,8 @@
                 <th><?% gettext('Change original timer') %?></th>
                 <th width="64" align="right"></th>
             </tr>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?>
         <?% PROCESS Item %?>
      <?% END %?>
diff --git a/skins/deltab/now.tmpl b/skins/deltab/now.tmpl
index 1352aed..859c09b 100644
--- a/skins/deltab/now.tmpl
+++ b/skins/deltab/now.tmpl
@@ -104,8 +104,8 @@
     </th><th width="80"></th>
     <th width="40" align="right"></th>
 </tr>
-<?% FOREACH zeile = data %?>
-    <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+<?% FOREACH zeile IN data %?>
+    <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;
@@ -138,7 +138,7 @@
     <form action="">
     <p>
         <select name="cgroups" onchange="di('?cmd=<?% cgi.param('cmd') %?>&amp;data=<?% cgi.param('data') %?>&amp;__cgrp=',this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value)">
-            <?% FOREACH cgrp = param.cgroups %?>
+            <?% FOREACH cgrp IN param.cgroups %?>
               <option value="<?% cgrp.last %?>"<?% ' selected="selected"' IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?></option>
             <?% END %?>
         </select>
@@ -166,7 +166,7 @@
             <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=now&amp;__cgrp=<?% cgi.param('__cgrp') %?>&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
             <?% today = [] %?>
             <?% tomor = [] %?>
-        <?% FOREACH zeit = zeiten %?>
+        <?% FOREACH zeit IN zeiten %?>
             <?% tom = 0 %?>
             <?% PERL %?>
                 use Date::Manip;
@@ -187,12 +187,12 @@
         <?% END %?>
         <?% IF today.size > 0 %?>
             <optgroup label="<?% date.format(today.0, "%A", locale) %?>">
-        <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
         <?% IF tomor.size > 0 %?>
             <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>">
-        <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
             </select>
diff --git a/skins/deltab/program.tmpl b/skins/deltab/program.tmpl
index 4b1a396..f1d8784 100644
--- a/skins/deltab/program.tmpl
+++ b/skins/deltab/program.tmpl
@@ -56,7 +56,7 @@
     </td>
 <?% END %?>
 
-<?% FOREACH ch = param.channels %?>
+<?% FOREACH ch IN param.channels %?>
     <?% IF cgi.param('data') == ch.1 || cgi.param('data') == ch.0 || param.current == ch.1 %?>
         <?% channel = ch.0 %?>
         <?% channelpos = ch.1 %?>
@@ -75,8 +75,8 @@
         <th width="40" align="right"></th>
     </tr>
 
-	<?% FOREACH zeile = data %?>
-    <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+	<?% FOREACH zeile IN data %?>
+    <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;
             description=zeile.6;pdc=zeile.7;timerid=zeile.8;recording=zeile.9;running=zeile.10;
             day = zeile.5 %?>
@@ -114,7 +114,7 @@
     <form action="">
     <p>
         <select size="15" name='data' onchange="di('?cmd=program&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
-        <?% FOREACH ch = param.channels %?>
+        <?% FOREACH ch IN param.channels %?>
           <?% IF ch.2 != channelgroup %?>
             <?% IF channelgroup %?>
             </optgroup>
diff --git a/skins/deltab/rdisplay.tmpl b/skins/deltab/rdisplay.tmpl
index 7800680..8ad68e9 100644
--- a/skins/deltab/rdisplay.tmpl
+++ b/skins/deltab/rdisplay.tmpl
@@ -34,7 +34,7 @@
 						<table summary="">
 							<tr>
 								<td>
-                 <?% FOREACH frame = files %?>
+                 <?% FOREACH frame IN files %?>
             		  <?% x = ( frame ) / 25 %?>
                  <?% IF allowplay %?><a href="javascript:setstart('<?% PROCESS hfs d=x %?>')" ><?% END %?>
                   <img class="recording" src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" title="<?% PROCESS hfs d=x %?>" />
@@ -117,7 +117,7 @@
 	        ml = data.Marks.split(',');
           totaltime = ticks * window * 3;
 		      IF ml.size > 1;
-		FOREACH marker = ml;
+		FOREACH marker IN ml;
                 b = c;
                 c = c + 1;
                 m = marker.split(':');
@@ -174,7 +174,7 @@
 									<p>
 										<select name='data' onchange="di('?cmd=rconvert&amp;data=<?% id %?>&amp;__action=save&amp;__cmd=',this.form.data.options[this.form.data.options.selectedIndex].value)"> 
 											<option value='0'><?% gettext("Choose a command to edit this recording ...") %?></option>
-											<?% FOREACH cmd = param.reccmds %?>
+											<?% FOREACH cmd IN param.reccmds %?>
                       <option value='<?% loop.count %?>'><?% cmd %?></option>
 											<?% END %?>
 										</select>
@@ -195,7 +195,7 @@
 							<tr>
 								<td colspan="2">
                         <?% gettext('Keywords') %?>&nbsp;:&nbsp;
-		                    <?% FOREACH keyword = data.keywords %?>
+		                    <?% FOREACH keyword IN data.keywords %?>
                             <?% IF allowkeywords %?>
                                     <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
                             <?% END %?>
diff --git a/skins/deltab/report.tmpl b/skins/deltab/report.tmpl
index b333bf3..4255d1f 100644
--- a/skins/deltab/report.tmpl
+++ b/skins/deltab/report.tmpl
@@ -2,7 +2,7 @@
 <div id="body">
 <h1><?% gettext("Protocol of the activities") %?></h1>
 
-<?% FOREACH name = data.keys.sort %?>
+<?% FOREACH name IN data.keys.sort %?>
     <h2><?% gettext("Report for module") %?>&nbsp;
         <?% name %?>:</h2>
     <?% IF name == 'RECORDS';
@@ -16,7 +16,7 @@
         END;
      %?>
 
-    <?% FOREACH typ = data.$name.keys.sort %?>
+    <?% FOREACH typ IN data.$name.keys.sort %?>
         <?% IF typ == 'message' %?>
             <p><?% data.$name.$typ %?>
             </p>
@@ -24,7 +24,7 @@
            <?% fields = data.$name.$typ.shift %?>
                   <table summary=""  width="100%">
                     <tr>
-                    <?% FOREACH field = fields %?>
+                    <?% FOREACH field IN fields %?>
                         <?% NEXT IF field.match('^__') %?>
                         <th>
                             <nobr><?% field %?>
@@ -32,10 +32,10 @@
                         </th>
                     <?% END %?>
                     </tr>
-                    <?% FOREACH zeile = data.$name.$typ %?>
+                    <?% FOREACH zeile IN data.$name.$typ %?>
                     <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
                         <?% c = -1 %?>
-                        <?% FOREACH field = zeile %?>
+                        <?% FOREACH field IN zeile %?>
                             <?% c = c + 1 %?>
                             <?% NEXT IF fields.$c.match('^__') %?>
                             <td><?% IF link %?><a href="<?% link %?><?% zeile.first %?>"><?% END %?>
diff --git a/skins/deltab/rlist.tmpl b/skins/deltab/rlist.tmpl
index c32b067..7a76fc6 100644
--- a/skins/deltab/rlist.tmpl
+++ b/skins/deltab/rlist.tmpl
@@ -177,8 +177,8 @@
         <th width="100"></th>
         <th width="60" align="right"></th>
     </tr>
-    <?% FOREACH zeile = data %?>
-    <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+    <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
     <?%- id=zeile.0;
           eventid=zeile.1;
@@ -257,7 +257,7 @@
             <td style="padding:0px;" width="20"><a href="?cmd=<?% cmd %?><?% daten %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></td>
         </tr>
 <?% END %?>
-      <?% FOREACH row = fields %?>
+      <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=chop(row,20) %?>
       <?% END %?>
@@ -301,7 +301,7 @@
         <?% IF param.keywords.size <  steps %?>
           <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
-        <?% FOREACH keyword = param.keywords %?>
+        <?% FOREACH keyword IN param.keywords %?>
               <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
                 <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
diff --git a/skins/deltab/schema.tmpl b/skins/deltab/schema.tmpl
index 253c4a5..522070f 100644
--- a/skins/deltab/schema.tmpl
+++ b/skins/deltab/schema.tmpl
@@ -6,7 +6,7 @@
 <?% gettext("Schema") %?>
  : <?% date.format(param.zeitvon, '%A, %H:%M', locale) %?>
  - <?% date.format(param.zeitbis, '%H:%M', locale) %?>
-    <?% FOREACH cgrp = param.cgroups %?>
+    <?% FOREACH cgrp IN param.cgroups %?>
     <?% IF param.channelgroup == cgrp.last %?> ( <?% cgrp.first %?> ) <?% END %?>
     <?% END %?>
 </h1>
@@ -77,7 +77,7 @@
                         <?%- ############################################## -%?>                                
                   </td>
                 </tr>
-                <?% FOREACH cpos = data.keys.nsort %?>
+                <?% FOREACH cpos IN data.keys.nsort %?>
                  <tr<?% IF (loop.count mod 2) == 0 %?> class="two"<?% END %?>>
                     <td class="schema">
                     <?% channel = data.$cpos.first.4 %?>
@@ -99,7 +99,7 @@
                     </td>
                     <td class="schema" colspan="<?% colspan %?>" style="white-space:nowrap;">
                         <?%- ges = 0; oldend = param.zeitvon -%?>
-                        <?%- FOREACH event = data.$cpos;
+                        <?%- FOREACH event IN data.$cpos;
                                 id = event.0;
                                 title = event.1;
                                 subtitle = event.2;
@@ -182,7 +182,7 @@
         <form action="">
         <p>
         <select name="cgroups" onchange="di('?cmd=schema&amp;data=<?% param.zeitvon %?>&amp;__cgrp=',this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value)">
-            <?% FOREACH cgrp = param.cgroups %?>
+            <?% FOREACH cgrp IN param.cgroups %?>
               <option value="<?% cgrp.last %?>"<?% ' selected="selected"' IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?></option>
             <?% END %?>
         </select>
@@ -210,7 +210,7 @@
             <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=sch&amp;__cgrp=<?% cgi.param('__cgrp') %?>&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
             <?% today = [] %?>
             <?% tomor = [] %?>
-        <?% FOREACH zeit = zeiten %?>
+        <?% FOREACH zeit IN zeiten %?>
             <?% tom = 0 %?>
             <?% PERL %?>
                 use Date::Manip;
@@ -231,12 +231,12 @@
         <?% END %?>
         <?% IF today.size > 0 %?>
             <optgroup label="<?% date.format(today.0, "%A", locale) %?>">
-        <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
         <?% IF tomor.size > 0 %?>
             <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>">
-        <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
             </select>
diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl
index 878a3f9..8a1ae27 100644
--- a/skins/deltab/search.tmpl
+++ b/skins/deltab/search.tmpl
@@ -73,8 +73,8 @@
         <th width="60"></th>
         <th width="40" align="right"></th>
     </tr>
-	<?% FOREACH zeile = data %?>
-     <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+	<?% FOREACH zeile IN data %?>
+     <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;
             pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
@@ -114,7 +114,7 @@
             <?% gettext('Channel',30) %?><br />
             <select name='__channel'>
                 <option value="0"><?% gettext('All channels') %?></option>
-                <?% FOREACH ch = param.channels %?>
+                <?% FOREACH ch IN param.channels %?>
                   <?% IF ch.2 && ch.2 != channelgroup %?>
                     <?% IF channelgroup %?>
                     </optgroup>
diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl
index 677131c..0f561bc 100644
--- a/skins/deltab/tlist.tmpl
+++ b/skins/deltab/tlist.tmpl
@@ -149,8 +149,8 @@
         <th></th>
         <th width="64" align="right"></th>
     </tr>
-	<?% FOREACH zeile = data %?>
-     <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+	<?% FOREACH zeile IN data %?>
+     <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
 			<?%- id=zeile.0;
           aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
           sender=zeile.2;
@@ -267,7 +267,7 @@
         <?% IF param.keywords.size <  steps %?>
           <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
-        <?% FOREACH keyword = param.keywords %?>
+        <?% FOREACH keyword IN param.keywords %?>
               <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=tk&amp;data=<?% keyword.0 %?>">
                 <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
diff --git a/skins/deltab/topten.tmpl b/skins/deltab/topten.tmpl
index aedc5b5..ea4a569 100644
--- a/skins/deltab/topten.tmpl
+++ b/skins/deltab/topten.tmpl
@@ -71,8 +71,8 @@
 <h1><?% gettext("Top Ten entrys") %?></h1>
 <table  summary="" width="100%">
   <tr height="0"><th width="120"></th><th></th><th width="100"></th><th width="40" align="right"></th></tr>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8;
             pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
diff --git a/skins/deltab/ulist.tmpl b/skins/deltab/ulist.tmpl
index 6bed1f0..ebd175d 100644
--- a/skins/deltab/ulist.tmpl
+++ b/skins/deltab/ulist.tmpl
@@ -23,8 +23,8 @@
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
 <table summary=""  width="100%">
-    <?% FOREACH zeile = data %?>
-     <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+     <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
         <?% id=zeile.0;user=zeile.1;right=zeile.2 %?>
         <?% IF zeile.size <= 1 %?>
diff --git a/skins/deltab/vdrlist.tmpl b/skins/deltab/vdrlist.tmpl
index 2e6710c..32b42f0 100644
--- a/skins/deltab/vdrlist.tmpl
+++ b/skins/deltab/vdrlist.tmpl
@@ -60,8 +60,8 @@
 <?% fields = data.shift %?>
                         <table  summary="" width="100%">
                         <tr height="0"><th></th><th></th><th width="60" align="right"></th></tr>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;active=zeile.1;primary=zeile.2;host=zeile.3;cards=zeile.4 %?>
         <?% PROCESS ItemAsFlat %?>
     <?% END %?>
diff --git a/skins/deltab/vtxpage.tmpl b/skins/deltab/vtxpage.tmpl
index b2f148b..2845d62 100644
--- a/skins/deltab/vtxpage.tmpl
+++ b/skins/deltab/vtxpage.tmpl
@@ -10,7 +10,7 @@
     <form action="">
     <p>
     <select size="5" name='chan' onchange="di('?cmd=vt&amp;channel=',this.form.chan.options[this.form.chan.options.selectedIndex].value)">
-    	<?% FOREACH ch = param.channels %?>
+    	<?% FOREACH ch IN param.channels %?>
     	    <option value="<?% ch.1 %?>" <?% 'selected="selected"' IF channel == ch.1 %?>><?% ch.0 %?></option>
     	<?% END %?>
     </select>
@@ -40,7 +40,7 @@
 <?% END %?>
 </div>
 <?% global.sidebar = 1 %?>
-<?% FOREACH zeile = data %?>
+<?% FOREACH zeile IN data %?>
 <?% id=zeile.0;page=zeile.1;subpage=zeile.2;channels=zeile.3;prev=zeile.4;next=zeile.5;mtime=zeile.6 %?>
 <div style="float:left; margin:5px;" id="<?% id %?>">
   <h2><?% gettext("Page") %?>&nbsp;<?% page; IF subpage > 0 %?>/<?% subpage; END %?></h2>
diff --git a/skins/deltab/widgets/checkbox.tmpl b/skins/deltab/widgets/checkbox.tmpl
index ada0c0e..fe80dd6 100644
--- a/skins/deltab/widgets/checkbox.tmpl
+++ b/skins/deltab/widgets/checkbox.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td>
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <?% FOREACH wert = data.choices %?>
+        <?% FOREACH wert IN data.choices %?>
             <input type="checkbox" name="<?% data.NAME %?>" value="<?% wert %?>" <?% 'checked="checked"' IF val.grep("^${wert}").size %?> /><?% wert %?>&nbsp;
         <?% END %?>
     </td>
diff --git a/skins/deltab/widgets/date.tmpl b/skins/deltab/widgets/date.tmpl
index 6bfcf0c..c5a8c17 100644
--- a/skins/deltab/widgets/date.tmpl
+++ b/skins/deltab/widgets/date.tmpl
@@ -23,9 +23,9 @@ function ch_input (checkbox, input) {
     </td>
     <td>
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input style="width:80px;" size="20"  type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?> />
+        <input style="width:80px;" size="20"  type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?> />
         <?% valarr = val.split(''); z = 0 %?>
-        <?% FOREACH dd = gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
+        <?% FOREACH dd IN gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
         <input type="checkbox" name="Weekday" <?% "checked" IF ! val.search('^\d+') && valarr.$z != '-' %?> onchange='ch_input(this.form.Weekday, this.form.<?% data.NAME %?>)' /><?% dd %?>        
             <?% z = z + 1;
         END %?>
diff --git a/skins/deltab/widgets/list.tmpl b/skins/deltab/widgets/list.tmpl
index 1752ab5..9f5123e 100644
--- a/skins/deltab/widgets/list.tmpl
+++ b/skins/deltab/widgets/list.tmpl
@@ -15,15 +15,15 @@
         <?% ELSE %?>
             <select style="width:400px;" name="<?% data.NAME %?>">
         <?% END %?>
-            <?% FOREACH l = data.choices %?>
+            <?% FOREACH l IN data.choices %?>
                 <?% sel = '' %?>
                 <?% dis = '' %?>
-                <?% FOREACH valch = values %?>
+                <?% FOREACH valch IN values %?>
                     <?% IF valch == l.1 %?>
                     <?% sel = ' selected="selected"';LAST %?>
                     <?% END %?>
                 <?% END %?>
-                <?% FOREACH valch = data.disabled %?>
+                <?% FOREACH valch IN data.disabled %?>
                     <?% IF valch == l.1 %?>
                     <?% dis = ' disabled="disabled"';LAST %?>
                     <?% END %?>
diff --git a/skins/deltab/widgets/littlemenu.tmpl b/skins/deltab/widgets/littlemenu.tmpl
index d6045ff..4330681 100644
--- a/skins/deltab/widgets/littlemenu.tmpl
+++ b/skins/deltab/widgets/littlemenu.tmpl
@@ -33,7 +33,7 @@
   <p class="section"><?% gettext("Preferences") %?></p>
 <?% END %?>
     <p>
-        <?% FOREACH l = data.links %?>
+        <?% FOREACH l IN data.links %?>
             <?% "<b>" IF data.highlight == l.key %?>
             <a href="<?% l.value.link %?>"><?% l.value.text %?></a>
             <?% "</b>" IF data.highlight == l.key %?>
diff --git a/skins/deltab/widgets/menu.tmpl b/skins/deltab/widgets/menu.tmpl
index e04653e..5e4f70a 100644
--- a/skins/deltab/widgets/menu.tmpl
+++ b/skins/deltab/widgets/menu.tmpl
@@ -5,7 +5,7 @@
 <?% END %?>
 
 <ul>
-<?% FOREACH field = data %?>
+<?% FOREACH field IN data %?>
     <?% group = field.0; short = field.1; name = field.2; descr = field.3 %?>
     <?% IF ! oldgroup.defined %?>
 <li><?% group %?><ul>
diff --git a/skins/deltab/widgets/message.tmpl b/skins/deltab/widgets/message.tmpl
index 03d39fa..dea4880 100644
--- a/skins/deltab/widgets/message.tmpl
+++ b/skins/deltab/widgets/message.tmpl
@@ -5,7 +5,7 @@
             <?% data %?>
         <?% ELSE %?>
             <table summary="">
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
                 <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
                     <td><?% zeile %?></td>
                 </tr>
diff --git a/skins/deltab/widgets/radio.tmpl b/skins/deltab/widgets/radio.tmpl
index a3ab1c5..ea79f7a 100644
--- a/skins/deltab/widgets/radio.tmpl
+++ b/skins/deltab/widgets/radio.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td>
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <?% FOREACH wert = data.choices %?>
+        <?% FOREACH wert IN data.choices %?>
             <input type="radio" name="<?% data.NAME %?>" value="<?% wert %?>" <?% 'checked="checked"' IF val.grep("^${wert}").size %?> /><?% wert %?>&nbsp;
         <?% END %?>
     </td>
diff --git a/skins/deltab/widgets/remote.tmpl b/skins/deltab/widgets/remote.tmpl
index 4cd9f89..32eb664 100644
--- a/skins/deltab/widgets/remote.tmpl
+++ b/skins/deltab/widgets/remote.tmpl
@@ -229,7 +229,7 @@ aktiv = window.setInterval("grab()", inter);
                     <tr>
                         <td colspan="7" align="center">
                             <select style="width:175px;" name="vdr">
-                            <?% FOREACH l = param.vdrlist %?>
+                            <?% FOREACH l IN param.vdrlist %?>
                                 <option value='<?% l.1 %?>'<?% IF l.1 == param.vdr %?> selected<?% END %?>><?% l.0 %?></option>
                             <?% END %?>
                             </select>
@@ -245,7 +245,7 @@ aktiv = window.setInterval("grab()", inter);
                     <tr>
                         <td colspan="7" align="center">
                             <select style="width:175px;" name="channels" onchange="post('switch', this.form.channels.options[this.form.channels.options.selectedIndex].value + '&amp;__vdr=' + ( this.form.vdr.options ? this.form.vdr.options[this.form.vdr.options.selectedIndex].value : this.form.vdr.value ))">
-                            <?% FOREACH l = param.channels %?>
+                            <?% FOREACH l IN param.channels %?>
                             <?% IF l.2 && l.2 != optgroup %?>
                               <?% IF optgroup %?>
                               </optgroup>
diff --git a/skins/deltab/widgets/table.tmpl b/skins/deltab/widgets/table.tmpl
index 51a9987..3bbdb05 100644
--- a/skins/deltab/widgets/table.tmpl
+++ b/skins/deltab/widgets/table.tmpl
@@ -3,7 +3,7 @@
 <table summary="">
 <?% IF type == 'HASH' %?>
     <th>Name</th><th>Value</th>
-     <?% FOREACH name = data.keys.sort %?>
+     <?% FOREACH name IN data.keys.sort %?>
      <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
         <td><?% name %?></td><td><?% data.$name | replace('\|', '<br />') %?></td>
     </tr>
@@ -11,7 +11,7 @@
 <?% ELSE %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <th style="white-space: nowrap">
                 <?% field %?>
                 <?% IF param.sortable %?>
@@ -21,9 +21,9 @@
             </th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
             <td><?% field %?></td>
             <?% END %?>
         </tr>
diff --git a/skins/html/alist.tmpl b/skins/html/alist.tmpl
index 340a68b..487a468 100644
--- a/skins/html/alist.tmpl
+++ b/skins/html/alist.tmpl
@@ -17,7 +17,7 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <th style="white-space: nowrap">
                 <?% field %?>
                 <?% IF param.sortable %?>
@@ -28,7 +28,7 @@
         <?% END %?>
         </tr>
         <?% x = -1 %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% IF zeile.1 == 'n' %?>
             <?% myclass = "deactive" %?>
         <?% ELSE %?>
@@ -37,7 +37,7 @@
         <?% x = x + 1 %?>
         <tr class="<?% myclass %?>" <?% IF (x mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
             <?% c = 0 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% IF c == 1; # Id Field %?>
                 <td><nobr>
@@ -65,7 +65,7 @@
                 <?% ELSIF c == 4; # Channel Field %?>
                 <td>
                     <select style="width: 100%">
-                    <?% FOREACH ch = field.split(',') %?>
+                    <?% FOREACH ch IN field.split(',') %?>
                         <option><?% ch %?></option>
                     <?% END %?>
                     </select>
diff --git a/skins/html/clist.tmpl b/skins/html/clist.tmpl
index 4cc980a..d68e9dc 100644
--- a/skins/html/clist.tmpl
+++ b/skins/html/clist.tmpl
@@ -141,7 +141,7 @@
         <th><?% PROCESS SortItem row="CA" label=gettext('Conditional access (CA)') trunc=10  %?></th>
         <th width="64" align="right"></th>
     </tr>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
         <?% id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3;source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8;CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14;POS=zeile.15;CGRP=zeile.16;HOST=zeile.17; %?>
         <?% IF not sortby.defined && OLDHOST != HOST  %?>
             <tr>
diff --git a/skins/html/cmdlist.tmpl b/skins/html/cmdlist.tmpl
index 54e48ce..a8f581b 100644
--- a/skins/html/cmdlist.tmpl
+++ b/skins/html/cmdlist.tmpl
@@ -6,7 +6,7 @@
 <table border="0" width="95%">
 <?% fields = data.shift %?>
     <tr>
-    <?% FOREACH field = fields %?>
+    <?% FOREACH field IN fields %?>
         <?% NEXT IF field.match('^__') %?>
         <th>
             <nobr><?% field %?>
@@ -18,10 +18,10 @@
         </th>
     <?% END %?>
     </tr>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
     <tr>
         <?% c = -1 %?>
-        <?% FOREACH field = zeile %?>
+        <?% FOREACH field IN zeile %?>
             <?% c = c + 1 %?>
             <?% NEXT IF fields.$c.match('^__') %?>
             <td>
diff --git a/skins/html/display.tmpl b/skins/html/display.tmpl
index 42432c8..71123e3 100644
--- a/skins/html/display.tmpl
+++ b/skins/html/display.tmpl
@@ -16,7 +16,7 @@
     <?% IF values.13 %?>
        <?% Image = values.13 %?>
     <?% END %?>
-    <?% FOREACH field = fields %?>
+    <?% FOREACH field IN fields %?>
         <?% c = c + 1 %?>
         <?% NEXT UNLESS values.$c %?>
         <?% NEXT IF field == gettext('Percent') && values.$c > 100 %?>
@@ -61,7 +61,7 @@
         <?% ELSIF field == gettext('Description') %?>
             <td>
             <?% IF Image %?>
-                <?% FOREACH img = Image.split("\n") %?>
+                <?% FOREACH img IN Image.split("\n") %?>
                 <img src='?cmd=eimage&data=<?% img %?>' border=1 align='right'>
                 <?% END %?>
             <?% END %?>
diff --git a/skins/html/filesys.tmpl b/skins/html/filesys.tmpl
index da9462a..2a3401e 100644
--- a/skins/html/filesys.tmpl
+++ b/skins/html/filesys.tmpl
@@ -4,7 +4,7 @@ trash = param.usage.shift;
 
 IF param.graphic;
     FILTER null;
-        FOREACH device = param.usage;
+        FOREACH device IN param.usage;
             name = reentities(device.first).split('/').last;
 
             free = 100 - device.5;
@@ -41,7 +41,7 @@ END;
 <?% IF param.graphic %?>
     <table border="0" width="95%">
     <?% count = 0 %?>
-    <?% FOREACH file = statusfiles %?>
+    <?% FOREACH file IN statusfiles %?>
     	<?% IF count % 2 == 0 %?>
     		<?% IF count > 0 %?>
     </tr>
@@ -60,13 +60,13 @@ END;
 <?% ELSE %?>
     <table border="0" width="95%">
             <tr>
-            <?% FOREACH field = trash %?>
+            <?% FOREACH field IN trash %?>
                 <th><?% field %?></th>
             <?% END %?>
             </tr>
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
             <tr>
-                <?% FOREACH field = zeile %?>
+                <?% FOREACH field IN zeile %?>
                 <td><?% field %?></td>
                 <?% END %?>
             </tr>
diff --git a/skins/html/help.tmpl b/skins/html/help.tmpl
index d66d361..cdcccec 100644
--- a/skins/html/help.tmpl
+++ b/skins/html/help.tmpl
@@ -24,7 +24,7 @@ var tree = new WebFXTree("XXV", "?cmd=<?% getModule('HTTPD').StartPage %?>");
         runnow.add(new WebFXTreeItem("<?% gettext("Next",12) %?>",  "?cmd=next"));
 
     <?% USE date %?>
-    <?% FOREACH zeit = param.periods.split(','); %?>
+    <?% FOREACH zeit IN param.periods.split(','); %?>
         <?% runningnext = 0 %?>
         <?% tom = 0 %?>
         <?% PERL %?>
@@ -50,7 +50,7 @@ var tree = new WebFXTree("XXV", "?cmd=<?% getModule('HTTPD').StartPage %?>");
 <?% IF allow('schema') %?>
     var program = new WebFXTreeItem("<?% gettext("Program guide") %?>","?cmd=schema",tree);
     <?% IF allow('topten') %?>program.add(new WebFXTreeItem("<?% gettext("Top ten entry") %?>",    "?cmd=t10"));<?% END %?>
-    <?% FOREACH ch = param.CHANNELS %?>
+    <?% FOREACH ch IN param.CHANNELS %?>
         <?% IF ch.2 != lastgroup;lastgroup = ch.2 %?>
         <?% CNT = CNT + 1 %?>
     var programgroup<?% CNT %?> = new WebFXTreeItem("<?% escape(chop(lastgroup,10)) %?>",  "?cmd=program&amp;data=<?% ch.1 %?>",program);
@@ -116,7 +116,7 @@ var admin = new WebFXTreeItem("<?% gettext("Administration") %?>",0,tree);
 
 <?% IF allow('configedit') %?>
     var prefs = new WebFXTreeItem("<?% gettext("Preferences") %?>","?cmd=configedit",tree);
-    <?% FOREACH co = param.CONFIGS %?>
+    <?% FOREACH co IN param.CONFIGS %?>
       <?% IF co != "CONFIG" %?>
         prefs.add(new WebFXTreeItem("<?% chop(co,10) %?>",  "?cmd=configedit&amp;data=<?% co %?>"));
       <?% END %?>
@@ -155,8 +155,8 @@ document.write(tree);
 <p><?% data.shift %?></p>
   <?% IF data.size > 1 %?>
 <table summary=""  width="100%">
-    <?% FOREACH zeile = data %?>
-    <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+    <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
         <?% short=zeile.0;long=zeile.1;modul=zeile.2;desc=zeile.3 %?>
         <?% IF allow(long) %?>
diff --git a/skins/html/logger.tmpl b/skins/html/logger.tmpl
index 987c029..eccb4a7 100644
--- a/skins/html/logger.tmpl
+++ b/skins/html/logger.tmpl
@@ -16,7 +16,7 @@
 <table border="0" width="95%">
 <?% fields = data.shift %?>
     <tr>
-    <?% FOREACH field = fields %?>
+    <?% FOREACH field IN fields %?>
         <?% NEXT IF field.match('^__') %?>
         <th>
             <nobr><?% field %?>
@@ -29,11 +29,11 @@
     <?% END %?>
     </tr>
     <?% x = -1 %?>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
     <tr>
         <?% x = x + 1 %?>
         <?% c = -1 %?>
-        <?% FOREACH field = zeile %?>
+        <?% FOREACH field IN zeile %?>
             <?% c = c + 1 %?>
             <?% NEXT IF fields.$c.match('^__') %?>
             <td <?% IF (x mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
diff --git a/skins/html/memory.tmpl b/skins/html/memory.tmpl
index 0113cb5..131f307 100644
--- a/skins/html/memory.tmpl
+++ b/skins/html/memory.tmpl
@@ -10,7 +10,7 @@
         cacheddata = [];
         inactivedata = [];
         timestamps = [];
-        FOREACH row = data;
+        FOREACH row IN data;
             t = date.format(row.6, '%H:%M');
             timestamps.push(t);
             activedata.push(row.2 / (1024));
diff --git a/skins/html/mldisplay.tmpl b/skins/html/mldisplay.tmpl
index c2680f7..d1e0286 100644
--- a/skins/html/mldisplay.tmpl
+++ b/skins/html/mldisplay.tmpl
@@ -50,7 +50,7 @@
     <td width="30%">
         <?% IF fields.11 %?>
             <?% mydirectors = [] %?>
-            <?% FOREACH director = fields.11.split(',') %?>
+            <?% FOREACH director IN fields.11.split(',') %?>
                 <?% director = director.replace('^\s+|\s+$','') %?>
                 <?% director = "<a href=\"?cmd=mlsearch&__search&__selfields=director&__searchitem=$director\">$director</a>" %?>
                 <?% mydirectors.push(director) %?>
@@ -64,7 +64,7 @@
     <td width="30%">
         <?% IF fields.4 %?>
             <?% mylanguages = [] %?>
-            <?% FOREACH language = fields.4.split(',') %?>
+            <?% FOREACH language IN fields.4.split(',') %?>
                 <?% language = language.replace('^\s+|\s+$','') %?>
                 <?% language = "<a href=\"?cmd=mlsearch&__search&__selfields=director&__searchitem=$language\">$language</a>" %?>
                 <?% mylanguages.push(language) %?>
@@ -80,7 +80,7 @@
     <td width="30%">
         <?% IF fields.14 %?>
             <?% mycountrys = [] %?>
-            <?% FOREACH country = fields.14.split('&#x2f;') %?>
+            <?% FOREACH country IN fields.14.split('&#x2f;') %?>
                 <?% country = country.replace('^\s+|\s+$','') %?>
                 <?% country = "<a href=\"?cmd=mlsearch&__search&__selfields=country&__searchitem=$country\">$country</a>" %?>
                 <?% mycountrys.push(country) %?>
@@ -181,7 +181,7 @@
     <td colspan=3>
         <?% selection = param.genres_sel %?>
         <?% genres = param.genres_all %?>
-        <?% FOREACH id = selection %?>
+        <?% FOREACH id IN selection %?>
         <a href="?cmd=mlsearch&__search&__genres=<?% genres.$id.id %?>"><?% genres.$id.name %?></a>&nbsp;
         <?% END %?>
     </td>
diff --git a/skins/html/mledit.tmpl b/skins/html/mledit.tmpl
index 493dba9..e1e8b62 100644
--- a/skins/html/mledit.tmpl
+++ b/skins/html/mledit.tmpl
@@ -98,7 +98,7 @@
             <select name="__mediatype">
                 <option label="" value="0" <?% IF (data.mediatype || param.mediatype) && (data.mediatype == 0 || param.mediatype == 0) %?>selected="selected"<?% END %?>></option>
                 <?% mediatypes = param.mediatypes %?>
-                <?% FOREACH type = mediatypes %?>
+                <?% FOREACH type IN mediatypes %?>
                 <option label="<?% type.1 %?>" value="<?% type.0 %?>" <?% IF data.mediatype == type.0 || param.mediatype == type.0 %?>selected="selected"<?% END %?>><?% type.1 %?></option>
                 <?% END %?>
             </select>
diff --git a/skins/html/mlist.tmpl b/skins/html/mlist.tmpl
index 1384a2b..d2b7cd5 100644
--- a/skins/html/mlist.tmpl
+++ b/skins/html/mlist.tmpl
@@ -5,7 +5,7 @@
 <tr>
     <th>
     <?% gettext("Artists") %?>: <select name='artists' onChange="di('artist:' + this.form.artists.options[this.form.artists.options.selectedIndex].value, '?cmd=ml&amp;data=')">
-    <?% FOREACH ch = param.artists %?>
+    <?% FOREACH ch IN param.artists %?>
         <option value="<?% url( ch.0 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'artist' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 %?></option>
     <?% END %?>
     </select>
@@ -13,7 +13,7 @@
 
     <th>
     <?% gettext("Albums") %?>: <select name='albums' onChange="di('album:' + this.form.albums.options[this.form.albums.options.selectedIndex].value, '?cmd=ml&amp;data=')">
-    <?% FOREACH ch = param.albums %?>
+    <?% FOREACH ch IN param.albums %?>
         <option value="<?% url( ch.0 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'album' && cgi.param('data').split(':').last == ch.0 %?>><?% chop(ch.0,50) %?></option>
     <?% END %?>
     </select>
@@ -25,7 +25,7 @@
     </th>
     <th>
     <?% gettext("Genres") %?>: <select name='genres' onChange="di('genre:' + this.form.genres.options[this.form.genres.options.selectedIndex].value, '?cmd=ml&amp;data=')">
-    <?% FOREACH ch = param.genres %?>
+    <?% FOREACH ch IN param.genres %?>
         <option value="<?% url( ch.0 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 %?></option>
     <?% END %?>
     </select>
@@ -58,7 +58,7 @@
 <table border="0" width="95%">
 <?% IF data.size %?>
     <?% fields = data.shift %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% IF !oldalbum.defined || zeile.2 != oldalbum %?>
         <tr>
         <td colspan=<?% zeile.size %?>>
@@ -79,7 +79,7 @@
         </td>
         </tr>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
         <?% NEXT IF field.match('^__') %?>
             <th><?% field %?></th>
         <?% END %?>
@@ -87,7 +87,7 @@
         <?% END %?>
         <tr>
             <?% c = -1 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% NEXT IF fields.$c.match('^__') %?>
                 <?% IF c == 0; # Id Field %?>
diff --git a/skins/html/mllistmedias.tmpl b/skins/html/mllistmedias.tmpl
index 123d2ff..a3f6fc2 100644
--- a/skins/html/mllistmedias.tmpl
+++ b/skins/html/mllistmedias.tmpl
@@ -25,7 +25,7 @@
                     <?% IF fields.4 && fields.5 %?>;<?% END %?>
                     <?% IF fields.5 %?>
                         <?% mydirectors = [] %?>
-                        <?% FOREACH director = fields.5.split(',') %?>
+                        <?% FOREACH director IN fields.5.split(',') %?>
                             <?% director = director.replace('^\s+|\s+$','') %?>
                             <?% director = "<a href=\"?cmd=mlsearch&__search&__selfields=director&__searchitem=$director\">$director</a>" %?>
                             <?% mydirectors.push(director) %?>
diff --git a/skins/html/mlnavcontainer.tmpl b/skins/html/mlnavcontainer.tmpl
index 97a9264..e89c620 100644
--- a/skins/html/mlnavcontainer.tmpl
+++ b/skins/html/mlnavcontainer.tmpl
@@ -3,7 +3,7 @@
     
         <select name='ranges' onChange="di(this.form.ranges.options[this.form.ranges.options.selectedIndex].value, '?cmd=mllist&__range=')">
             <option value="0"><?% gettext('Ranges') %?></option>
-        <?% FOREACH r = param.ranges %?>
+        <?% FOREACH r IN param.ranges %?>
             <option value='<?% r.first %?>'<?% " selected" IF cgi.param('__range') == r.first %?> ><?% r.last %?></option>
         <?% END %?>
         </select>
diff --git a/skins/html/movetimerlist.tmpl b/skins/html/movetimerlist.tmpl
index 5295ce8..c730856 100644
--- a/skins/html/movetimerlist.tmpl
+++ b/skins/html/movetimerlist.tmpl
@@ -84,8 +84,8 @@
                 <th><?% gettext('Move timer') %?></th>
                 <th><?% gettext('Change original timer') %?></th>
             </tr>
-     <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+     <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?>
         <?% PROCESS Item %?>
      <?% END %?>
diff --git a/skins/html/network.tmpl b/skins/html/network.tmpl
index 5e39706..ef295a4 100644
--- a/skins/html/network.tmpl
+++ b/skins/html/network.tmpl
@@ -6,7 +6,7 @@
         fields = data.shift;
 
         timestamps = [];
-        FOREACH row = data;
+        FOREACH row IN data;
             iname = row.0.split(':').first;
 
             rxbytes.${iname} = [];
@@ -17,7 +17,7 @@
             oldentry.${iname} = [];
         END;
 
-        FOREACH row = data;
+        FOREACH row IN data;
             IF ot != row.5;
              t = date.format(row.5, '%H:%M');
              timestamps.push(t);
@@ -39,7 +39,7 @@
                 oldentry.${iname} = row;
         END;
 
-        FOREACH iname = rxbytes.keys.sort;
+        FOREACH iname IN rxbytes.keys.sort;
 
             # Data ...
             d = [
@@ -86,7 +86,7 @@
 <?% END %?>
 <table border="0" width="95%">
 
-        <?% FOREACH file = statusfiles.keys %?>
+        <?% FOREACH file IN statusfiles.keys %?>
         <tr>
             <td colspan="<?% fields.size %?>" align=center>
                 <img src="<?% statusfiles.$file %?>">
diff --git a/skins/html/now.tmpl b/skins/html/now.tmpl
index cfd414b..ea4a8f3 100644
--- a/skins/html/now.tmpl
+++ b/skins/html/now.tmpl
@@ -32,7 +32,7 @@
     <?% END %?>
 </h1>
     <select name='cgroups' onChange="di(this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value, '?cmd=<?% cgi.param('cmd') %?>&amp;data=<?% param.zeitvon || cgi.param('data') %?>&amp;__cgrp=')">
-        <?% FOREACH cgrp = param.cgroups %?>
+        <?% FOREACH cgrp IN param.cgroups %?>
         <option value='<?% cgrp.last %?>' <?% "selected" IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?>
         <?% END %?>
     </select>
@@ -46,12 +46,12 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;desc=zeile.8;duration=zeile.9 %?>
             <?% IF group != old %?>
                 <tr><td colspan="6" bgcolor='#DDDDDD'>
diff --git a/skins/html/program.tmpl b/skins/html/program.tmpl
index 3fdbc0f..8770556 100644
--- a/skins/html/program.tmpl
+++ b/skins/html/program.tmpl
@@ -7,7 +7,7 @@
 </SCRIPT>
 
 <!-- TableTemplate -->
-<?% FOREACH ch = param.channels %?>
+<?% FOREACH ch IN param.channels %?>
     <?% IF cgi.param('data') == ch.1 || cgi.param('data') == ch.0 || param.current == ch.1 %?>
         <?% channel = ch.0 %?>
         <?% channelpos = ch.1 %?>
@@ -27,7 +27,7 @@
 <form>
     <td>
     <select name='data' onChange="di(this.form.data.options[this.form.data.options.selectedIndex].value, '?cmd=program&amp;data=')">
-    <?% FOREACH ch = param.channels %?>
+    <?% FOREACH ch IN param.channels %?>
       <?% IF ch.2 && ch.2 != channelgroup %?>
         <?% IF channelgroup %?>
         </optgroup>
@@ -53,12 +53,12 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') || loop.count == 6 %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
             <?% c = 0 %?>
             <?% day = zeile.5 %?>
             <?% IF !oldday.defined || day != oldday %?>
@@ -67,7 +67,7 @@
                 </td></tr>
             <?% END %?>
         <tr class="<?% myclass %?>"<?% IF (loop.count mod 2) == 0 %?> bgcolor='#F5F5F5'<?% END %?>>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% IF c == 1; # Id Field %?>
                 <td>
diff --git a/skins/html/rdisplay.tmpl b/skins/html/rdisplay.tmpl
index 9263be8..b507df1 100644
--- a/skins/html/rdisplay.tmpl
+++ b/skins/html/rdisplay.tmpl
@@ -33,7 +33,7 @@
         <td colspan="<?% colspan %?>"><nobr><?%- secold = 0;
         c = -1;
         ml = d.split(',');
-        FOREACH marker = ml;
+        FOREACH marker IN ml;
                 b = c;
                 c = c + 1;
                 m = marker.split(':');
@@ -102,7 +102,7 @@
     <select name='data' onChange="di(this.form.data.options[this.form.data.options.selectedIndex].value, '?cmd=rconvert&amp;data=<?% data.RecordId %?>&amp;__action=save&amp;__cmd=')">
     <?% c = 0 %?>
         <option value='0'><?% gettext("Choose a command to edit this recording ...") %?>:</option>
-    <?% FOREACH cmd = param.reccmds %?>
+    <?% FOREACH cmd IN param.reccmds %?>
         <?% c = c + 1 %?>
         <option value='<?% c %?>'><?% cmd %?></option>
     <?% END %?>
@@ -117,7 +117,7 @@
     <img src="images/radio.png" alt="" title="<?% gettext('Radio recording') %?>" />
   <?% ELSIF files.size > 0; %?>
         <table border="0" align='left'>
-    <?% FOREACH frame = files %?>
+    <?% FOREACH frame IN files %?>
         <tr>
         <td>
           <img src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" width="200" title="<?% gettext('Television recording') %?> : <?% x=frame / 25;PROCESS hfs d=x %?>" />
@@ -168,7 +168,7 @@
           <td>&nbsp;</td>
 					<td>
                   <?% gettext('Keywords') %?>&nbsp;:&nbsp;
-                  <?% FOREACH keyword = data.keywords %?>
+                  <?% FOREACH keyword IN data.keywords %?>
                       <?% IF allowkeywords %?>
                               <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
                       <?% END %?>
diff --git a/skins/html/report.tmpl b/skins/html/report.tmpl
index 8b5c0b0..a148416 100644
--- a/skins/html/report.tmpl
+++ b/skins/html/report.tmpl
@@ -1,6 +1,6 @@
 <h1><?% gettext("Protocol of the activities") %?></h1>
 
-<?% FOREACH name = data.keys.sort %?>
+<?% FOREACH name IN data.keys.sort %?>
     <h2><?% gettext("Report for module") %?>&nbsp;
         <?% name %?>:</h2>
     <?% IF name == 'RECORDS';
@@ -14,7 +14,7 @@
         END;
      %?>
 
-    <?% FOREACH typ = data.$name.keys.sort %?>
+    <?% FOREACH typ IN data.$name.keys.sort %?>
         <?% IF typ == 'message' %?>
             <?% data.$name.$typ %?><p>
 
@@ -22,7 +22,7 @@
            <?% fields = data.$name.$typ.shift %?>
                 <table>
                     <tr>
-                    <?% FOREACH field = fields %?>
+                    <?% FOREACH field IN fields %?>
                         <?% NEXT IF field.match('^__') %?>
                         <th>
                             <nobr><?% field %?>
@@ -30,10 +30,10 @@
                         </th>
                     <?% END %?>
                     </tr>
-                    <?% FOREACH zeile = data.$name.$typ %?>
+                    <?% FOREACH zeile IN data.$name.$typ %?>
                     <tr>
                         <?% c = -1 %?>
-                        <?% FOREACH field = zeile %?>
+                        <?% FOREACH field IN zeile %?>
                             <?% c = c + 1 %?>
                             <?% NEXT IF fields.$c.match('^__') %?>
                             <td><?% IF link %?><a href="<?% link %?><?% zeile.first %?>"><?% END %?>
diff --git a/skins/html/rlist.tmpl b/skins/html/rlist.tmpl
index 10614c9..76de453 100644
--- a/skins/html/rlist.tmpl
+++ b/skins/html/rlist.tmpl
@@ -157,7 +157,7 @@
     <table border="0" width="95%">
         <tr>
         <?% c = -1 %?>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% c = c + 1 %?>
             <?% NEXT IF field.match('^__') %?>
             <th style="white-space: nowrap">
@@ -174,7 +174,7 @@
             </th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;
              duration=zeile.4;start=zeile.5;new=zeile.6;type=zeile.7;folder=zeile.8;fulltitle=zeile.9;
              isrecording=zeile.10;desc=zeile.11;foldertitle=fulltitle.split('~').last -%?>
@@ -193,7 +193,7 @@
             </td>
             <?% ELSE %?>
             <?% c = -1 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
              <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;
                    duration=zeile.4;start=zeile.5;new=zeile.6;type=zeile.7;folder=zeile.8;fulltitle=zeile.9;
                    isrecording=zeile.10;desc=zeile.11;foldertitle=fulltitle.split('~').last -%?>
@@ -236,14 +236,14 @@
 <a href="?cmd=<?% cmd %?><?% daten %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/desc.png"></a>&nbsp;
 <?% END %?>
         <?% gettext('Sorting') %?> :
-        <?% FOREACH row = fields %?>
+        <?% FOREACH row IN fields %?>
         <?% NEXT IF row.match('^__') %?>
           <?% PROCESS SortItem label=row %?>
         <?% END %?>
 <?% END %?>
       <div>
-        <?% FOREACH zeile = data %?>
-            <!-- Item: <?% FOREACH x = zeile %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
+        <?% FOREACH zeile IN data %?>
+            <!-- Item: <?% FOREACH x IN zeile %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
             <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;
              duration=zeile.4;start=zeile.5;new=zeile.6;type=zeile.7;folder=zeile.8;fulltitle=zeile.9;
              isrecording=zeile.10;desc=zeile.11;preview=zeile.12;foldertitle=fulltitle.split('~').last -%?>
diff --git a/skins/html/schema.tmpl b/skins/html/schema.tmpl
index ba780ce..1dbf2d1 100644
--- a/skins/html/schema.tmpl
+++ b/skins/html/schema.tmpl
@@ -29,7 +29,7 @@ Duration = param.zeitbis - param.zeitvon;
 
 <!-- TableTemplate -->
 <select name='cgroups' onChange="di(this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value, '?cmd=schema&amp;data=<?% param.zeitvon %?>&amp;__cgrp=')">
-<?% FOREACH cgrp = param.cgroups %?>
+<?% FOREACH cgrp IN param.cgroups %?>
     <option value='<?% cgrp.last %?>' <?% "selected" IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?>
 <?% END %?>
 </select>
@@ -89,7 +89,7 @@ Duration = param.zeitbis - param.zeitvon;
 </tr>
 
 <?% x = -1 %?>
-<?% FOREACH cpos = data.keys.nsort %?>
+<?% FOREACH cpos IN data.keys.nsort %?>
 <tr><td colspan="<?% (colspan + 1) %?>"><img src='images/blank.png' width='10' height=1 border=0 align='left' /></td></tr>
 <?% x = x + 1;
     channelName = data.$cpos.first.3;
@@ -102,7 +102,7 @@ Duration = param.zeitbis - param.zeitvon;
     <td colspan="<?% colspan %?>" style="white-space: nowrap">
         <?%- ges = 0; oldend = param.zeitvon -%?>
         <?%-
-        FOREACH event = data.$cpos;
+        FOREACH event IN data.$cpos;
                 epgId       = event.0;
                 epgTitle    = event.1;
                 epgSubTitle = event.2;
diff --git a/skins/html/search.tmpl b/skins/html/search.tmpl
index 1689092..5c4e45f 100644
--- a/skins/html/search.tmpl
+++ b/skins/html/search.tmpl
@@ -40,7 +40,7 @@
     <td>
     <select name='__channel'>
         <option value="0"><?% gettext('All channels') %?>
-    <?% FOREACH ch = param.channels %?>
+    <?% FOREACH ch IN param.channels %?>
       <?% IF ch.2 && ch.2 != channelgroup %?>
         <?% IF channelgroup %?>
         </optgroup>
@@ -110,12 +110,12 @@
             <?% IF enableform %?>
               <th></th>
             <?% END %?>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') || loop.count == 8 || loop.count == 9 %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
             <?% c = -1 %?>
             <?% day = zeile.7 %?>
             <?% IF !oldday.defined || day != oldday %?>
@@ -124,7 +124,7 @@
                 </td></tr>
             <?% END %?>
             <tr class="<?% myclass %?>"<?% IF (loop.count mod 2) == 0 %?> bgcolor='#F5F5F5'<?% END %?>>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% NEXT IF fields.$c.match('^__') %?>
                 <?% IF c == 0; # Id Field %?>
diff --git a/skins/html/tlist.tmpl b/skins/html/tlist.tmpl
index 79c12a9..32e09bd 100644
--- a/skins/html/tlist.tmpl
+++ b/skins/html/tlist.tmpl
@@ -42,7 +42,7 @@
         <tr>
         <?% fields = data.shift %?>
         <?% c = -1 %?>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% c = c + 1 %?>
             <?% NEXT IF field.match('^__') or c == 4 %?>
             <th><?% field %?></th>
@@ -54,7 +54,7 @@
             <th width="64"><?% gettext("Selection",7) %?></th>
 <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
             <?% aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
                 pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
                 day = zeile.4;
@@ -73,7 +73,7 @@
             <?% END %?>
             <tr class="<?% myclass %?>" <?% IF (loop.count mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
                 <?% c = -1 %?>
-                <?% FOREACH field = zeile %?>
+                <?% FOREACH field IN zeile %?>
                     <?% c = c + 1 %?>
                     <?% NEXT IF fields.$c.match('^__') or c == 4 %?>
                     <?% IF c == 0; # Id Field %?>
@@ -108,7 +108,7 @@
                     <?% ELSIF c == 7; # Title %?>
                     <td>
                         <?% IF zeile.10 %?><?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field desc=zeile.13 eventid=zeile.10 linkid=zeile.10 ttp_offset=0 %?><?% END %?>
-                        <?% FOREACH f = field.split('~') %?>
+                        <?% FOREACH f IN field.split('~') %?>
                             <div class="<?% myclass %?>"><?% f %?></div>
                         <?% END %?>
                         <?% IF zeile.10 %?></a><?% END %?>
diff --git a/skins/html/topten.tmpl b/skins/html/topten.tmpl
index e175a43..fa76088 100644
--- a/skins/html/topten.tmpl
+++ b/skins/html/topten.tmpl
@@ -15,12 +15,12 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% c = 0 %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8;
@@ -28,7 +28,7 @@
             rank=zeile.13 div 1;level=zeile.14;quantity=zeile.15;
             %?>
         <tr <?% IF (loop.count mod 2) == 0 %?> bgcolor='#F5F5F5'<?% END %?>>
-            <?% FOREACH field = [id,title,channel,start,stop,day,rank] %?>
+            <?% FOREACH field IN [id,title,channel,start,stop,day,rank] %?>
                 <?% c = c + 1 %?>
                 <?% IF c == 1; # Id Field %?>
                 <td>
diff --git a/skins/html/ulist.tmpl b/skins/html/ulist.tmpl
index 27811fb..8f1c5a5 100644
--- a/skins/html/ulist.tmpl
+++ b/skins/html/ulist.tmpl
@@ -10,16 +10,16 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
         <?% x = -1 %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% x = x + 1 %?>
         <tr class="<?% myclass %?>" <?% IF (x mod 2) != 0 %?>bgcolor='#F5F5F5'<?% END %?>>
             <?% c = 0 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% IF c == 1; # Id Field %?>
                 <td>
diff --git a/skins/html/vdrlist.tmpl b/skins/html/vdrlist.tmpl
index 30e360d..af3a450 100644
--- a/skins/html/vdrlist.tmpl
+++ b/skins/html/vdrlist.tmpl
@@ -10,16 +10,16 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
         <?% x = -1 %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% x = x + 1 %?>
         <tr class="<?% myclass %?>" <?% IF (x mod 2) != 0 %?>bgcolor='#F5F5F5'<?% END %?>>
             <?% c = 0 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% IF c == 1; # Id Field %?>
                 <td>
diff --git a/skins/html/vitals.tmpl b/skins/html/vitals.tmpl
index 7704065..46b1cbd 100644
--- a/skins/html/vitals.tmpl
+++ b/skins/html/vitals.tmpl
@@ -8,7 +8,7 @@
         utildata = [];
         userdata = [];
         timestamps = [];
-        FOREACH item = param.stack;
+        FOREACH item IN param.stack;
             t = date.format(item.timestamp, '%H:%M:%S');
             timestamps.push(t);
             l = item.load.first * 10;
@@ -68,7 +68,7 @@
 <table width=100%><tr><td class='tableheader'><h3><?% param.headingText %?></h3>
 <?% END %?>
 <table border="0" width="95%">
-<?% FOREACH name = data.keys.sort %?>
+<?% FOREACH name IN data.keys.sort %?>
 <tr>
     <td><?% name %?></td>
     <td><?% data.$name %?></td>
diff --git a/skins/html/vtxpage.tmpl b/skins/html/vtxpage.tmpl
index efd03ad..267e6e7 100644
--- a/skins/html/vtxpage.tmpl
+++ b/skins/html/vtxpage.tmpl
@@ -8,7 +8,7 @@
 <table border="0">
 <tr><td><form>
     <select name='chan' onChange="di(this.form.chan.options[this.form.chan.options.selectedIndex].value, '?cmd=vt&amp;c')">
-	<?% FOREACH ch = param.channels %?>
+	<?% FOREACH ch IN param.channels %?>
 	    <option value="<?% ch.1 %?>" <?% "selected" IF channel == ch.1 %?>><?% ch.0 %?></option>
 	<?% END %?>
     </select>
@@ -35,7 +35,7 @@
 <?% END %?>
 
 <br />
-<?% FOREACH zeile = data %?>
+<?% FOREACH zeile IN data %?>
 <?% id=zeile.0;page=zeile.1;subpage=zeile.2;channels=zeile.3;prev=zeile.4;next=zeile.5;mtime=zeile.6 %?>
 <div style="float:left; margin:5px;" id="<?% id %?>">
   <h2><?% gettext("Page") %?>&nbsp;<?% page; IF subpage > 0 %?>/<?% subpage; END %?></h2>
diff --git a/skins/html/widgets/checkbox.tmpl b/skins/html/widgets/checkbox.tmpl
index 631db79..a3b09d3 100644
--- a/skins/html/widgets/checkbox.tmpl
+++ b/skins/html/widgets/checkbox.tmpl
@@ -7,9 +7,9 @@
         <?% val = cgi.param(data.NAME) || data.def %?>
         <table style="border:0px solid #000000;"><tr>
         <?% c = 0 %?>
-        <?% FOREACH wert = data.choices %?>
+        <?% FOREACH wert IN data.choices %?>
             <?% "</tr><tr>" IF (c mod 3) == 0 %?>
-            <td><input type="checkbox" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val.grep("^${wert}").size %?> <?% FOREACH p = param.tags; "$p ";END %?>><?% wert %?></td>
+            <td><input type="checkbox" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val.grep("^${wert}").size %?> <?% FOREACH p IN param.tags; "$p ";END %?>><?% wert %?></td>
             <?% c = c + 1 %?>
         <?% END %?>
         </tr></table>
diff --git a/skins/html/widgets/date.tmpl b/skins/html/widgets/date.tmpl
index 565d3f2..67a3dde 100644
--- a/skins/html/widgets/date.tmpl
+++ b/skins/html/widgets/date.tmpl
@@ -22,9 +22,9 @@ function ch_input (checkbox, input) {
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>><br/>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>><br/>
         <?% valarr = val.split(''); z = 0 %?>
-        <?% FOREACH dd = gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
+        <?% FOREACH dd IN gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
         <input type="checkbox" name="Weekday" <?% "checked" IF ! val.search('^\d+') && valarr.$z != '-' %?> onchange='ch_input(this.form.Weekday, this.form.<?% data.NAME %?>)'><?% dd %?>
         <?% z = z + 1;
         END %?>
diff --git a/skins/html/widgets/dir.tmpl b/skins/html/widgets/dir.tmpl
index fa41e1b..881d8fd 100644
--- a/skins/html/widgets/dir.tmpl
+++ b/skins/html/widgets/dir.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>
             onBlur="check<?% data.NAME %?>Dir()"><br>
         <span id='id<?% param.count %?>'></span>
     </td>
diff --git a/skins/html/widgets/file.tmpl b/skins/html/widgets/file.tmpl
index 2c41fe4..cbc7c85 100644
--- a/skins/html/widgets/file.tmpl
+++ b/skins/html/widgets/file.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>
+            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>
                 onBlur="check<?% data.NAME %?>File()"><br>
             <span id='id<?% param.count %?>'></span>
     </td>
diff --git a/skins/html/widgets/footer.tmpl b/skins/html/widgets/footer.tmpl
index 35ccff1..d6e914b 100644
--- a/skins/html/widgets/footer.tmpl
+++ b/skins/html/widgets/footer.tmpl
@@ -8,7 +8,7 @@
 		<h2 class="tab">Last Logs</h2>
 
 		<table>
-        <?% FOREACH logline = llog(5) %?>
+        <?% FOREACH logline IN llog(5) %?>
         <tr><td>
             <div style='font-size:10px'><?% logline %?><br></div>
         </td></tr>
@@ -20,7 +20,7 @@
 	<div class="tab-page" id="tabPage2">
 		<h2 class="tab">Benchmark</h2>
             <table width=100%>
-                <?% FOREACH n = data.keys.sort %?>
+                <?% FOREACH n IN data.keys.sort %?>
                     <?% NEXT IF data.$n > 1000 %?>
                     <?% ges = data.$n + ges %?>
                 <tr>
diff --git a/skins/html/widgets/host.tmpl b/skins/html/widgets/host.tmpl
index cf90c8a..0a3d11a 100644
--- a/skins/html/widgets/host.tmpl
+++ b/skins/html/widgets/host.tmpl
@@ -9,7 +9,7 @@
             type="text"
             name="<?% data.NAME %?>"
             value="<?% val %?>"
-            <?% FOREACH p = param.tags; "$p ";END %?>
+            <?% FOREACH p IN param.tags; "$p ";END %?>
             onBlur="check<?% data.NAME %?>Host()"
         ><br/>
         <span id='id<?% param.count %?>'></span>
diff --git a/skins/html/widgets/integer.tmpl b/skins/html/widgets/integer.tmpl
index bbde2c3..315f86c 100644
--- a/skins/html/widgets/integer.tmpl
+++ b/skins/html/widgets/integer.tmpl
@@ -4,6 +4,6 @@
         <?% data.msg %?>
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
-        <input type="text" name="<?% data.NAME %?>" value="<?% cgi.param(data.NAME) || data.def %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+        <input type="text" name="<?% data.NAME %?>" value="<?% cgi.param(data.NAME) || data.def %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
     </td>
 </tr>
diff --git a/skins/html/widgets/list.tmpl b/skins/html/widgets/list.tmpl
index a4bdcf2..a535f08 100644
--- a/skins/html/widgets/list.tmpl
+++ b/skins/html/widgets/list.tmpl
@@ -11,19 +11,19 @@
             <?% values = val %?>
         <?% END %?>
         <?% IF data.options == 'multi' %?>
-            <select name="<?% data.NAME %?>" multiple size="10" <?% FOREACH p = param.tags; "$p ";END %?>>
+            <select name="<?% data.NAME %?>" multiple size="10" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% ELSE %?>
-            <select name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+            <select name="<?% data.NAME %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% END %?>
-            <?% FOREACH l = data.choices %?>
+            <?% FOREACH l IN data.choices %?>
                 <?% sel = '' %?>
                 <?% dis = '' %?>
-                <?% FOREACH valch = values %?>
+                <?% FOREACH valch IN values %?>
 					          <?% IF valch == l.1 %?>
                     <?% sel = ' selected="selected"';LAST %?>
                     <?% END %?>
                 <?% END %?>
-                <?% FOREACH valch = data.disabled %?>
+                <?% FOREACH valch IN data.disabled %?>
 					          <?% IF valch == l.1 %?>
                     <?% dis = ' disabled="disabled"';LAST %?>
                     <?% END %?>
diff --git a/skins/html/widgets/littlemenu.tmpl b/skins/html/widgets/littlemenu.tmpl
index 8ae191f..8cacdfe 100644
--- a/skins/html/widgets/littlemenu.tmpl
+++ b/skins/html/widgets/littlemenu.tmpl
@@ -4,7 +4,7 @@
 <h1><?% data.title %?></h1>
 <?% END %?>
 
-<?% FOREACH l = data.links %?>
+<?% FOREACH l IN data.links %?>
 <?% "<b>" IF data.highlight == l.key %?>
 <a href="<?% l.value.link %?>">[<?% l.value.text %?>]</a>&nbsp;
 <?% "</b>" IF data.highlight == l.key %?>
diff --git a/skins/html/widgets/menu.tmpl b/skins/html/widgets/menu.tmpl
index 41bfc5f..1aaef6f 100644
--- a/skins/html/widgets/menu.tmpl
+++ b/skins/html/widgets/menu.tmpl
@@ -5,7 +5,7 @@
 <?% END %?>
 
 <ul>
-<?% FOREACH field = data %?>
+<?% FOREACH field IN data %?>
     <?% group = field.0; short = field.1; name = field.2; descr = field.3 %?>
     <?% IF ! oldgroup.defined %?>
 <li><?% group %?><ul>
diff --git a/skins/html/widgets/password.tmpl b/skins/html/widgets/password.tmpl
index f6b043e..7a18927 100644
--- a/skins/html/widgets/password.tmpl
+++ b/skins/html/widgets/password.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p = param.tags; "$p ";END %?>><br/>
-        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p = param.tags; "$p ";END %?> title='<?% gettext("Repeat entry") %?>'>
+        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p IN param.tags; "$p ";END %?>><br/>
+        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p IN param.tags; "$p ";END %?> title='<?% gettext("Repeat entry") %?>'>
     </td>
 </tr>
diff --git a/skins/html/widgets/radio.tmpl b/skins/html/widgets/radio.tmpl
index acd42f5..afe953c 100644
--- a/skins/html/widgets/radio.tmpl
+++ b/skins/html/widgets/radio.tmpl
@@ -5,8 +5,8 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <?% FOREACH wert = data.choices %?>
-            <input type="radio" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val == wert %?><?% FOREACH p = param.tags; " $p";END %?>><?% wert %?><br>
+        <?% FOREACH wert IN data.choices %?>
+            <input type="radio" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val == wert %?><?% FOREACH p IN param.tags; " $p";END %?>><?% wert %?><br>
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/html/widgets/remote.tmpl b/skins/html/widgets/remote.tmpl
index 3204c74..33772af 100644
--- a/skins/html/widgets/remote.tmpl
+++ b/skins/html/widgets/remote.tmpl
@@ -127,7 +127,7 @@ aktiv = window.setInterval("grab()", inter);
 <tr>
   <td colspan="3" align="center">
       <select style="width:150px;" name="vdr">
-      <?% FOREACH l = param.vdrlist %?>
+      <?% FOREACH l IN param.vdrlist %?>
           <option value='<?% l.1 %?>'<?% IF l.1 == param.vdr %?> selected<?% END %?>><?% l.0 %?></option>
       <?% END %?>
       </select>
@@ -143,7 +143,7 @@ aktiv = window.setInterval("grab()", inter);
 <tr>
   <td colspan="3" align="center">
       <select style="width:150px;" name="channels" onchange="post('?cmd=switch&amp;data='+ this.form.channels.options[this.form.channels.options.selectedIndex].value)">
-      <?% FOREACH l = param.channels %?>
+      <?% FOREACH l IN param.channels %?>
       <?% IF l.2 && l.2 != optgroup %?>
         <?% IF optgroup %?>
         </optgroup>
diff --git a/skins/html/widgets/string.tmpl b/skins/html/widgets/string.tmpl
index 3faf4f4..b3dc89f 100644
--- a/skins/html/widgets/string.tmpl
+++ b/skins/html/widgets/string.tmpl
@@ -6,11 +6,11 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <?% IF data.readonly %?>
-        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <span<?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% val %?>
         </span>
         <?% ELSE %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/html/widgets/table.tmpl b/skins/html/widgets/table.tmpl
index 01d1303..75b7250 100644
--- a/skins/html/widgets/table.tmpl
+++ b/skins/html/widgets/table.tmpl
@@ -8,7 +8,7 @@
     <?% IF ! param.hide_HeadRow %?>
     <th width="1%">Name</th><th>Value</th>
     <?% END %?>
-    <?% FOREACH name = data.keys.sort %?>
+    <?% FOREACH name IN data.keys.sort %?>
     <?% NEXT IF name.match('^__') %?>
     <tr>
         <td width="50%"><?% name %?></td><td><?% data.$name %?></td>
@@ -17,7 +17,7 @@
 <?% ELSE %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') %?>
             <th>
                 <nobr><?% field %?>
@@ -29,10 +29,10 @@
             </th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <tr>
             <?% c = -1 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% NEXT IF fields.$c.match('^__') %?>
                 <td><?% field %?></td>
diff --git a/skins/html/widgets/textfield.tmpl b/skins/html/widgets/textfield.tmpl
index 5ab4e7e..c2bc961 100644
--- a/skins/html/widgets/textfield.tmpl
+++ b/skins/html/widgets/textfield.tmpl
@@ -6,11 +6,11 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <?% IF data.readonly %?>
-        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <span<?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% val %?>
         </span>
         <?% ELSE %?>
-            <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?>><?%  val | replace("<br />","
+            <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p IN param.tags; "$p ";END %?>><?%  val | replace("<br />","
 ") %?></textarea>
         <?% END %?>
     </td>
diff --git a/skins/html/widgets/time.tmpl b/skins/html/widgets/time.tmpl
index 5519c0c..1ed37f0 100644
--- a/skins/html/widgets/time.tmpl
+++ b/skins/html/widgets/time.tmpl
@@ -6,11 +6,11 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <?% IF data.readonly %?>
-        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <span<?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% val %?>
         </span>
         <?% ELSE %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/jason/index.tmpl b/skins/jason/index.tmpl
index f6308d8..5e6106e 100644
--- a/skins/jason/index.tmpl
+++ b/skins/jason/index.tmpl
@@ -68,7 +68,7 @@
   <?% END %?>
 <?% IF verbose != 0;scripts.1 = "ext-3.0.3/ext-all-debug.js";END %?>
 <?% END %?>
-<?% FOREACH script = scripts %?>
+<?% FOREACH script IN scripts %?>
 <script type="text/javascript" src="<?% script %?>"></script>
 <?% END %?>
 <?% IF lang.1 %?>
diff --git a/skins/jason/login.tmpl b/skins/jason/login.tmpl
index 118ba06..8405c15 100644
--- a/skins/jason/login.tmpl
+++ b/skins/jason/login.tmpl
@@ -31,7 +31,7 @@
 <?% END %?>
 <?% scripts = [ 'extjs/adapter/ext/ext-base.js', 'extjs/ext-all.js','login.js' ] %?>
 <?% IF verbose != 0;scripts.1 = "ext-3.0.0/ext-all-debug.js";END %?>
-<?% FOREACH script = scripts %?>
+<?% FOREACH script IN scripts %?>
 <script type="text/javascript" src="<?% script %?>"></script>
 <?% END %?>
 <?% IF lang.1 %?>
diff --git a/skins/stone/alist.tmpl b/skins/stone/alist.tmpl
index 363c05c..01959ee 100644
--- a/skins/stone/alist.tmpl
+++ b/skins/stone/alist.tmpl
@@ -105,8 +105,8 @@
 <h1><?% gettext("Wished automated recordings") %?></h1>
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
-    <?% FOREACH zeile = data %?>
-       <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+       <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
        <?% id=zeile.0;title=zeile.2;channels=zeile.3;directory=zeile.4;start=zeile.5;stop=zeile.6;minlength=zeile.7 %?>
        <?% IF zeile.1 == 'y' %?><?% aktiv = 1 %?><?% ELSE %?><?% aktiv = 0 %?><?% END %?>
        <?% PROCESS ItemAsArea %?>
@@ -158,7 +158,7 @@
             <li><a href="?cmd=<?% cmd %?><?% datas %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li>
         </ul>
 <?% END %?>
-    <?% FOREACH row = fields %?>
+    <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=chop(row,20) %?>
       <?% END %?>
diff --git a/skins/stone/clist.tmpl b/skins/stone/clist.tmpl
index 3a6842a..75f1caa 100644
--- a/skins/stone/clist.tmpl
+++ b/skins/stone/clist.tmpl
@@ -115,8 +115,8 @@
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
 <form name="clist" action="">
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?%- id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3;
              source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8;
              CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14;
@@ -225,7 +225,7 @@
             <li><a href="?cmd=<?% cmd %?><?% daten %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li>
         </ul>
 <?% END %?>
-    <?% FOREACH row = fields %?>
+    <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=chop(row,20) %?>
       <?% END %?>
diff --git a/skins/stone/display.tmpl b/skins/stone/display.tmpl
index e555af8..2ebffc6 100644
--- a/skins/stone/display.tmpl
+++ b/skins/stone/display.tmpl
@@ -13,8 +13,8 @@
 <div>
 <?% END %?>
 <?% IF verbose  %?>
-<!-- First: <?% FOREACH x = data.first %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
-<!-- Last: <?% FOREACH x = data.last %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
+<!-- First: <?% FOREACH x IN data.first %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
+<!-- Last: <?% FOREACH x IN data.last %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
 <?% END %?>
 <?%
   USE date;
@@ -66,7 +66,7 @@ END %?>
     <div id="slideright"><img src="images/forward.<?% global.imagetyp %?>" title="<?% gettext("Next") %?>" alt="" /></div>
         <?% END %?>
       <div id="slidelist" style="left:<?% IF files.size <= 3 %?><?% 280 - (170 * ( files.size / 2 ) )  %?><?% ELSE %?>0<?% END %?>px; width:<?% files.size * 180 %?>px;" >
-        <?% FOREACH frame = files %?>
+        <?% FOREACH frame IN files %?>
           <img class="epgimages" src="?cmd=ei&data=<?% frame %?>" alt="" title="" />
         <?% END %?>
       <div id="slideend"></div>
diff --git a/skins/stone/filesys.tmpl b/skins/stone/filesys.tmpl
index 051d0b7..72eca39 100644
--- a/skins/stone/filesys.tmpl
+++ b/skins/stone/filesys.tmpl
@@ -15,7 +15,7 @@ statusfiles = [];
 trash = param.usage.shift;
 IF param.graphic;
   FILTER null;
-        FOREACH device = param.usage;
+        FOREACH device IN param.usage;
             name = reentities(device.first).split('/').last;
             free = 100 - device.5;
             d = [
@@ -41,7 +41,7 @@ IF param.graphic;
   END;
 %?>
 
-<?% FOREACH file = statusfiles %?>
+<?% FOREACH file IN statusfiles %?>
 <div class="areabegin">
 <table class="areatable" summary="">
   <tr>
@@ -71,13 +71,13 @@ IF param.graphic;
   <tr>
     <td class="largetext">
       <table summary="" width="100%">
-            <?% FOREACH field = trash %?>
+            <?% FOREACH field IN trash %?>
                 <th><?% field %?></th>
             <?% END %?>
             </tr>
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
             <tr <?% ' class="two"' IF loop.count mod 2 == 0 %?>>
-                <?% FOREACH field = zeile %?>
+                <?% FOREACH field IN zeile %?>
                 <td><?% field %?></td>
                 <?% END %?>
             </tr>
diff --git a/skins/stone/help.tmpl b/skins/stone/help.tmpl
index b3f4209..01eb1c4 100644
--- a/skins/stone/help.tmpl
+++ b/skins/stone/help.tmpl
@@ -45,8 +45,8 @@
 <h1>XXV - Version <?% version %?></h1>
 <p><?% data.shift %?></p>
 <?% IF data.size > 1 %?>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% short=zeile.0;long=zeile.1;modul=zeile.2;desc=zeile.3 %?>
        <?% IF allow(long) %?>
 		<?% IF !old.defined || modul != old %?>
diff --git a/skins/stone/logger.tmpl b/skins/stone/logger.tmpl
index 7eb5906..81c8bcc 100644
--- a/skins/stone/logger.tmpl
+++ b/skins/stone/logger.tmpl
@@ -12,17 +12,17 @@
                 <table summary="" width="100%">
 <?% fields = data.shift %?>
     <tr>
-    <?% FOREACH field = fields %?>
+    <?% FOREACH field IN fields %?>
         <?% NEXT IF field.match('^__') %?>
         <th>
             <?% field %?>
         </th>
     <?% END %?>
     </tr>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
     <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
         <?% c = -1 %?>
-        <?% FOREACH field = zeile %?>
+        <?% FOREACH field IN zeile %?>
             <?% c = c + 1 %?>
             <?% NEXT IF fields.$c.match('^__') %?>
             <td>
diff --git a/skins/stone/memory.tmpl b/skins/stone/memory.tmpl
index 129f7ff..80bc8a8 100644
--- a/skins/stone/memory.tmpl
+++ b/skins/stone/memory.tmpl
@@ -18,7 +18,7 @@
         cacheddata = [];
         inactivedata = [];
         timestamps = [];
-        FOREACH row = data;
+        FOREACH row IN data;
             t = date.format(row.6, '%H:%M');
             timestamps.push(t);
             activedata.push(row.2 / (1024));
@@ -106,7 +106,7 @@
 <?% END %?>
 
 
-<?% FOREACH file = statusfiles %?>
+<?% FOREACH file IN statusfiles %?>
 <div class="areabegin">
 <table class="areatable" summary="">
   <tr>
diff --git a/skins/stone/mldisplay.tmpl b/skins/stone/mldisplay.tmpl
index c74c562..08922c9 100644
--- a/skins/stone/mldisplay.tmpl
+++ b/skins/stone/mldisplay.tmpl
@@ -77,7 +77,7 @@ seen = f.25;
                 <tr><td><?% gettext("Genres") %?>:</td><td colspan="3">
                     <?% selection = param.genres_sel %?>
                     <?% genres = param.genres_all %?>
-                    <?% FOREACH x = selection %?>
+                    <?% FOREACH x IN selection %?>
                     <?% genres.$x.name %?>&nbsp;
                     <?% END %?>
                 </td></tr>
@@ -123,8 +123,8 @@ seen = f.25;
 
 <?% IF param.actors.0.0 %?>
 <h2><?% gettext("Actors") %?></h2>
-<?% FOREACH zeile = param.actors %?>
-  <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+<?% FOREACH zeile IN param.actors %?>
+  <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <?% actor = zeile.0;imgurl=zeile.1 %?>
     <div class="areabegin">
       <table class="fieldtable" summary="">
diff --git a/skins/stone/mledit.tmpl b/skins/stone/mledit.tmpl
index 2c24f94..8d744bd 100644
--- a/skins/stone/mledit.tmpl
+++ b/skins/stone/mledit.tmpl
@@ -63,7 +63,7 @@
             <select name="__mediatype">
                 <option label="" value="0" <?% IF (data.mediatype || param.mediatype) && (data.mediatype == 0 || param.mediatype == 0) %?>selected="selected"<?% END %?>></option>
                 <?% mediatypes = param.mediatypes %?>
-                <?% FOREACH type = mediatypes %?>
+                <?% FOREACH type IN mediatypes %?>
                 <option label="<?% type.1 %?>" value="<?% type.0 %?>" <?% IF data.mediatype == type.0 || param.mediatype == type.0 %?>selected="selected"<?% END %?>><?% type.1 %?></option>
                 <?% END %?>
             </select>
diff --git a/skins/stone/mlist.tmpl b/skins/stone/mlist.tmpl
index 3e5d945..61f85a3 100644
--- a/skins/stone/mlist.tmpl
+++ b/skins/stone/mlist.tmpl
@@ -148,8 +148,8 @@
 <?% IF data.size > 1%?>
 <?% fields = data.shift %?>
 <form name="mlist" action="">
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;artist=zeile.1;album=zeile.2;title=zeile.3;track=zeile.4;year=zeile.5;playtime=zeile.6;genre=zeile.7;comment=zeile.8 %?>
 		<?% IF !old.defined || album != old %?>
         <?% IF old.defined %?>
@@ -176,7 +176,7 @@
     <form name="genreform" action="">
     <?% gettext("Genres",20) %?>:<br />
     <select name='genres' onchange="di('?cmd=ml&amp;data=','genre:' + this.form.genres.options[this.form.genres.options.selectedIndex].value)">
-    <?% FOREACH ch = param.genres %?>
+    <?% FOREACH ch IN param.genres %?>
         <option value="<?% url( ch.1 ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.1 %?>><?% ch.0 %?></option>
     <?% END %?>
     </select>
diff --git a/skins/stone/mllist.tmpl b/skins/stone/mllist.tmpl
index f852421..9d9643a 100644
--- a/skins/stone/mllist.tmpl
+++ b/skins/stone/mllist.tmpl
@@ -90,8 +90,8 @@
 <?% ######################################################################## %?>
 <h1><?% gettext("Media library") %?></h1>
 <form name="mlist" action="">
-     <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+     <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;imgurl=zeile.1;title=zeile.2;subtitle=zeile.3;year=zeile.4;director=zeile.5;description=zeile.6; %?>
         <?% PROCESS ItemAsArea %?>
     <?% END %?>
@@ -119,7 +119,7 @@
     <td class="sidetext">
       <form name="mediarange" action="">
       <select name='range' onchange="di('?cmd=mllist&amp;__range=',this.form.range.options[this.form.range.options.selectedIndex].value)">
-      <?% FOREACH r = param.ranges %?>
+      <?% FOREACH r IN param.ranges %?>
           <option value="<?% url( r.0 ) %?>"<?% ' selected="selected"' IF param.range == r.0 %?>><?% r.1 %?></option>
       <?% END %?>
       </select>
diff --git a/skins/stone/mlresearch.tmpl b/skins/stone/mlresearch.tmpl
index eda70ea..9fb0e29 100644
--- a/skins/stone/mlresearch.tmpl
+++ b/skins/stone/mlresearch.tmpl
@@ -13,8 +13,8 @@
 </h1>
 
 
-<?% FOREACH zeile = data %?>
-  <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+<?% FOREACH zeile IN data %?>
+  <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <?% importurl = zeile.0;imgurl=zeile.1;title=zeile.2;description=zeile.3 %?>
     <div class="areabegin">
       <table class="fieldtable" summary="">
diff --git a/skins/stone/mlsave.tmpl b/skins/stone/mlsave.tmpl
index aef1960..fe4b9f0 100644
--- a/skins/stone/mlsave.tmpl
+++ b/skins/stone/mlsave.tmpl
@@ -12,7 +12,7 @@
             <?% data %?>
         <?% ELSE %?>
             <table summary="" width="100%">
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
                 <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
                     <td><?% zeile %?></td>
                 </tr>
diff --git a/skins/stone/movetimerlist.tmpl b/skins/stone/movetimerlist.tmpl
index a901422..2757ff5 100644
--- a/skins/stone/movetimerlist.tmpl
+++ b/skins/stone/movetimerlist.tmpl
@@ -70,8 +70,8 @@
                 <th><?% gettext('Change original timer') %?></th>
                 <th width="64" align="right"></th>
             </tr>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?>
         <?% PROCESS Item %?>
     <?% END %?>
diff --git a/skins/stone/network.tmpl b/skins/stone/network.tmpl
index 263e0be..4eaa435 100644
--- a/skins/stone/network.tmpl
+++ b/skins/stone/network.tmpl
@@ -13,7 +13,7 @@
         fields = data.shift;
 
         timestamps = [];
-        FOREACH row = data;
+        FOREACH row IN data;
             iname = row.0.split(':').first;
 
             rxbytes.${iname} = [];
@@ -24,7 +24,7 @@
             oldentry.${iname} = [];
         END;
 
-        FOREACH row = data;
+        FOREACH row IN data;
             IF ot != row.5;
              t = date.format(row.5, '%H:%M');
              timestamps.push(t);
@@ -46,7 +46,7 @@
                 oldentry.${iname} = row;
         END;
 
-        FOREACH iname = rxbytes.keys.sort;
+        FOREACH iname IN rxbytes.keys.sort;
 
             # Data ...
             d = [
@@ -92,7 +92,7 @@
 <h1><?% param.headingText %?></h1>
 <?% END %?>
 
-<?% FOREACH file = statusfiles %?>
+<?% FOREACH file IN statusfiles %?>
 <div class="areabegin">
 <table class="areatable" summary="">
   <tr>
diff --git a/skins/stone/now.tmpl b/skins/stone/now.tmpl
index d8ab32f..46ebfce 100644
--- a/skins/stone/now.tmpl
+++ b/skins/stone/now.tmpl
@@ -132,8 +132,8 @@
 </h1>
 <?% IF data.size > 1%?>
 <?% fields = data.shift %?>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;
             description=zeile.8;duration=zeile.9;
@@ -156,7 +156,7 @@
       <td class="sidetext">
         <form action="">
         <select name="cgroups" onchange="di('?cmd=<?% cgi.param('cmd') %?>&amp;data=<?% cgi.param('data') %?>&amp;__cgrp=',this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value)">
-            <?% FOREACH cgrp = param.cgroups %?>
+            <?% FOREACH cgrp IN param.cgroups %?>
               <option value="<?% cgrp.last %?>"<?% ' selected="selected"' IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?></option>
             <?% END %?>
         </select>
@@ -179,7 +179,7 @@
             <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=now&amp;__cgrp=<?% cgi.param('__cgrp') %?>&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
            <?% today = [] %?>
             <?% tomor = [] %?>
-        <?% FOREACH zeit = zeiten; %?>
+        <?% FOREACH zeit IN zeiten; %?>
             <?% tom = 0 %?>
             <?% PERL %?>
                 use Date::Manip;
@@ -200,12 +200,12 @@
         <?% END %?>
         <?% IF today.size > 0 %?>
             <optgroup label="<?% date.format(today.0, "%A", locale) %?>">
-        <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
         <?% IF tomor.size > 0 %?>
             <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>">
-        <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
             </select>
diff --git a/skins/stone/program.tmpl b/skins/stone/program.tmpl
index 6fb942f..79e7684 100644
--- a/skins/stone/program.tmpl
+++ b/skins/stone/program.tmpl
@@ -94,7 +94,7 @@
 <?% END %?>
 <?% ######################################################################################
     channelpos=0;priorchannel=0;nextchannel=0;priortitle="";nexttitle="";
-    FOREACH ch = param.channels;
+    FOREACH ch IN param.channels;
         IF cgi.param('data') == ch.1 || cgi.param('data') == ch.0 || param.current == ch.1;
             channel = ch.0;
             channelpos = ch.1;
@@ -116,8 +116,8 @@
 <?% ELSE %?>
 <?% fields = data.shift %?>
 <h1><?% gettext("Program guide for") %?>&nbsp;<?% channel %?> - <?% data.first.5 %?></h1>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;
             description=zeile.6;pdc=zeile.7;timerid=zeile.8;recording=zeile.9;running=zeile.10;
             day = zeile.5 %?>
@@ -167,7 +167,7 @@
     <td class="sidetext">
     <form action="">
         <select size="15" name="data" onchange="di('?cmd=program&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
-        <?% FOREACH ch = param.channels %?>
+        <?% FOREACH ch IN param.channels %?>
           <?% IF ch.2 && ch.2 != optgroup %?>
             <?% IF optgroup %?>
             </optgroup>
diff --git a/skins/stone/rdisplay.tmpl b/skins/stone/rdisplay.tmpl
index 04138e9..fe5dac6 100644
--- a/skins/stone/rdisplay.tmpl
+++ b/skins/stone/rdisplay.tmpl
@@ -45,7 +45,7 @@
 		<div id="slideright"><img src="images/forward.<?% global.imagetyp %?>" title="<?% gettext("Next") %?>" alt="" /></div>
         <?% END %?>
 		<div id="slidelist" style="left:<?% IF files.size <= 3 %?><?% 280 - (160 * ( files.size / 2 ) )  %?><?% ELSE %?>0<?% END %?>px; width:<?% files.size * 200 %?>px;" >
-        <?% FOREACH frame = files %?>
+        <?% FOREACH frame IN files %?>
           <?% d = ( frame ) / 25 %?>
           <?% IF allowplay %?><a href="javascript:setstart('<?% PROCESS hfs %?>')" ><?% END %?>
           <img class="recorddetails" src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" title="<?% PROCESS hfs %?>" />
@@ -171,7 +171,7 @@
 	        ml = data.Marks.split(',');
           totaltime = ticks * window * 3;
           IF ml.size > 1;
-		FOREACH marker = ml;
+		FOREACH marker IN ml;
                 b = c;
                 c = c + 1;
                 m = marker.split(':');
@@ -236,7 +236,7 @@
 									<form action="">
 										<select name='data' onchange="di('?cmd=rconvert&amp;data=<?% id %?>&amp;__action=save&amp;__cmd=',this.form.data.options[this.form.data.options.selectedIndex].value)"> 
 											<option value='0'><?% gettext("Choose a command to edit this recording ...") %?></option>
-											<?% FOREACH cmd = param.reccmds %?>
+											<?% FOREACH cmd IN param.reccmds %?>
                       <option value='<?% loop.count %?>'><?% cmd %?></option>
 											<?% END %?>
 										</select>
@@ -257,7 +257,7 @@
 							<tr>
 								<td colspan="2">
                         <?% gettext('Keywords') %?>&nbsp;:&nbsp;
-		                    <?% FOREACH keyword = data.keywords %?>
+		                    <?% FOREACH keyword IN data.keywords %?>
                             <?% IF allowkeywords %?>
                                     <a target="_top" href="?cmd=rk&amp;data=<?% keyword.0 %?>">
                             <?% END %?>
diff --git a/skins/stone/report.tmpl b/skins/stone/report.tmpl
index 362a4f4..0023863 100644
--- a/skins/stone/report.tmpl
+++ b/skins/stone/report.tmpl
@@ -3,7 +3,7 @@
 <div id="body">
 <h1><?% gettext("Protocol of the activities") %?></h1>
 
-<?% FOREACH name = data.keys.sort %?>
+<?% FOREACH name IN data.keys.sort %?>
     <h2><?% gettext("Report for module") %?>&nbsp;
         <?% name %?></h2>
     <?% IF name == 'RECORDS';
@@ -17,7 +17,7 @@
         END;
      %?>
 
-    <?% FOREACH typ = data.$name.keys.sort %?>
+    <?% FOREACH typ IN data.$name.keys.sort %?>
         <?% IF typ == 'message' %?>
             <p><?% data.$name.$typ %?>
             </p>
@@ -29,7 +29,7 @@
                 <td class="largetext" align="left">
                 <table summary="" width="100%">
                     <!-- <tr>
-                    <?% FOREACH field = fields %?>
+                    <?% FOREACH field IN fields %?>
                         <?% NEXT IF field.match('^__') %?>
                         <th>
                             <nobr><?% field %?>
@@ -37,10 +37,10 @@
                         </th>
                     <?% END %?>
                     </tr> --> 
-                    <?% FOREACH zeile = data.$name.$typ %?>
+                    <?% FOREACH zeile IN data.$name.$typ %?>
                     <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
                         <?% c = -1 %?>
-                        <?% FOREACH field = zeile %?>
+                        <?% FOREACH field IN zeile %?>
                             <?% c = c + 1 %?>
                             <?% NEXT IF fields.$c.match('^__') %?>
                             <td><?% IF link %?><a href="javascript:popupwindow('<?% link %?><?% zeile.first %?>',620,670,0)"><?% END %?>
diff --git a/skins/stone/rlist.tmpl b/skins/stone/rlist.tmpl
index ed28689..01989c8 100644
--- a/skins/stone/rlist.tmpl
+++ b/skins/stone/rlist.tmpl
@@ -197,8 +197,8 @@
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
 <form name="rlist" action="">
-    <?%- FOREACH zeile = data;
-          IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END;
+    <?%- FOREACH zeile IN data;
+          IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END;
           id=zeile.0;
           eventid=zeile.1;
           title=zeile.2.split('&#x7e;').last;
@@ -296,7 +296,7 @@
             <li><a href="?cmd=<?% cmd %?><?% daten %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li>
         </ul>
 <?% END %?>
-      <?% FOREACH row = fields %?>
+      <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=chop(row,20) %?>
       <?% END %?>
@@ -369,7 +369,7 @@
         <?% IF param.keywords.size <  steps %?>
           <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
-        <?% FOREACH keyword = param.keywords %?>
+        <?% FOREACH keyword IN param.keywords %?>
               <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
                 <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
diff --git a/skins/stone/schema.tmpl b/skins/stone/schema.tmpl
index 59d7b84..94ff257 100644
--- a/skins/stone/schema.tmpl
+++ b/skins/stone/schema.tmpl
@@ -18,7 +18,7 @@
 <?% Duration = param.zeitbis - param.zeitvon %?>
 <table class="largetable" summary="">
     <tr><td class="largehead">
-            <?% FOREACH cgrp = param.cgroups %?>
+            <?% FOREACH cgrp IN param.cgroups %?>
               <?% IF param.channelgroup == cgrp.last;cgrp.first;LAST;END %?>
             <?% END %?>
         </td></tr>
@@ -89,7 +89,7 @@
                         <?%- ############################################## -%?>   
                     </td>
                 </tr>
-                <?% FOREACH cpos = data.keys.nsort %?>
+                <?% FOREACH cpos IN data.keys.nsort %?>
                 <tr<?% IF (loop.count mod 2) == 0 %?> class="two"<?% END %?>>
                     <td>
                     <?% channel = data.$cpos.first.4 %?>
@@ -116,7 +116,7 @@
                     </td>
                     <td colspan="<?% colspan %?>" style="white-space: nowrap;">
                         <?%- ges = 0; oldend = param.zeitvon -%?>
-                        <?%- FOREACH event = data.$cpos;
+                        <?%- FOREACH event IN data.$cpos;
                                 id = event.0;
                                 title = event.1;
                                 subtitle = event.2;
@@ -205,7 +205,7 @@
       <td class="sidetext">
         <form action="">
         <select name="cgroups" onchange="di('?cmd=<?% cgi.param('cmd') %?>&amp;data=<?% param.zeitvon %?>&amp;__cgrp=',this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value)">
-            <?% FOREACH cgrp = param.cgroups %?>
+            <?% FOREACH cgrp IN param.cgroups %?>
               <option value="<?% cgrp.last %?>"<?% ' selected="selected"' IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?></option>
             <?% END %?>
         </select>
@@ -228,7 +228,7 @@
             <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=sch&amp;__cgrp=<?% cgi.param('__cgrp') %?>&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
             <?% today = [] %?>
             <?% tomor = [] %?>
-        <?% FOREACH zeit = zeiten %?>
+        <?% FOREACH zeit IN zeiten %?>
             <?% tom = 0 %?>
             <?% PERL %?>
                 use Date::Manip;
@@ -249,12 +249,12 @@
         <?% END %?>
         <?% IF today.size > 0 %?>
             <optgroup label="<?% date.format(today.0, "%A", locale) %?>">
-        <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
         <?% IF tomor.size > 0 %?>
             <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>">
-        <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
             </select>
diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl
index 39f235e..f32e1cc 100644
--- a/skins/stone/search.tmpl
+++ b/skins/stone/search.tmpl
@@ -104,8 +104,8 @@
 <?% fields = data.shift %?>
 <h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?> - <?% data.first.7 %?></h1>
 <form name="searchlist" action="">
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8;
             pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12 %?>
@@ -145,7 +145,7 @@
             <?% gettext('Channel',30) %?><br />
             <select name='__channel'>
                 <option value="0"><?% gettext('All channels') %?></option>
-                <?% FOREACH ch = param.channels %?>
+                <?% FOREACH ch IN param.channels %?>
                   <?% IF ch.2 && ch.2 != channelgroup %?>
                     <?% IF channelgroup %?>
                     </optgroup>
diff --git a/skins/stone/tlist.tmpl b/skins/stone/tlist.tmpl
index 6e954f8..6846759 100644
--- a/skins/stone/tlist.tmpl
+++ b/skins/stone/tlist.tmpl
@@ -159,8 +159,8 @@
 <?% fields = data.shift %?>
 <h1><?% gettext("Planned recordings") %?> - <?% data.first.4 %?></h1>
 <form name="tlist" action="">
-		<?% FOREACH zeile = data %?>
-			<?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+		<?% FOREACH zeile IN data %?>
+			<?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
 			<?%- id=zeile.0;
           aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
           sender=zeile.2;
@@ -286,7 +286,7 @@
         <?% IF param.keywords.size <  steps %?>
           <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
-        <?% FOREACH keyword = param.keywords %?>
+        <?% FOREACH keyword IN param.keywords %?>
               <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=tk&amp;data=<?% keyword.0 %?>">
                 <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
diff --git a/skins/stone/topten.tmpl b/skins/stone/topten.tmpl
index 9eb8b9a..25d5dcd 100644
--- a/skins/stone/topten.tmpl
+++ b/skins/stone/topten.tmpl
@@ -95,8 +95,8 @@
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
 <h1><?% gettext("Top Ten entrys") %?></h1>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;day = zeile.7;description=zeile.8;
             pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
diff --git a/skins/stone/ulist.tmpl b/skins/stone/ulist.tmpl
index 2653879..673740c 100644
--- a/skins/stone/ulist.tmpl
+++ b/skins/stone/ulist.tmpl
@@ -57,8 +57,8 @@
 <h1><?% gettext("User administration") %?></h1>
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;user=zeile.1;right=zeile.2 %?>
         <?% IF zeile.size <= 1 %?>
           <div class="areaclose"></div>
diff --git a/skins/stone/vdrlist.tmpl b/skins/stone/vdrlist.tmpl
index 4627347..712cd3e 100644
--- a/skins/stone/vdrlist.tmpl
+++ b/skins/stone/vdrlist.tmpl
@@ -85,8 +85,8 @@
 <h1><?% gettext("Administration of video disk recorder") %?></h1>
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;active=zeile.1;primary=zeile.2;host=zeile.3;cards=zeile.4 %?>
         <?% IF zeile.size <= 1 %?>
           <div class="areaclose"></div>
diff --git a/skins/stone/vitals.tmpl b/skins/stone/vitals.tmpl
index 1a8d8cd..7b795ee 100644
--- a/skins/stone/vitals.tmpl
+++ b/skins/stone/vitals.tmpl
@@ -16,7 +16,7 @@
         utildata = [];
         userdata = [];
         timestamps = [];
-        FOREACH item = param.stack;
+        FOREACH item IN param.stack;
             t = date.format(item.timestamp, '%H:%M');
             timestamps.push(t);
             l = item.load.first * 10;
@@ -86,7 +86,7 @@
   <tr>
     <td class="areatext">
             <table summary="" width="100%">
-                <?% FOREACH name = data.keys.sort %?>
+                <?% FOREACH name IN data.keys.sort %?>
                 <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
                     <td><?% name %?></td>
                     <td><?% data.$name.replace('\n', '<br />') %?></td>
@@ -100,7 +100,7 @@
 </div>
 
 
-<?% FOREACH file = statusfiles %?>
+<?% FOREACH file IN statusfiles %?>
 <div class="areabegin">
 <table class="areatable" summary="">
     <tr><td class="areahead"><?% file.0 %?></td></tr>
diff --git a/skins/stone/vtxpage.tmpl b/skins/stone/vtxpage.tmpl
index 0ca3d9f..faf48e3 100644
--- a/skins/stone/vtxpage.tmpl
+++ b/skins/stone/vtxpage.tmpl
@@ -13,7 +13,7 @@
         <td class="sidetext">
             <form action="">
                 <select size="5" name='chan' onchange="di('?cmd=vt&amp;channel=',this.form.chan.options[this.form.chan.options.selectedIndex].value)">
-                	<?% FOREACH ch = param.channels %?>
+                	<?% FOREACH ch IN param.channels %?>
                 	    <option value="<?% ch.1 %?>" <?% 'selected="selected"' IF channel == ch.1 %?>><?% ch.0 %?></option>
                 	<?% END %?>
                 </select>
@@ -83,7 +83,7 @@
 <div id="body">
 <h1><?% gettext("Teletext") %?></h1>
 <?% END %?>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
        <?% id=zeile.0;page=zeile.1;subpage=zeile.2;channels=zeile.3;prev=zeile.4;next=zeile.5;mtime=zeile.6 %?>
 <div class="areabegin" id="<?% id %?>">
   <table class="areatable" summary="">
diff --git a/skins/stone/widgets/checkbox.tmpl b/skins/stone/widgets/checkbox.tmpl
index abca1c0..269e5cc 100644
--- a/skins/stone/widgets/checkbox.tmpl
+++ b/skins/stone/widgets/checkbox.tmpl
@@ -4,7 +4,7 @@
     <?% INCLUDE widgets/topic.inc abbr=data.msg %?>
     <td>
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <?% FOREACH wert = data.choices %?>
+        <?% FOREACH wert IN data.choices %?>
         <span style="white-space: nowrap">
             <input type="checkbox" name="<?% data.NAME %?>" value="<?% wert %?>" <?% 'checked="checked"' IF val.grep("^${wert}").size %?> /><?% wert %?>
         </span> 
diff --git a/skins/stone/widgets/date.tmpl b/skins/stone/widgets/date.tmpl
index be0f4e8..596ec62 100644
--- a/skins/stone/widgets/date.tmpl
+++ b/skins/stone/widgets/date.tmpl
@@ -22,9 +22,9 @@ function ch_input (checkbox, input) {
     <?% INCLUDE widgets/topic.inc abbr=data.msg %?>
     <td>
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input style="width:80px;" size="20"  type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?> />
+        <input style="width:80px;" size="20"  type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?> />
         <?% valarr = val.split(''); z = 0 %?>
-        <?% FOREACH dd = gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
+        <?% FOREACH dd IN gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
         <input type="checkbox" name="Weekday" <?% "checked" IF ! val.search('^\d+') && valarr.$z != '-' %?> onchange='ch_input(this.form.Weekday, this.form.<?% data.NAME %?>)' /><?% dd %?>        
         <?% z = z + 1;
         END %?>
diff --git a/skins/stone/widgets/footer.tmpl b/skins/stone/widgets/footer.tmpl
index 619b229..85322e5 100644
--- a/skins/stone/widgets/footer.tmpl
+++ b/skins/stone/widgets/footer.tmpl
@@ -10,7 +10,7 @@
     <tr>  
         <td class="editortext" align="left">
             <table summary="" width="100%">
-                <?% FOREACH n = benchdata.keys.sort %?>
+                <?% FOREACH n IN benchdata.keys.sort %?>
                     <?% NEXT IF benchdata.$n > 1000 %?>
                     <?% ges = benchdata.$n + ges %?>
                 <tr>
diff --git a/skins/stone/widgets/list.tmpl b/skins/stone/widgets/list.tmpl
index f0071b4..ae1eaf8 100644
--- a/skins/stone/widgets/list.tmpl
+++ b/skins/stone/widgets/list.tmpl
@@ -14,15 +14,15 @@
         <?% ELSE %?>
             <select style="width:400px;" name="<?% data.NAME %?>">
         <?% END %?>
-            <?% FOREACH l = data.choices %?>
+            <?% FOREACH l IN data.choices %?>
                 <?% sel = '' %?>
                 <?% dis = '' %?>
-                <?% FOREACH valch = values %?>
+                <?% FOREACH valch IN values %?>
 					          <?% IF valch == l.1 %?>
                     <?% sel = ' selected="selected"';LAST %?>
                     <?% END %?>
                 <?% END %?>
-                <?% FOREACH valch = data.disabled %?>
+                <?% FOREACH valch IN data.disabled %?>
 					          <?% IF valch == l.1 %?>
                     <?% dis = ' disabled="disabled"';LAST %?>
                     <?% END %?>
diff --git a/skins/stone/widgets/littlemenu.tmpl b/skins/stone/widgets/littlemenu.tmpl
index dc72054..8fca93b 100644
--- a/skins/stone/widgets/littlemenu.tmpl
+++ b/skins/stone/widgets/littlemenu.tmpl
@@ -50,7 +50,7 @@
     </tr>
     <tr>
     <td class="sidetext">
-<?% FOREACH l = data.links %?>
+<?% FOREACH l IN data.links %?>
 <?% "<strong>" IF data.highlight == l.key %?>
          <a href="<?% l.value.link %?>"><?% chop(l.value.text,22) %?></a>
 <?% "</strong>" IF data.highlight == l.key %?><br />
diff --git a/skins/stone/widgets/menu.tmpl b/skins/stone/widgets/menu.tmpl
index f0fd859..e675b5a 100644
--- a/skins/stone/widgets/menu.tmpl
+++ b/skins/stone/widgets/menu.tmpl
@@ -5,7 +5,7 @@
 <?% END %?>
 
 <ul>
-<?% FOREACH field = data %?>
+<?% FOREACH field IN data %?>
     <?% group = field.0; short = field.1; name = field.2; descr = field.3 %?>
     <?% IF ! oldgroup.defined %?>
 <li><?% group %?><ul>
diff --git a/skins/stone/widgets/message.tmpl b/skins/stone/widgets/message.tmpl
index 78afb04..921ed64 100644
--- a/skins/stone/widgets/message.tmpl
+++ b/skins/stone/widgets/message.tmpl
@@ -14,7 +14,7 @@
             <?% data %?>
         <?% ELSE %?>
             <table summary="" width="100%">
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
                 <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
                     <td><?% zeile %?></td>
                 </tr>
diff --git a/skins/stone/widgets/radio.tmpl b/skins/stone/widgets/radio.tmpl
index 945f09a..a36af96 100644
--- a/skins/stone/widgets/radio.tmpl
+++ b/skins/stone/widgets/radio.tmpl
@@ -4,7 +4,7 @@
         <?% INCLUDE widgets/topic.inc abbr=data.msg %?>
     <td>
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <?% FOREACH wert = data.choices %?>
+        <?% FOREACH wert IN data.choices %?>
         <span style="white-space: nowrap">
             <input type="radio" name="<?% data.NAME %?>" value="<?% wert %?>" <?% 'checked="checked"' IF val.grep("^${wert}").size %?> /><?% wert %?>
         </span> 
diff --git a/skins/stone/widgets/remote.tmpl b/skins/stone/widgets/remote.tmpl
index 236e7d5..892071d 100644
--- a/skins/stone/widgets/remote.tmpl
+++ b/skins/stone/widgets/remote.tmpl
@@ -295,7 +295,7 @@ aktiv = window.setInterval("grab()", inter);
                     <tr>
                         <td colspan="7" align="center">
                             <select style="width:175px;" name="vdr">
-                            <?% FOREACH l = param.vdrlist %?>
+                            <?% FOREACH l IN param.vdrlist %?>
                                 <option value='<?% l.1 %?>'<?% IF l.1 == param.vdr %?> selected<?% END %?>><?% l.0 %?></option>
                             <?% END %?>
                             </select>
@@ -311,7 +311,7 @@ aktiv = window.setInterval("grab()", inter);
                     <tr>
                         <td colspan="7" align="center">
                             <select style="width:175px;" name="channels" onchange="post('switch', this.form.channels.options[this.form.channels.options.selectedIndex].value + '&amp;__vdr=' + ( this.form.vdr.options ? this.form.vdr.options[this.form.vdr.options.selectedIndex].value : this.form.vdr.value ))">
-                            <?% FOREACH l = param.channels %?>
+                            <?% FOREACH l IN param.channels %?>
                             <?% IF l.2 && l.2 != optgroup %?>
                               <?% IF optgroup %?>
                               </optgroup>
diff --git a/skins/stone/widgets/table.tmpl b/skins/stone/widgets/table.tmpl
index 95570aa..43c7798 100644
--- a/skins/stone/widgets/table.tmpl
+++ b/skins/stone/widgets/table.tmpl
@@ -7,7 +7,7 @@
 <table  summary="" width="100%">
 <?% IF type == 'HASH' %?>
     <th>Name</th><th>Value</th>
-     <?% FOREACH name = data.keys.sort %?>
+     <?% FOREACH name IN data.keys.sort %?>
      <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
         <td><?% name %?></td><td><?% data.$name %?></td>
     </tr>
@@ -16,7 +16,7 @@
     <?% fields = data.shift %?>
         <?% IF fields.size > 1 %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <th style="white-space: nowrap">
                 <?% field %?>
                 <?% IF param.sortable %?>
@@ -27,9 +27,9 @@
         <?% END %?>
         </tr>
         <?% END %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
             <td><?% field %?></td>
             <?% END %?>
         </tr>
diff --git a/skins/stone_flat/alist.tmpl b/skins/stone_flat/alist.tmpl
index df87733..57fa867 100644
--- a/skins/stone_flat/alist.tmpl
+++ b/skins/stone_flat/alist.tmpl
@@ -94,8 +94,8 @@
                         <td class="largetext" align="left">
                         <table width="100%">
                         <tr height="0"><th width="20"></th><th></th><th width="200"></th><th width="100"></th><th width="80"></th><th width="100" align="right"></th></tr>
-                            <?% FOREACH zeile = data %?>
-                                <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+                            <?% FOREACH zeile IN data %?>
+                                <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
                                 <?% id=zeile.0;title=zeile.2;channels=zeile.3;directory=zeile.4;start=zeile.5;stop=zeile.6;minlength=zeile.7 %?>
                                 <?% IF zeile.1 == 'y' %?><?% aktiv = 1 %?><?% ELSE %?><?% aktiv = 0 %?><?% END %?>
                                 <?% PROCESS ItemAsFlat %?>
@@ -152,7 +152,7 @@
             <li><a href="?cmd=<?% cmd %?><?% datas %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li>
         </ul>
 <?% END %?>
-    <?% FOREACH row = fields %?>
+    <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=chop(row,20) %?>
       <?% END %?>
diff --git a/skins/stone_flat/clist.tmpl b/skins/stone_flat/clist.tmpl
index bde6c5e..10e295a 100644
--- a/skins/stone_flat/clist.tmpl
+++ b/skins/stone_flat/clist.tmpl
@@ -86,8 +86,8 @@
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
 <form name="clist" action="">
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?%- id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3;
              source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8;
              CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14;
@@ -201,7 +201,7 @@
             <li><a href="?cmd=<?% cmd %?><?% daten %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li>
         </ul>
 <?% END %?>
-    <?% FOREACH row = fields %?>
+    <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=chop(row,20) %?>
       <?% END %?>
diff --git a/skins/stone_flat/filesys.tmpl b/skins/stone_flat/filesys.tmpl
index a5bd3a3..c4870a2 100644
--- a/skins/stone_flat/filesys.tmpl
+++ b/skins/stone_flat/filesys.tmpl
@@ -16,7 +16,7 @@ trash = param.usage.shift;
 
 IF param.graphic;
     FILTER null;
-        FOREACH device = param.usage;
+        FOREACH device IN param.usage;
             name = reentities(device.first).split('/').last;
             free = 100 - device.5;
             d = [
@@ -43,7 +43,7 @@ IF param.graphic;
     END;
 %?>
 
-<?% FOREACH file = statusfiles %?>
+<?% FOREACH file IN statusfiles %?>
 <table class="editortable" summary="">
     <tr><td class="editorhead"><?% file.0 %?></td></tr>
     <tr>
@@ -63,13 +63,13 @@ IF param.graphic;
   <tr>
     <td class="editortext">
       <table summary="" width="100%">
-            <?% FOREACH field = trash %?>
+            <?% FOREACH field IN trash %?>
                 <th><?% field %?></th>
             <?% END %?>
             </tr>
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
             <tr <?% ' class="two"' IF loop.count mod 2 == 0 %?>>
-                <?% FOREACH field = zeile %?>
+                <?% FOREACH field IN zeile %?>
                 <td><?% field %?></td>
                 <?% END %?>
             </tr>
diff --git a/skins/stone_flat/help.tmpl b/skins/stone_flat/help.tmpl
index c36cf88..b746f7b 100644
--- a/skins/stone_flat/help.tmpl
+++ b/skins/stone_flat/help.tmpl
@@ -25,8 +25,8 @@
 <h1>XXV - Version <?% version %?></h1>
 <p><?% data.shift %?></p>
 <?% IF data.size > 1 %?>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% short=zeile.0;long=zeile.1;modul=zeile.2;desc=zeile.3 %?>
         <?% IF allow(long) %?>
 		<?% IF !old.defined || modul != old %?>
diff --git a/skins/stone_flat/logger.tmpl b/skins/stone_flat/logger.tmpl
index af54a36..6040140 100644
--- a/skins/stone_flat/logger.tmpl
+++ b/skins/stone_flat/logger.tmpl
@@ -12,17 +12,17 @@
                 <table summary="" width="100%">
 <?% fields = data.shift %?>
     <tr>
-    <?% FOREACH field = fields %?>
+    <?% FOREACH field IN fields %?>
         <?% NEXT IF field.match('^__') %?>
         <th>
             <?% field %?>
         </th>
     <?% END %?>
     </tr>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
     <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
         <?% c = -1 %?>
-        <?% FOREACH field = zeile %?>
+        <?% FOREACH field IN zeile %?>
             <?% c = c + 1 %?>
             <?% NEXT IF fields.$c.match('^__') %?>
             <td>
diff --git a/skins/stone_flat/memory.tmpl b/skins/stone_flat/memory.tmpl
index 27b01fb..6487814 100644
--- a/skins/stone_flat/memory.tmpl
+++ b/skins/stone_flat/memory.tmpl
@@ -18,7 +18,7 @@
         cacheddata = [];
         inactivedata = [];
         timestamps = [];
-        FOREACH row = data;
+        FOREACH row IN data;
             t = date.format(row.6, '%H:%M');
             timestamps.push(t);
             activedata.push(row.2 / (1024));
@@ -105,7 +105,7 @@
 <h1><?% param.headingText %?></h1>
 <?% END %?>
 
-<?% FOREACH file = statusfiles %?>
+<?% FOREACH file IN statusfiles %?>
 <table class="editortable" summary="">
     <tr><td class="editorhead"><?% file.0 %?></td></tr>
     <tr>
diff --git a/skins/stone_flat/mldisplay.tmpl b/skins/stone_flat/mldisplay.tmpl
index 6839547..9509802 100644
--- a/skins/stone_flat/mldisplay.tmpl
+++ b/skins/stone_flat/mldisplay.tmpl
@@ -77,7 +77,7 @@ seen = f.25;
                 <tr><td><?% gettext("Genres") %?>:</td><td colspan="3">
                     <?% selection = param.genres_sel %?>
                     <?% genres = param.genres_all %?>
-                    <?% FOREACH x = selection %?>
+                    <?% FOREACH x IN selection %?>
                     <?% genres.$x.name %?>&nbsp;
                     <?% END %?>
                 </td></tr>
@@ -133,8 +133,8 @@ seen = f.25;
         <tr>    
         <td class="largetext">
 
-<?% FOREACH zeile = param.actors %?>
-  <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+<?% FOREACH zeile IN param.actors %?>
+  <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <?% actor = zeile.0;imgurl=zeile.1 %?>
     <div style="float:left;">
         <div class="actor">
diff --git a/skins/stone_flat/mledit.tmpl b/skins/stone_flat/mledit.tmpl
index aebf8fc..16ff25b 100644
--- a/skins/stone_flat/mledit.tmpl
+++ b/skins/stone_flat/mledit.tmpl
@@ -63,7 +63,7 @@
             <select name="__mediatype">
                 <option label="" value="0" <?% IF (data.mediatype || param.mediatype) && (data.mediatype == 0 || param.mediatype == 0) %?>selected="selected"<?% END %?>></option>
                 <?% mediatypes = param.mediatypes %?>
-                <?% FOREACH type = mediatypes %?>
+                <?% FOREACH type IN mediatypes %?>
                 <option label="<?% type.1 %?>" value="<?% type.0 %?>" <?% IF data.mediatype == type.0 || param.mediatype == type.0 %?>selected="selected"<?% END %?>><?% type.1 %?></option>
                 <?% END %?>
             </select>
diff --git a/skins/stone_flat/mlist.tmpl b/skins/stone_flat/mlist.tmpl
index 5621996..f043915 100644
--- a/skins/stone_flat/mlist.tmpl
+++ b/skins/stone_flat/mlist.tmpl
@@ -92,8 +92,8 @@
 <?% IF data.size > 1%?>
 <?% fields = data.shift %?>
 <form name="mlist" action="">
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;artist=zeile.1;album=zeile.2;title=zeile.3;track=zeile.4;year=zeile.5;playtime=zeile.6;genre=zeile.7;comment=zeile.8 %?>
 		<?% IF !old.defined || album != old %?>
             <?% IF old.defined %?>
@@ -142,7 +142,7 @@
     <form name="genreform" action="">
     <?% gettext("Genres",20) %?>:<br />
     <select name='genres' onchange="di('?cmd=ml&amp;data=','genre:' + this.form.genres.options[this.form.genres.options.selectedIndex].value)">
-    <?% FOREACH ch = param.genres %?>
+    <?% FOREACH ch IN param.genres %?>
         <option value="<?% url( ch.1 ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.1 %?>><?% ch.0 %?></option>
     <?% END %?>
     </select>
diff --git a/skins/stone_flat/mllist.tmpl b/skins/stone_flat/mllist.tmpl
index 71ec9fe..d642187 100644
--- a/skins/stone_flat/mllist.tmpl
+++ b/skins/stone_flat/mllist.tmpl
@@ -64,8 +64,8 @@
               <td class="largetext" align="left">
               <table  summary="" width="100%">
               <tr height="0"><th width="60"></th><th></th><th width="64"></th></tr>
-     <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+     <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;imgurl=zeile.1;title=zeile.2;subtitle=zeile.3;year=zeile.4;director=zeile.5;description=zeile.6; %?>
         <?% PROCESS ItemAsFlat %?>
     <?% END %?>
@@ -97,7 +97,7 @@
     <td class="sidetext">
       <form name="mediarange" action="">
       <select name='range' onchange="di('?cmd=mllist&amp;__range=',this.form.range.options[this.form.range.options.selectedIndex].value)">
-      <?% FOREACH r = param.ranges %?>
+      <?% FOREACH r IN param.ranges %?>
           <option value="<?% url( r.0 ) %?>"<?% ' selected="selected"' IF param.range == r.0 %?>><?% r.1 %?></option>
       <?% END %?>
       </select>
diff --git a/skins/stone_flat/mlresearch.tmpl b/skins/stone_flat/mlresearch.tmpl
index 38ccdc7..325b36b 100644
--- a/skins/stone_flat/mlresearch.tmpl
+++ b/skins/stone_flat/mlresearch.tmpl
@@ -18,8 +18,8 @@
               <td class="largetext" align="left">
               <table  summary="" width="100%">
               <tr height="0"><th width="60"></th><th></th></tr>
-<?% FOREACH zeile = data %?>
-  <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+<?% FOREACH zeile IN data %?>
+  <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <?% importurl = zeile.0;imgurl=zeile.1;title=zeile.2;description=zeile.3 %?>
     <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
       <td class="fieldinline">
diff --git a/skins/stone_flat/mlsave.tmpl b/skins/stone_flat/mlsave.tmpl
index aef1960..fe4b9f0 100644
--- a/skins/stone_flat/mlsave.tmpl
+++ b/skins/stone_flat/mlsave.tmpl
@@ -12,7 +12,7 @@
             <?% data %?>
         <?% ELSE %?>
             <table summary="" width="100%">
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
                 <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
                     <td><?% zeile %?></td>
                 </tr>
diff --git a/skins/stone_flat/movetimerlist.tmpl b/skins/stone_flat/movetimerlist.tmpl
index 9be331f..4cf7701 100644
--- a/skins/stone_flat/movetimerlist.tmpl
+++ b/skins/stone_flat/movetimerlist.tmpl
@@ -70,8 +70,8 @@
                 <th><?% gettext('Change original timer') %?></th>
                 <th width="64" align="right"></th>
             </tr>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?>
         <?% PROCESS Item %?>
     <?% END %?>
diff --git a/skins/stone_flat/network.tmpl b/skins/stone_flat/network.tmpl
index be95538..82abdbf 100644
--- a/skins/stone_flat/network.tmpl
+++ b/skins/stone_flat/network.tmpl
@@ -13,7 +13,7 @@
         fields = data.shift;
 
         timestamps = [];
-        FOREACH row = data;
+        FOREACH row IN data;
             iname = row.0.split(':').first;
 
             rxbytes.${iname} = [];
@@ -24,7 +24,7 @@
             oldentry.${iname} = [];
         END;
 
-        FOREACH row = data;
+        FOREACH row IN data;
             IF ot != row.5;
              t = date.format(row.5, '%H:%M');
              timestamps.push(t);
@@ -46,7 +46,7 @@
                 oldentry.${iname} = row;
         END;
 
-        FOREACH iname = rxbytes.keys.sort;
+        FOREACH iname IN rxbytes.keys.sort;
 
             # Data ...
             d = [
@@ -92,7 +92,7 @@
 <h1><?% param.headingText %?></h1>
 <?% END %?>
 
-<?% FOREACH file = statusfiles %?>
+<?% FOREACH file IN statusfiles %?>
 <table class="editortable" summary="">
     <tr><td class="editorhead"><?% file.0 %?></td></tr>
     <tr>
diff --git a/skins/stone_flat/now.tmpl b/skins/stone_flat/now.tmpl
index 3b05c8c..5c03ee6 100644
--- a/skins/stone_flat/now.tmpl
+++ b/skins/stone_flat/now.tmpl
@@ -127,8 +127,8 @@
                         <td class="largetext" align="left">
                         <table summary="" width="100%">
                         <tr><th width="150"></th><th></th><th width="140"></th><th width="110"></th><th width="40"></th></tr>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;
             description=zeile.8;duration=zeile.9;
@@ -165,7 +165,7 @@
       <td class="sidetext">
         <form action="">
         <select name="cgroups" onchange="di('?cmd=<?% cgi.param('cmd') %?>&amp;data=<?% cgi.param('data') %?>&amp;__cgrp=',this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value)">
-            <?% FOREACH cgrp = param.cgroups %?>
+            <?% FOREACH cgrp IN param.cgroups %?>
               <option value="<?% cgrp.last %?>"<?% ' selected="selected"' IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?></option>
             <?% END %?>
         </select>
@@ -188,7 +188,7 @@
             <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=now&amp;__cgrp=<?% cgi.param('__cgrp') %?>&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
             <?% today = [] %?>
             <?% tomor = [] %?>
-        <?% FOREACH zeit = zeiten %?>
+        <?% FOREACH zeit IN zeiten %?>
             <?% tom = 0 %?>
             <?% PERL %?>
                 use Date::Manip;
@@ -209,12 +209,12 @@
         <?% END %?>
         <?% IF today.size > 0 %?>
             <optgroup label="<?% date.format(today.0, "%A", locale) %?>">
-        <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
         <?% IF tomor.size > 0 %?>
             <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>">
-        <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
             </select>
diff --git a/skins/stone_flat/program.tmpl b/skins/stone_flat/program.tmpl
index 7f1d733..5c57190 100644
--- a/skins/stone_flat/program.tmpl
+++ b/skins/stone_flat/program.tmpl
@@ -70,7 +70,7 @@
 <?% END %?>
 <?% ######################################################################################
     channelpos=0;priorchannel=0;nextchannel=0;priortitle="";nexttitle="";
-    FOREACH ch = param.channels;
+    FOREACH ch IN param.channels;
         IF cgi.param('data') == ch.1 || cgi.param('data') == ch.0 || param.current == ch.1;
             channel = ch.0;
             channelpos = ch.1;
@@ -91,8 +91,8 @@
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
     <?% z = 0 %?>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;
             description=zeile.6;pdc=zeile.7;timerid=zeile.8;recording=zeile.9;running=zeile.10;
             day = zeile.5 %?>
@@ -160,7 +160,7 @@
     <td class="sidetext">
     <form action="">
         <select size="15" name="data" onchange="di('?cmd=program&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
-        <?% FOREACH ch = param.channels %?>
+        <?% FOREACH ch IN param.channels %?>
           <?% IF ch.2 != channelgroup %?>
             <?% IF channelgroup %?>
             </optgroup>
diff --git a/skins/stone_flat/report.tmpl b/skins/stone_flat/report.tmpl
index 291f693..1bda974 100644
--- a/skins/stone_flat/report.tmpl
+++ b/skins/stone_flat/report.tmpl
@@ -3,7 +3,7 @@
 <div id="body">
 <h1><?% gettext("Protocol of the activities") %?></h1>
 
-<?% FOREACH name = data.keys.sort %?>
+<?% FOREACH name IN data.keys.sort %?>
     <h2><?% gettext("Report for module") %?>&nbsp;
         <?% name %?></h2>
     <?% IF name == 'RECORDS';
@@ -13,7 +13,7 @@
         END;
      %?>
 
-    <?% FOREACH typ = data.$name.keys.sort %?>
+    <?% FOREACH typ IN data.$name.keys.sort %?>
         <?% IF typ == 'message' %?>
             <p><?% data.$name.$typ %?>
             </p>
@@ -25,7 +25,7 @@
                 <td class="largetext" align="left">
                 <table summary="" width="100%">
                     <!-- <tr>
-                    <?% FOREACH field = fields %?>
+                    <?% FOREACH field IN fields %?>
                         <?% NEXT IF field.match('^__') %?>
                         <th>
                             <nobr><?% field %?>
@@ -33,10 +33,10 @@
                         </th>
                     <?% END %?>
                     </tr> --> 
-                    <?% FOREACH zeile = data.$name.$typ %?>
+                    <?% FOREACH zeile IN data.$name.$typ %?>
                     <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
                         <?% c = -1 %?>
-                        <?% FOREACH field = zeile %?>
+                        <?% FOREACH field IN zeile %?>
                             <?% c = c + 1 %?>
                             <?% NEXT IF fields.$c.match('^__') %?>
                             <td><a href="javascript:popupwindow('<?% link %?><?% zeile.first %?>',620,670,0)"><?% field %?></a></td>
diff --git a/skins/stone_flat/rlist.tmpl b/skins/stone_flat/rlist.tmpl
index 8722331..09fa2f3 100644
--- a/skins/stone_flat/rlist.tmpl
+++ b/skins/stone_flat/rlist.tmpl
@@ -162,8 +162,8 @@
                         <td class="largetext" align="left">
                         <table  summary="" width="100%">
                         <tr height="0"><th width="<?% IF param.previewcommand != 'n' %?>200<?% ELSE %?>20<?% END %?>"></th><th></th><th width="64"></th></tr>
-     <?%- FOREACH zeile = data;
-          IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END;
+     <?%- FOREACH zeile IN data;
+          IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END;
           id=zeile.0;
           eventid=zeile.1;
           title=zeile.2.split('&#x7e;').last;
@@ -259,7 +259,7 @@
             <li><a href="?cmd=<?% cmd %?><?% daten %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li>
         </ul>
 <?% END %?>
-    <?% FOREACH row = fields %?>
+    <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=chop(row,20) %?>
       <?% END %?>
@@ -331,7 +331,7 @@
         <?% IF param.keywords.size <  steps %?>
           <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
-        <?% FOREACH keyword = param.keywords %?>
+        <?% FOREACH keyword IN param.keywords %?>
               <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
                 <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
diff --git a/skins/stone_flat/schema.tmpl b/skins/stone_flat/schema.tmpl
index 4224a93..75ac360 100644
--- a/skins/stone_flat/schema.tmpl
+++ b/skins/stone_flat/schema.tmpl
@@ -18,7 +18,7 @@
 <?% Duration = param.zeitbis - param.zeitvon %?>
 <table class="largetable" summary="">
     <tr><td class="largehead">
-            <?% FOREACH cgrp = param.cgroups %?>
+            <?% FOREACH cgrp IN param.cgroups %?>
               <?% IF param.channelgroup == cgrp.last;cgrp.first;LAST;END %?>
             <?% END %?>
         </td></tr>
@@ -89,7 +89,7 @@
                         <?%- ############################################## -%?>   
                     </td>
                 </tr>
-                <?% FOREACH cpos = data.keys.nsort %?>
+                <?% FOREACH cpos IN data.keys.nsort %?>
                 <tr<?% IF (loop.count mod 2) == 0 %?> class="two"<?% END %?>>
                     <td>
                     <?% channel = data.$cpos.first.4 %?>
@@ -116,7 +116,7 @@
                     </td>
                     <td colspan="<?% colspan %?>" style="white-space: nowrap;">
                         <?%- ges = 0; oldend = param.zeitvon -%?>
-                        <?%- FOREACH event = data.$cpos;
+                        <?%- FOREACH event IN data.$cpos;
                                 id = event.0;
                                 title = event.1;
                                 subtitle = event.2;
@@ -205,7 +205,7 @@
       <td class="sidetext">
         <form action="">
         <select name="cgroups" onchange="di('?cmd=<?% cgi.param('cmd') %?>&amp;data=<?% param.zeitvon %?>&amp;__cgrp=',this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value)">
-            <?% FOREACH cgrp = param.cgroups %?>
+            <?% FOREACH cgrp IN param.cgroups %?>
               <option value="<?% cgrp.last %?>"<?% ' selected="selected"' IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?></option>
             <?% END %?>
         </select>
@@ -228,7 +228,7 @@
             <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=sch&amp;__cgrp=<?% cgi.param('__cgrp') %?>&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
            <?% today = [] %?>
             <?% tomor = [] %?>
-        <?% FOREACH zeit = zeiten %?>
+        <?% FOREACH zeit IN zeiten %?>
             <?% tom = 0 %?>
             <?% PERL %?>
                 use Date::Manip;
@@ -249,12 +249,12 @@
         <?% END %?>
         <?% IF today.size > 0 %?>
             <optgroup label="<?% date.format(today.0, "%A", locale) %?>">
-        <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
         <?% IF tomor.size > 0 %?>
             <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>">
-        <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
+        <?% FOREACH z IN tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> 
             </optgroup>
         <?% END %?>
             </select>
diff --git a/skins/stone_flat/search.tmpl b/skins/stone_flat/search.tmpl
index 9f21b97..5866392 100644
--- a/skins/stone_flat/search.tmpl
+++ b/skins/stone_flat/search.tmpl
@@ -76,8 +76,8 @@
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
 <form name="searchlist" action="">
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;
             pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
@@ -135,7 +135,7 @@
             <?% gettext('Channel',30) %?><br />
             <select name='__channel'>
                 <option value="0"><?% gettext('All channels') %?></option>
-                <?% FOREACH ch = param.channels %?>
+                <?% FOREACH ch IN param.channels %?>
                   <?% IF ch.2 && ch.2 != channelgroup %?>
                     <?% IF channelgroup %?>
                     </optgroup>
diff --git a/skins/stone_flat/tlist.tmpl b/skins/stone_flat/tlist.tmpl
index 7756ac8..fc579d8 100644
--- a/skins/stone_flat/tlist.tmpl
+++ b/skins/stone_flat/tlist.tmpl
@@ -144,8 +144,8 @@
 <?% fields = data.shift %?>
 <form name="tlist" action="">
     <?% z = 1 %?>
-    <?% FOREACH zeile = data %?>
-   	  <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+   	  <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
 			<?%- id=zeile.0;
           aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
           sender=zeile.2;
@@ -288,7 +288,7 @@
         <?% IF param.keywords.size <  steps %?>
           <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
-        <?% FOREACH keyword = param.keywords %?>
+        <?% FOREACH keyword IN param.keywords %?>
               <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=tk&amp;data=<?% keyword.0 %?>">
                 <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
diff --git a/skins/stone_flat/topten.tmpl b/skins/stone_flat/topten.tmpl
index c42a405..d486312 100644
--- a/skins/stone_flat/topten.tmpl
+++ b/skins/stone_flat/topten.tmpl
@@ -78,8 +78,8 @@
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
 <h1><?% gettext("Top Ten entrys") %?></h1>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8;
             pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
diff --git a/skins/stone_flat/ulist.tmpl b/skins/stone_flat/ulist.tmpl
index de6d0f4..321cfb9 100644
--- a/skins/stone_flat/ulist.tmpl
+++ b/skins/stone_flat/ulist.tmpl
@@ -44,8 +44,8 @@
                         <td class="largetext" align="left">
                         <table  summary="" width="100%">
                         <tr height="0"><th></th><th></th><th width="60" align="right"></th></tr>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;user=zeile.1;right=zeile.2 %?>
         <?% PROCESS ItemAsFlat %?>
     <?% END %?>
diff --git a/skins/stone_flat/vdrlist.tmpl b/skins/stone_flat/vdrlist.tmpl
index 6bf916c..6050291 100644
--- a/skins/stone_flat/vdrlist.tmpl
+++ b/skins/stone_flat/vdrlist.tmpl
@@ -65,8 +65,8 @@
                         <td class="largetext" align="left">
                         <table  summary="" width="100%">
                         <tr height="0"><th></th><th></th><th width="60" align="right"></th></tr>
-    <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;active=zeile.1;primary=zeile.2;host=zeile.3;cards=zeile.4 %?>
         <?% PROCESS ItemAsFlat %?>
     <?% END %?>
diff --git a/skins/stone_flat/vitals.tmpl b/skins/stone_flat/vitals.tmpl
index 19fa6ae..d49bea3 100644
--- a/skins/stone_flat/vitals.tmpl
+++ b/skins/stone_flat/vitals.tmpl
@@ -16,7 +16,7 @@
         utildata = [];
         userdata = [];
         timestamps = [];
-        FOREACH item = param.stack;
+        FOREACH item IN param.stack;
             t = date.format(item.timestamp, '%H:%M:%S');
             timestamps.push(t);
             l = item.load.first * 10;
@@ -82,7 +82,7 @@
     <tr>
         <td class="editortext" align="center">
             <table summary="" width="100%">
-                <?% FOREACH name = data.keys.sort %?>
+                <?% FOREACH name IN data.keys.sort %?>
                 <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
                     <td><?% name %?></td>
                     <td><?% data.$name.replace('\n', '<br />') %?></td>
@@ -94,7 +94,7 @@
     <tr><td class="editorbottom"></td></tr>
 </table>
 
-<?% FOREACH file = statusfiles %?>
+<?% FOREACH file IN statusfiles %?>
 <table class="editortable" summary="">
     <tr><td class="editorhead"><?% file.0 %?></td></tr>
     <tr>
diff --git a/skins/wml/now.tmpl b/skins/wml/now.tmpl
index 6ef28a0..5bee16d 100644
--- a/skins/wml/now.tmpl
+++ b/skins/wml/now.tmpl
@@ -24,7 +24,7 @@
 <?% offset = skip + global.MaxCards %?>
 <?% IF data.size > skip %?>
 <?% fields = data.shift %?>
-   	<?% FOREACH zeile = data %?>
+   	<?% FOREACH zeile IN data %?>
         <?% IF loop.count < skip;NEXT;END %?>
         <?% title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;
diff --git a/skins/wml/program.tmpl b/skins/wml/program.tmpl
index 5dae34d..fe72b9e 100644
--- a/skins/wml/program.tmpl
+++ b/skins/wml/program.tmpl
@@ -3,7 +3,7 @@
     channel = channel1st.0;
     channelhash = channel1st.1;
     channelitem = 1;
-    FOREACH ch = param.channels;
+    FOREACH ch IN param.channels;
         IF cgi.param('data') == ch.1 || cgi.param('data') == ch.0 || param.current == ch.1;
             channel = ch.0;
             channelhash = ch.1;
@@ -15,7 +15,7 @@
 <card id="first" title="<?% channel | truncate(32)| html %?>">
     <p>
     <select name="channel" ivalue="<?% channelitem %?>" >
-    <?% FOREACH ch = param.channels %?>
+    <?% FOREACH ch IN param.channels %?>
         <option value="<?% loop.count %?>"><?% ch.0 | html %?></option>
         <?% IF loop.count >= global.MaxChannelsProgram;LAST;END %?>
     <?% END %?>
@@ -57,7 +57,7 @@
 <?% offset = skip + global.MaxCards %?>
 <?% IF data.size > skip %?>
 <?% fields = data.shift %?>
-   	<?% FOREACH zeile = data %?>
+   	<?% FOREACH zeile IN data %?>
         <?% IF loop.count < skip;NEXT;END %?>
         <?% title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;datum=zeile.5;desc=zeile.6 %?>
     	<?% IF id.defined %?>
diff --git a/skins/wml/search.tmpl b/skins/wml/search.tmpl
index 7885fdd..eb83a55 100644
--- a/skins/wml/search.tmpl
+++ b/skins/wml/search.tmpl
@@ -26,7 +26,7 @@
 <?% offset = skip + global.MaxCards %?>
 <?% IF data.size > skip %?>
 <?% fields = data.shift %?>
-   	<?% FOREACH zeile = data %?>
+   	<?% FOREACH zeile IN data %?>
         <?% IF loop.count < skip;NEXT;END %?>
         <?% title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;desc=zeile.8 %?>
     	<?% IF id.defined %?>
diff --git a/skins/wml/tlist.tmpl b/skins/wml/tlist.tmpl
index 63cf300..552f4e7 100644
--- a/skins/wml/tlist.tmpl
+++ b/skins/wml/tlist.tmpl
@@ -54,7 +54,7 @@
 <?% offset = skip + global.MaxCards %?>
 <?% IF data.size > skip %?>
 <?% fields = data.shift %?>
-   	<?% FOREACH zeile = data %?>
+   	<?% FOREACH zeile IN data %?>
         <?% IF loop.count < skip;NEXT;END %?>
 		<?% aktiv=zeile.1;sender=zeile.2;channel=zeile.3;datum=zeile.4;start=zeile.5;stop=zeile.6;title=zeile.7;day = zeile.8;conflict=zeile.9 %?>
     	<?% IF id.defined %?>
diff --git a/skins/wml/widgets/checkbox.tmpl b/skins/wml/widgets/checkbox.tmpl
index 703d8b4..0a60fd0 100644
--- a/skins/wml/widgets/checkbox.tmpl
+++ b/skins/wml/widgets/checkbox.tmpl
@@ -1,7 +1,7 @@
 <?% ############################################################################
     val = cgi.param(data.NAME) || data.def;
     selectitem = 1;
-    FOREACH wert = data.choices;
+    FOREACH wert IN data.choices;
         IF wert == val;
             selectitem = loop.count;
             LAST;
@@ -10,7 +10,7 @@
    ######################################################################### %?>
 <?% data.msg | truncate(15) %?> : 
 <select name="<?% data.NAME | replace('__','var') %?>" ivalue="<?% selectitem %?>">
-    <?% FOREACH wert = data.choices %?>
+    <?% FOREACH wert IN data.choices %?>
         <option value="<?% entities(wert) %?>"><?% entities(wert) %?></option>
     <?% END %?>
 </select><br/>
diff --git a/skins/wml/widgets/err.tmpl b/skins/wml/widgets/err.tmpl
index 202e0e5..919b357 100644
--- a/skins/wml/widgets/err.tmpl
+++ b/skins/wml/widgets/err.tmpl
@@ -11,7 +11,7 @@
         <?% IF data.size <= 0 %?>
             <?% data | html %?>
         <?% ELSE %?>
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
                     <?% zeile %?><br />
              <?% END %?>
         <?% END %?>
diff --git a/skins/wml/widgets/formEnd.tmpl b/skins/wml/widgets/formEnd.tmpl
index 5a3967c..9b2b684 100644
--- a/skins/wml/widgets/formEnd.tmpl
+++ b/skins/wml/widgets/formEnd.tmpl
@@ -1,4 +1,4 @@
-<a href="?<?% global.hiddenfield.join('&amp;') %?><?% FOREACH field = global.fomularfield %?>&amp;<?% field %?>=\$(<?% field | replace('__','var') %?>)<?% END %?>">
+<a href="?<?% global.hiddenfield.join('&amp;') %?><?% FOREACH field IN global.fomularfield %?>&amp;<?% field %?>=\$(<?% field | replace('__','var') %?>)<?% END %?>">
 <img src="images/apply.wbm" alt="<?% gettext("Apply") %?>" />
 </a>
 <anchor><img src="images/refresh.wbm" alt="<?% gettext("Reset") %?>" /><refresh/></anchor>
diff --git a/skins/wml/widgets/list.tmpl b/skins/wml/widgets/list.tmpl
index f24e568..8859e01 100644
--- a/skins/wml/widgets/list.tmpl
+++ b/skins/wml/widgets/list.tmpl
@@ -6,8 +6,8 @@
 <?% values = val %?>
 <?% END %?>
 <?% select = [] %?>
-<?% FOREACH valch = values;
-        FOREACH l = data.choices;
+<?% FOREACH valch IN values;
+        FOREACH l IN data.choices;
             IF valch == l.1;
                 select.push(loop.count);
                 LAST;
@@ -19,7 +19,7 @@
 <?% ELSE %?>
 <select name="<?% data.NAME | replace('__','var') %?>" ivalue="<?% select.join(';') %?>">
 <?% END %?>
-<?% FOREACH l = data.choices %?>
+<?% FOREACH l IN data.choices %?>
     <option value='<?% l.1 %?>'><?% entities(l.0) %?></option>
     <?% IF data.NAME == "__ChannelID" && loop.count >= global.MaxChannelsTimer;LAST;END %?>
 <?% END %?>
diff --git a/skins/wml/widgets/littlemenu.tmpl b/skins/wml/widgets/littlemenu.tmpl
index 89aa392..461db2b 100644
--- a/skins/wml/widgets/littlemenu.tmpl
+++ b/skins/wml/widgets/littlemenu.tmpl
@@ -2,7 +2,7 @@
 <big><?% data.title %?></big>
 <?% END %?>
 
-<?% FOREACH l = data.links %?>
+<?% FOREACH l IN data.links %?>
 <?% "<b>" IF data.highlight == l.key %?>
 <a href="<?% l.value.link %?>"><?% l.value.text %?></a>
 <?% "</b>" IF data.highlight == l.key %?>
diff --git a/skins/wml/widgets/menu.tmpl b/skins/wml/widgets/menu.tmpl
index e73f5a8..ca99fdf 100644
--- a/skins/wml/widgets/menu.tmpl
+++ b/skins/wml/widgets/menu.tmpl
@@ -4,7 +4,7 @@
 <?% IF message %?>
 Fehler: <?% message %?><br />
 <?% END %?>
-<?% FOREACH field = data %?>
+<?% FOREACH field IN data %?>
     <?% group = field.0; short = field.1; name = field.2; descr = field.3 %?>
     <?% IF ! oldgroup.defined %?>
         <b><?% group | html %?></b><br />
diff --git a/skins/wml/widgets/message.tmpl b/skins/wml/widgets/message.tmpl
index 3ccbae0..e5ab870 100644
--- a/skins/wml/widgets/message.tmpl
+++ b/skins/wml/widgets/message.tmpl
@@ -11,7 +11,7 @@
         <?% IF data.size <= 0 %?>
             <?% data | html %?>
         <?% ELSE %?>
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
                     <?% zeile %?><br />
              <?% END %?>
         <?% END %?>
diff --git a/skins/wml/widgets/radio.tmpl b/skins/wml/widgets/radio.tmpl
index 703d8b4..0a60fd0 100644
--- a/skins/wml/widgets/radio.tmpl
+++ b/skins/wml/widgets/radio.tmpl
@@ -1,7 +1,7 @@
 <?% ############################################################################
     val = cgi.param(data.NAME) || data.def;
     selectitem = 1;
-    FOREACH wert = data.choices;
+    FOREACH wert IN data.choices;
         IF wert == val;
             selectitem = loop.count;
             LAST;
@@ -10,7 +10,7 @@
    ######################################################################### %?>
 <?% data.msg | truncate(15) %?> : 
 <select name="<?% data.NAME | replace('__','var') %?>" ivalue="<?% selectitem %?>">
-    <?% FOREACH wert = data.choices %?>
+    <?% FOREACH wert IN data.choices %?>
         <option value="<?% entities(wert) %?>"><?% entities(wert) %?></option>
     <?% END %?>
 </select><br/>
diff --git a/skins/wml/widgets/table.tmpl b/skins/wml/widgets/table.tmpl
index a184f6f..9721296 100644
--- a/skins/wml/widgets/table.tmpl
+++ b/skins/wml/widgets/table.tmpl
@@ -6,7 +6,7 @@
     <?% IF ! param.hide_HeadRow %?>
     <td>Name</td><td>Value</td>
     <?% END %?>
-    <?% FOREACH name = data.keys.sort %?>
+    <?% FOREACH name IN data.keys.sort %?>
     <tr>
         <td width="50%"><?% name %?></td><td><?% data.$name.replace('\|', '<p>').replace('\n', '<br>') %?></td>
     </tr>
@@ -14,17 +14,17 @@
 <?% ELSE %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') %?>
             <td>
                 <?% field | html %?>
             </td>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <tr>
             <?% c = -1 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% NEXT IF fields.$c.match('^__') %?>
                 <td><?% field.replace('\|', '<p>').replace('\n', '<br>') %?></td>
diff --git a/skins/xstyle/alist.tmpl b/skins/xstyle/alist.tmpl
index d8cd462..16a1814 100644
--- a/skins/xstyle/alist.tmpl
+++ b/skins/xstyle/alist.tmpl
@@ -21,7 +21,7 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <th style="white-space: nowrap">
                 <?% field %?>
                 <?% IF param.sortable %?>
@@ -31,7 +31,7 @@
         <?% END %?>
         </tr>
         <?% x = -1 %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% IF zeile.1 == 'n' %?>
             <?% myclass = "deactive" %?>
         <?% ELSE %?>
@@ -40,7 +40,7 @@
         <?% x = x + 1 %?>
         <tr class="<?% myclass %?>" <?% IF (x mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
             <?% c = 0 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% IF c == 1; # Id Field %?>
                 <?% Id = zeile.0 %?>
@@ -79,7 +79,7 @@
                 <?% ELSIF c == 4; # Channel Field %?>
                 <td>
                     <?% text = "" %?>
-                    <?% FOREACH ch = field.split(',') %?>
+                    <?% FOREACH ch IN field.split(',') %?>
                         <?% text = "$text ${ch}" %?>
                         <?% LAST IF text.length > 20 %?>
                     <?% END %?>
diff --git a/skins/xstyle/bloecke/event_row.tmpl b/skins/xstyle/bloecke/event_row.tmpl
index 42b3cf0..31ea359 100755
--- a/skins/xstyle/bloecke/event_row.tmpl
+++ b/skins/xstyle/bloecke/event_row.tmpl
@@ -1,4 +1,4 @@
-<?% FOREACH field = fielddata %?>
+<?% FOREACH field IN fielddata %?>
     <?% c = c + 1 %?>
     <?% IF c == 1; # Id Field %?>
     <td>
diff --git a/skins/xstyle/clist.tmpl b/skins/xstyle/clist.tmpl
index 9c09a6f..dbeb339 100644
--- a/skins/xstyle/clist.tmpl
+++ b/skins/xstyle/clist.tmpl
@@ -140,7 +140,7 @@
         <th><?% PROCESS SortItem row="CA" label=gettext('Conditional access (CA)') trunc=10  %?></th>
         <th align="right"></th>
     </tr>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
         <?% id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3;source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8;CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14;POS=zeile.15;CGRP=zeile.16;HOST=zeile.17; %?>
         <?% IF not sortby.defined && OLDHOST != HOST  %?>
             <tr>
diff --git a/skins/xstyle/cmdlist.tmpl b/skins/xstyle/cmdlist.tmpl
index bb162df..8870f35 100644
--- a/skins/xstyle/cmdlist.tmpl
+++ b/skins/xstyle/cmdlist.tmpl
@@ -6,7 +6,7 @@
 <table border="0" width="95%">
 <?% fields = data.shift %?>
     <tr>
-    <?% FOREACH field = fields %?>
+    <?% FOREACH field IN fields %?>
         <?% NEXT IF field.match('^__') %?>
         <th>
             <nobr><?% field %?>
@@ -18,10 +18,10 @@
         </th>
     <?% END %?>
     </tr>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
     <tr>
         <?% c = -1 %?>
-        <?% FOREACH field = zeile %?>
+        <?% FOREACH field IN zeile %?>
             <?% c = c + 1 %?>
             <?% NEXT IF fields.$c.match('^__') %?>
             <td>
diff --git a/skins/xstyle/display.tmpl b/skins/xstyle/display.tmpl
index d9937f4..e12d099 100644
--- a/skins/xstyle/display.tmpl
+++ b/skins/xstyle/display.tmpl
@@ -31,7 +31,7 @@
     <?% IF values.13 %?>
        <?% Image = values.13 %?>
     <?% END %?>
-    <?% FOREACH field = fields %?>
+    <?% FOREACH field IN fields %?>
         <?% c = c + 1 %?>
         <?%# NEXT UNLESS values.$c %?>
         <?% NEXT IF field == gettext('Percent') && values.$c > 100 %?>
@@ -58,7 +58,7 @@
             <td>
             <?% IF Image %?>
                 <table align="right" border=0><tr><td>
-                <?% FOREACH img = Image.split("\n") %?>
+                <?% FOREACH img IN Image.split("\n") %?>
                 <img src='?cmd=eimage&data=<?% img %?>' border=1 vspace=2><br/>
                 <?% END %?>
                 </td></tr></table>
diff --git a/skins/xstyle/filesys.tmpl b/skins/xstyle/filesys.tmpl
index 8806b08..c7d52ff 100644
--- a/skins/xstyle/filesys.tmpl
+++ b/skins/xstyle/filesys.tmpl
@@ -5,7 +5,7 @@ trash = param.usage.shift;
 
 IF param.graphic;
     FILTER null;
-        FOREACH device = param.usage;
+        FOREACH device IN param.usage;
             name = reentities(device.first).split('/').last;
 
             free = 100 - device.5;
@@ -42,7 +42,7 @@ END;
 <?% IF param.graphic %?>
     <table border="0" width="95%">
     <?% count = 0 %?>
-    <?% FOREACH file = statusfiles %?>
+    <?% FOREACH file IN statusfiles %?>
     	<?% IF count % 2 == 0 %?>
     		<?% IF count > 0 %?>
     </tr>
@@ -61,13 +61,13 @@ END;
 <?% ELSE %?>
     <table border="0" width="95%">
             <tr>
-            <?% FOREACH field = trash %?>
+            <?% FOREACH field IN trash %?>
                 <th><?% field %?></th>
             <?% END %?>
             </tr>
-            <?% FOREACH zeile = data %?>
+            <?% FOREACH zeile IN data %?>
             <tr>
-                <?% FOREACH field = zeile %?>
+                <?% FOREACH field IN zeile %?>
                 <td><?% field %?></td>
                 <?% END %?>
             </tr>
diff --git a/skins/xstyle/help.tmpl b/skins/xstyle/help.tmpl
index 5b3331a..e357004 100644
--- a/skins/xstyle/help.tmpl
+++ b/skins/xstyle/help.tmpl
@@ -15,8 +15,8 @@
 <p><?% data.shift %?></p>
 <?% IF data.size > 1 %?>
 <table summary=""  width="100%">
-    <?% FOREACH zeile = data %?>
-    <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+    <?% FOREACH zeile IN data %?>
+    <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
         <?% short=zeile.0;long=zeile.1;modul=zeile.2;desc=zeile.3 %?>
         <?% IF allow(long) %?>
diff --git a/skins/xstyle/logger.tmpl b/skins/xstyle/logger.tmpl
index b9dc038..836236e 100644
--- a/skins/xstyle/logger.tmpl
+++ b/skins/xstyle/logger.tmpl
@@ -22,7 +22,7 @@
 <table border="0" width="95%">
 <?% fields = data.shift %?>
     <tr>
-    <?% FOREACH field = fields %?>
+    <?% FOREACH field IN fields %?>
         <?% NEXT IF field.match('^__') %?>
         <th>
             <nobr><?% field %?>
@@ -35,11 +35,11 @@
     <?% END %?>
     </tr>
     <?% x = -1 %?>
-    <?% FOREACH zeile = data %?>
+    <?% FOREACH zeile IN data %?>
     <tr>
         <?% x = x + 1 %?>
         <?% c = -1 %?>
-        <?% FOREACH field = zeile %?>
+        <?% FOREACH field IN zeile %?>
             <?% c = c + 1 %?>
             <?% NEXT IF fields.$c.match('^__') %?>
             <td <?% IF (x mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
diff --git a/skins/xstyle/mainmenu.inc b/skins/xstyle/mainmenu.inc
index 775012f..bfd666f 100644
--- a/skins/xstyle/mainmenu.inc
+++ b/skins/xstyle/mainmenu.inc
@@ -17,7 +17,7 @@ var myBar = new WebFXMenuBar;
     <?% groupnames = getModule('CHANNELS').ChannelGroupsArray('Name') %?>
     <?% IF groupnames.size %?>
         var runnowGrp = new WebFXMenu;
-    <?% FOREACH group = groupnames%?>
+    <?% FOREACH group IN groupnames%?>
         runnowGrp.add(new WebFXMenuItem('<?% group.first %?>',  "?cmd=now&data=&__cgrp=<?% group.last %?>"));
     <?% END %?>
         runnow.add(new WebFXMenuItem("<?% gettext("Running now",cuttext ) %?>",null,null,runnowGrp));
@@ -25,7 +25,7 @@ var myBar = new WebFXMenuBar;
 
     <?% IF groupnames.size %?>
         var runnextGrp = new WebFXMenu;
-    <?% FOREACH group = groupnames %?>
+    <?% FOREACH group IN groupnames %?>
         runnextGrp.add(new WebFXMenuItem('<?% group.first %?>',  "?cmd=next&data=&__cgrp=<?% group.last %?>"));
     <?% END %?>
         runnow.add(new WebFXMenuItem("<?% gettext("Next",cuttext ) %?>",null,null,runnextGrp));
@@ -34,7 +34,7 @@ var myBar = new WebFXMenuBar;
 
     <?% USE date %?>
     <?% periods = getModule('EPG').periods %?>
-    <?% FOREACH zeit = periods.split(','); %?>
+    <?% FOREACH zeit IN periods.split(','); %?>
         <?% runningnext = 0 %?>
         <?% tom = 0 %?>
         <?% PERL %?>
@@ -132,7 +132,7 @@ var myBar = new WebFXMenuBar;
 
 <?% IF allow('configedit') %?>
     var prefs = new WebFXMenu;
-    <?% FOREACH co = getModule('CONFIG').realModNames %?>
+    <?% FOREACH co IN getModule('CONFIG').realModNames %?>
       <?% IF co != "CONFIG" %?>
         prefs.add(new WebFXMenuItem("<?% chop(co,cuttext ) %?>",  "?cmd=configedit&amp;data=<?% co %?>"));
       <?% END %?>
diff --git a/skins/xstyle/memory.tmpl b/skins/xstyle/memory.tmpl
index a0572f3..5d19033 100644
--- a/skins/xstyle/memory.tmpl
+++ b/skins/xstyle/memory.tmpl
@@ -10,7 +10,7 @@
         cacheddata = [];
         inactivedata = [];
         timestamps = [];
-        FOREACH row = data;
+        FOREACH row IN data;
             t = date.format(row.6, '%H:%M');
             timestamps.push(t);
             activedata.push(row.2 / (1024));
diff --git a/skins/xstyle/mldisplay.tmpl b/skins/xstyle/mldisplay.tmpl
index c2680f7..d1e0286 100644
--- a/skins/xstyle/mldisplay.tmpl
+++ b/skins/xstyle/mldisplay.tmpl
@@ -50,7 +50,7 @@
     <td width="30%">
         <?% IF fields.11 %?>
             <?% mydirectors = [] %?>
-            <?% FOREACH director = fields.11.split(',') %?>
+            <?% FOREACH director IN fields.11.split(',') %?>
                 <?% director = director.replace('^\s+|\s+$','') %?>
                 <?% director = "<a href=\"?cmd=mlsearch&__search&__selfields=director&__searchitem=$director\">$director</a>" %?>
                 <?% mydirectors.push(director) %?>
@@ -64,7 +64,7 @@
     <td width="30%">
         <?% IF fields.4 %?>
             <?% mylanguages = [] %?>
-            <?% FOREACH language = fields.4.split(',') %?>
+            <?% FOREACH language IN fields.4.split(',') %?>
                 <?% language = language.replace('^\s+|\s+$','') %?>
                 <?% language = "<a href=\"?cmd=mlsearch&__search&__selfields=director&__searchitem=$language\">$language</a>" %?>
                 <?% mylanguages.push(language) %?>
@@ -80,7 +80,7 @@
     <td width="30%">
         <?% IF fields.14 %?>
             <?% mycountrys = [] %?>
-            <?% FOREACH country = fields.14.split('&#x2f;') %?>
+            <?% FOREACH country IN fields.14.split('&#x2f;') %?>
                 <?% country = country.replace('^\s+|\s+$','') %?>
                 <?% country = "<a href=\"?cmd=mlsearch&__search&__selfields=country&__searchitem=$country\">$country</a>" %?>
                 <?% mycountrys.push(country) %?>
@@ -181,7 +181,7 @@
     <td colspan=3>
         <?% selection = param.genres_sel %?>
         <?% genres = param.genres_all %?>
-        <?% FOREACH id = selection %?>
+        <?% FOREACH id IN selection %?>
         <a href="?cmd=mlsearch&__search&__genres=<?% genres.$id.id %?>"><?% genres.$id.name %?></a>&nbsp;
         <?% END %?>
     </td>
diff --git a/skins/xstyle/mledit.tmpl b/skins/xstyle/mledit.tmpl
index 493dba9..e1e8b62 100644
--- a/skins/xstyle/mledit.tmpl
+++ b/skins/xstyle/mledit.tmpl
@@ -98,7 +98,7 @@
             <select name="__mediatype">
                 <option label="" value="0" <?% IF (data.mediatype || param.mediatype) && (data.mediatype == 0 || param.mediatype == 0) %?>selected="selected"<?% END %?>></option>
                 <?% mediatypes = param.mediatypes %?>
-                <?% FOREACH type = mediatypes %?>
+                <?% FOREACH type IN mediatypes %?>
                 <option label="<?% type.1 %?>" value="<?% type.0 %?>" <?% IF data.mediatype == type.0 || param.mediatype == type.0 %?>selected="selected"<?% END %?>><?% type.1 %?></option>
                 <?% END %?>
             </select>
diff --git a/skins/xstyle/mlist.tmpl b/skins/xstyle/mlist.tmpl
index 3a5d20c..1ac26fd 100644
--- a/skins/xstyle/mlist.tmpl
+++ b/skins/xstyle/mlist.tmpl
@@ -9,7 +9,7 @@
     <th>
         <select name='artists' onChange="di('artist:' + this.form.artists.options[this.form.artists.options.selectedIndex].value, '?cmd=ml&amp;data=')">
         <option value=""> </option>
-    <?% FOREACH ch = param.artists %?>
+    <?% FOREACH ch IN param.artists %?>
         <option value="<?% url( ch.0 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'artist' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 %?></option>
     <?% END %?>
     </select>
@@ -21,7 +21,7 @@
     <th>
     <select name='albums' onChange="di('album:' + this.form.albums.options[this.form.albums.options.selectedIndex].value, '?cmd=ml&amp;data=')">
         <option value=""> </option>
-    <?% FOREACH ch = param.albums %?>
+    <?% FOREACH ch IN param.albums %?>
         <option value="<?% url( ch.0 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'album' && cgi.param('data').split(':').last == ch.0 %?>><?% chop(ch.0,50) %?></option>
     <?% END %?>
     </select>
@@ -40,7 +40,7 @@
     <th>
     <select name='genres' onChange="di('genre:' + this.form.genres.options[this.form.genres.options.selectedIndex].value, '?cmd=ml&amp;data=')">
         <option value=""> </option>
-    <?% FOREACH ch = param.genres %?>
+    <?% FOREACH ch IN param.genres %?>
         <option value="<?% url( ch.1 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 %?></option>
     <?% END %?>
     </select>
@@ -70,7 +70,7 @@
 <a href="#" onClick="reverse(document.musicform)">[<?% gettext("Reverse select") %?>]</a>
         </td>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% IF !oldalbum.defined || zeile.2 != oldalbum %?>
         <tr>
         <td colspan=<?% zeile.size %?>>
@@ -86,7 +86,7 @@
         </td>
         </tr>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
         <?% NEXT IF field.match('^__') %?>
             <th><?% field %?></th>
         <?% END %?>
@@ -94,7 +94,7 @@
         <?% END %?>
         <tr>
             <?% c = -1 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% NEXT IF fields.$c.match('^__') %?>
                 <?% IF c == 0; # Id Field %?>
diff --git a/skins/xstyle/mllistmedias.tmpl b/skins/xstyle/mllistmedias.tmpl
index 123d2ff..a3f6fc2 100644
--- a/skins/xstyle/mllistmedias.tmpl
+++ b/skins/xstyle/mllistmedias.tmpl
@@ -25,7 +25,7 @@
                     <?% IF fields.4 && fields.5 %?>;<?% END %?>
                     <?% IF fields.5 %?>
                         <?% mydirectors = [] %?>
-                        <?% FOREACH director = fields.5.split(',') %?>
+                        <?% FOREACH director IN fields.5.split(',') %?>
                             <?% director = director.replace('^\s+|\s+$','') %?>
                             <?% director = "<a href=\"?cmd=mlsearch&__search&__selfields=director&__searchitem=$director\">$director</a>" %?>
                             <?% mydirectors.push(director) %?>
diff --git a/skins/xstyle/mlnavcontainer.tmpl b/skins/xstyle/mlnavcontainer.tmpl
index c17292c..5f33092 100644
--- a/skins/xstyle/mlnavcontainer.tmpl
+++ b/skins/xstyle/mlnavcontainer.tmpl
@@ -5,7 +5,7 @@
     <li>
         <select name='ranges' onChange="di(this.form.ranges.options[this.form.ranges.options.selectedIndex].value, '?cmd=mllist&__range=')">
             <option value="0"><?% gettext('Ranges') %?></option>
-        <?% FOREACH r = param.ranges %?>
+        <?% FOREACH r IN param.ranges %?>
             <option value='<?% r.first %?>'<?% " selected" IF cgi.param('__range') == r.first %?> ><?% r.last %?></option>
         <?% END %?>
         </select>
diff --git a/skins/xstyle/movetimerlist.tmpl b/skins/xstyle/movetimerlist.tmpl
index afa9e72..906a0ce 100644
--- a/skins/xstyle/movetimerlist.tmpl
+++ b/skins/xstyle/movetimerlist.tmpl
@@ -86,8 +86,8 @@
                 <th><?% gettext('Move timer') %?></th>
                 <th><?% gettext('Change original timer') %?></th>
             </tr>
-     <?% FOREACH zeile = data %?>
-        <?% IF verbose;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+     <?% FOREACH zeile IN data %?>
+        <?% IF verbose;"<!-- Item: ";FOREACH x IN zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?>
         <?% PROCESS Item %?>
      <?% END %?>
diff --git a/skins/xstyle/network.tmpl b/skins/xstyle/network.tmpl
index 314c1f2..a6ba738 100644
--- a/skins/xstyle/network.tmpl
+++ b/skins/xstyle/network.tmpl
@@ -6,7 +6,7 @@
         fields = data.shift;
 
         timestamps = [];
-        FOREACH row = data;
+        FOREACH row IN data;
             iname = row.0.split(':').first;
 
             rxbytes.${iname} = [];
@@ -17,7 +17,7 @@
             oldentry.${iname} = [];
         END;
 
-        FOREACH row = data;
+        FOREACH row IN data;
             IF ot != row.5;
              t = date.format(row.5, '%H:%M');
              timestamps.push(t);
@@ -39,7 +39,7 @@
                 oldentry.${iname} = row;
         END;
 
-        FOREACH iname = rxbytes.keys.sort;
+        FOREACH iname IN rxbytes.keys.sort;
 
             # Data ...
             d = [
@@ -84,7 +84,7 @@
 <h3><?% param.headingText %?></h3>
 <?% END %?>
 <table border="0" width="95%">
-        <?% FOREACH file = statusfiles.keys %?>
+        <?% FOREACH file IN statusfiles.keys %?>
         <tr>
             <td colspan="<?% fields.size %?>" align=center>
                 <img src="<?% statusfiles.$file %?>">
diff --git a/skins/xstyle/now.tmpl b/skins/xstyle/now.tmpl
index 083f55e..3992a93 100644
--- a/skins/xstyle/now.tmpl
+++ b/skins/xstyle/now.tmpl
@@ -34,7 +34,7 @@
     <li><a href="#" onclick="suche('<?% gettext('Please put a time in XX:XX format:') %?>', '?cmd=now&data=', '<?% t %?>', '&__cgrp=<?% cgi.param('__cgrp') %?>')"><?% gettext("Choose time") %?></a></li>
     <li>
         <select name='cgroups' onChange="di(this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value, '?cmd=<?% cgi.param("cmd") %?>&amp;data=<?% param.zeitvon || cgi.param('data') %?>&amp;__cgrp=')">
-        <?% FOREACH cgrp = param.cgroups %?>
+        <?% FOREACH cgrp IN param.cgroups %?>
             <option value='<?% cgrp.last %?>' <?% "selected" IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?>
         <?% END %?>
         </select>
@@ -47,12 +47,12 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;desc=zeile.8;duration=zeile.9 %?>
             <?% IF group != old %?>
                 <tr><td colspan="6" bgcolor='#DDDDDD'>
diff --git a/skins/xstyle/program.tmpl b/skins/xstyle/program.tmpl
index 7d860d9..4c341cc 100644
--- a/skins/xstyle/program.tmpl
+++ b/skins/xstyle/program.tmpl
@@ -7,7 +7,7 @@
 </SCRIPT>
 
 <!-- TableTemplate -->
-<?% FOREACH ch = param.channels %?>
+<?% FOREACH ch IN param.channels %?>
     <?% IF cgi.param('data') == ch.1 || cgi.param('data') == ch.0 || param.current == ch.1 %?>
         <?% channel = ch.0 %?>
         <?% channelpos = ch.1 %?>
@@ -32,12 +32,12 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') || loop.count == 6 %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
             <?% c = 0 %?>
             <?% day = zeile.5 %?>
             <?% IF !oldday.defined || day != oldday %?>
@@ -46,7 +46,7 @@
                 </td></tr>
             <?% END %?>
         <tr class="<?% myclass %?>"<?% IF (loop.count mod 2) == 0 %?> bgcolor='#F5F5F5'<?% END %?>>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% IF c == 1; # Id Field %?>
                 <td>
diff --git a/skins/xstyle/rdisplay.tmpl b/skins/xstyle/rdisplay.tmpl
index 79bc01b..8c45c22 100644
--- a/skins/xstyle/rdisplay.tmpl
+++ b/skins/xstyle/rdisplay.tmpl
@@ -33,7 +33,7 @@
         <td colspan="<?% colspan %?>"><nobr><?%- secold = 0;
         c = -1;
         ml = d.split(',');
-        FOREACH marker = ml;
+        FOREACH marker IN ml;
                 b = c;
                 c = c + 1;
                 m = marker.split(':');
@@ -111,7 +111,7 @@
 <?% IF allow('rconvert') %?>
     <select name='data' onChange="di(this.form.data.options[this.form.data.options.selectedIndex].value, '?cmd=rconvert&amp;data=<?% data.RecordId %?>&amp;__action=save&amp;__cmd=')">
         <option value='0'><?% gettext("Choose a command to edit this recording ...") %?>:</option>
-    <?% FOREACH cmd = param.reccmds %?>
+    <?% FOREACH cmd IN param.reccmds %?>
         <option value='<?% loop.count %?>'><?% cmd %?></option>
     <?% END %?>
     </select>
@@ -125,7 +125,7 @@
     <img src="images/radio.png" alt="" title="<?% gettext('Radio recording') %?>" />
   <?% ELSIF files.size > 0; %?>
         <table border="0" align='left'>
-    <?% FOREACH frame = files %?>
+    <?% FOREACH frame IN files %?>
         <tr>
         <td>
           <img src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" width="200" title="<?% gettext('Television recording') %?> : <?% x=frame / 25;PROCESS hfs d=x %?>" />
@@ -175,7 +175,7 @@
           <td>&nbsp;</td>
 					<td>
                   <?% gettext('Keywords') %?>&nbsp;:&nbsp;
-                  <?% FOREACH keyword = data.keywords %?>
+                  <?% FOREACH keyword IN data.keywords %?>
                       <?% IF allowkeywords %?>
                               <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
                       <?% END %?>
diff --git a/skins/xstyle/report.tmpl b/skins/xstyle/report.tmpl
index 8b5c0b0..a148416 100644
--- a/skins/xstyle/report.tmpl
+++ b/skins/xstyle/report.tmpl
@@ -1,6 +1,6 @@
 <h1><?% gettext("Protocol of the activities") %?></h1>
 
-<?% FOREACH name = data.keys.sort %?>
+<?% FOREACH name IN data.keys.sort %?>
     <h2><?% gettext("Report for module") %?>&nbsp;
         <?% name %?>:</h2>
     <?% IF name == 'RECORDS';
@@ -14,7 +14,7 @@
         END;
      %?>
 
-    <?% FOREACH typ = data.$name.keys.sort %?>
+    <?% FOREACH typ IN data.$name.keys.sort %?>
         <?% IF typ == 'message' %?>
             <?% data.$name.$typ %?><p>
 
@@ -22,7 +22,7 @@
            <?% fields = data.$name.$typ.shift %?>
                 <table>
                     <tr>
-                    <?% FOREACH field = fields %?>
+                    <?% FOREACH field IN fields %?>
                         <?% NEXT IF field.match('^__') %?>
                         <th>
                             <nobr><?% field %?>
@@ -30,10 +30,10 @@
                         </th>
                     <?% END %?>
                     </tr>
-                    <?% FOREACH zeile = data.$name.$typ %?>
+                    <?% FOREACH zeile IN data.$name.$typ %?>
                     <tr>
                         <?% c = -1 %?>
-                        <?% FOREACH field = zeile %?>
+                        <?% FOREACH field IN zeile %?>
                             <?% c = c + 1 %?>
                             <?% NEXT IF fields.$c.match('^__') %?>
                             <td><?% IF link %?><a href="<?% link %?><?% zeile.first %?>"><?% END %?>
diff --git a/skins/xstyle/rlist.tmpl b/skins/xstyle/rlist.tmpl
index 2f595fc..e8f9ccf 100644
--- a/skins/xstyle/rlist.tmpl
+++ b/skins/xstyle/rlist.tmpl
@@ -170,7 +170,7 @@
     <table border="0" width="95%">
         <tr>
         <?% c = -1 %?>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% c = c + 1 %?>
             <?% NEXT IF field.match('^__') %?>
             <th style="white-space: nowrap">
@@ -182,7 +182,7 @@
             </th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;
              duration=zeile.4;start=zeile.5;new=zeile.6;type=zeile.7;folder=zeile.8;fulltitle=zeile.9;
              isrecording=zeile.10;desc=zeile.11;foldertitle=fulltitle.split('~').last -%?>
@@ -201,7 +201,7 @@
             </td>
             <?% ELSE %?>
             <?% c = -1 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
              <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;
                    duration=zeile.4;start=zeile.5;new=zeile.6;type=zeile.7;folder=zeile.8;fulltitle=zeile.9;
                    isrecording=zeile.10;desc=zeile.11;foldertitle=fulltitle.split('~').last -%?>
@@ -238,14 +238,14 @@
             <a href="?cmd=<?% cmd %?><?% daten %?>&amp;__sortby=<?% row %?>&amp;__desc=0" ><img src="images/asc.png"></a><a href="?cmd=<?% cmd %?><?% daten %?>&amp;__sortby=<?% row %?>&amp;__desc=1" ><img src="images/desc.png"></a>&nbsp;|&nbsp;
         <?% END %?>
         <?% gettext('Sorting') %?> :
-    <?% FOREACH row = fields %?>
+    <?% FOREACH row IN fields %?>
       <?% NEXT IF row.match('^__') %?>
         <?% PROCESS SortItem label=row %?>
       <?% END %?>
 <?% END %?>
 
         <?% # ---------------- Folder Display %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
             <?%- 
                 id=zeile.0;
                 eventid=zeile.1;
@@ -269,7 +269,7 @@
         <div style="clear:both"></div>
         <hr style="width:30%; color:yellow; height:1px; border:1px solid #DDD;">
         <?% # ---------------- Record Display %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
             <?%- 
                 id=zeile.0;
                 eventid=zeile.1;
diff --git a/skins/xstyle/schema.tmpl b/skins/xstyle/schema.tmpl
index ca463a0..f87b1a8 100644
--- a/skins/xstyle/schema.tmpl
+++ b/skins/xstyle/schema.tmpl
@@ -41,7 +41,7 @@ sec_height = 0.1;
     <li><a href='?cmd=schema&amp;data=<?% (param.zeitvon - Duration) %?>&amp;__cgrp=<?% param.channelgroup %?>'><?% tt=param.zeitvon - Duration;date.format(tt, '%H:%M') %?>-<?% date.format(param.zeitvon, '%H:%M') %?></a></li>
     <li>
         <select name='cgroups' onChange="di(this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value, '?cmd=schema&amp;data=<?% param.zeitvon %?>&amp;__cgrp=')">
-            <?% FOREACH cgrp = param.cgroups %?>
+            <?% FOREACH cgrp IN param.cgroups %?>
             <option value='<?% cgrp.last %?>' <?% "selected" IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?>
             <?% END %?>
         </select>
@@ -65,7 +65,7 @@ sec_height = 0.1;
 }
 </style>
 <table width='<?% (data.keys.size * 210) %?>'><td>
-<?% FOREACH cpos = data.keys.nsort %?>
+<?% FOREACH cpos IN data.keys.nsort %?>
 <?% channelName = data.$cpos.first.3;
     channelId = data.$cpos.first.4;
     oldend = 0;
@@ -73,7 +73,7 @@ sec_height = 0.1;
 <div id=channel>
     <div id=channeltitle><a href="?cmd=program&data=<?% channelId %?>"><?% channelName %?></a></div>
     <div id=channelcontainer>
-        <?% FOREACH event = data.$cpos %?>
+        <?% FOREACH event IN data.$cpos %?>
             <?% INCLUDE eventbox e=event o=oldend %?>
             <?% oldend = event.10 %?>
         <?% END %?>
diff --git a/skins/xstyle/search.tmpl b/skins/xstyle/search.tmpl
index 5378a2f..7af19f2 100644
--- a/skins/xstyle/search.tmpl
+++ b/skins/xstyle/search.tmpl
@@ -41,7 +41,7 @@
     <td>
     <select name='__channel'>
         <option value="0"><?% gettext('All channels') %?>
-    <?% FOREACH ch = param.channels %?>
+    <?% FOREACH ch IN param.channels %?>
       <?% IF ch.2 && ch.2 != channelgroup %?>
         <?% IF channelgroup %?>
         </optgroup>
@@ -118,12 +118,12 @@
             <?% IF enableform %?>
               <th></th>
             <?% END %?>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') || loop.count == 8 || loop.count == 9 %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
             <?% c = -1 %?>
             <?% day = zeile.7 %?>
             <?% IF !oldday.defined || day != oldday %?>
@@ -132,7 +132,7 @@
                 </td></tr>
             <?% END %?>
             <tr class="<?% myclass %?>"<?% IF (loop.count mod 2) == 0 %?> bgcolor='#F5F5F5'<?% END %?>>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% NEXT IF fields.$c.match('^__') %?>
                 <?% IF c == 0; # Id Field %?>
diff --git a/skins/xstyle/tlist.tmpl b/skins/xstyle/tlist.tmpl
index 0a169eb..610c606 100644
--- a/skins/xstyle/tlist.tmpl
+++ b/skins/xstyle/tlist.tmpl
@@ -35,7 +35,7 @@
         <tr>
         <?% fields = data.shift %?>
         <?% c = -1 %?>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% c = c + 1 %?>
             <?% NEXT IF field.match('^__') or c == 4 %?>
             <th><?% field %?></th>
@@ -47,7 +47,7 @@
             <th width="64"><?% gettext("Selection",7) %?></th>
 <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
             <?% aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
                 pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
                 day = zeile.4;
@@ -66,7 +66,7 @@
             <?% END %?>
             <tr class="<?% myclass %?>" <?% IF (loop.count mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
                 <?% c = -1 %?>
-                <?% FOREACH field = zeile %?>
+                <?% FOREACH field IN zeile %?>
                     <?% c = c + 1 %?>
                     <?% NEXT IF fields.$c.match('^__') or c == 4 %?>
                     <?% IF c == 0; # Id Field %?>
@@ -116,7 +116,7 @@
                     <?% ELSIF c == 7; # Title %?>
                     <td>
                         <?% IF zeile.10 %?><?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field desc=zeile.13 eventid=zeile.10 linkid=zeile.10 ttp_offset=0 %?><?% END %?>
-                        <?% FOREACH f = field.split('~') %?>
+                        <?% FOREACH f IN field.split('~') %?>
                             <div class="<?% myclass %?>"><?% f %?></div>
                         <?% END %?>
                         <?% IF zeile.10 %?></a><?% END %?>
diff --git a/skins/xstyle/topten.tmpl b/skins/xstyle/topten.tmpl
index 8e720fa..3b64971 100755
--- a/skins/xstyle/topten.tmpl
+++ b/skins/xstyle/topten.tmpl
@@ -24,12 +24,12 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% c=0 %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;day = zeile.7;description=zeile.8;
diff --git a/skins/xstyle/ulist.tmpl b/skins/xstyle/ulist.tmpl
index 8f636f8..b77fd77 100644
--- a/skins/xstyle/ulist.tmpl
+++ b/skins/xstyle/ulist.tmpl
@@ -14,16 +14,16 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
         <?% x = -1 %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% x = x + 1 %?>
         <tr class="<?% myclass %?>" <?% IF (x mod 2) != 0 %?>bgcolor='#F5F5F5'<?% END %?>>
             <?% c = 0 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% IF c == 1; # Id Field %?>
                 <td>
diff --git a/skins/xstyle/vdrlist.tmpl b/skins/xstyle/vdrlist.tmpl
index 4fbb418..456a3ef 100644
--- a/skins/xstyle/vdrlist.tmpl
+++ b/skins/xstyle/vdrlist.tmpl
@@ -14,16 +14,16 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
         <?% x = -1 %?>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <?% x = x + 1 %?>
         <tr class="<?% myclass %?>" <?% IF (x mod 2) != 0 %?>bgcolor='#F5F5F5'<?% END %?>>
             <?% c = 0 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% IF c == 1; # Id Field %?>
                 <td>
diff --git a/skins/xstyle/vitals.tmpl b/skins/xstyle/vitals.tmpl
index 9d748b3..22710ae 100644
--- a/skins/xstyle/vitals.tmpl
+++ b/skins/xstyle/vitals.tmpl
@@ -8,7 +8,7 @@
         utildata = [];
         userdata = [];
         timestamps = [];
-        FOREACH item = param.stack;
+        FOREACH item IN param.stack;
             t = date.format(item.timestamp, '%H:%M:%S');
             timestamps.push(t);
             l = item.load.first * 10;
@@ -68,7 +68,7 @@
 <h3><?% param.headingText %?></h3>
 <?% END %?>
 <table border="0" width="95%">
-<?% FOREACH name = data.keys.sort %?>
+<?% FOREACH name IN data.keys.sort %?>
 <tr>
     <td><?% name %?></td>
     <td><?% data.$name %?></td>
diff --git a/skins/xstyle/vtxpage.tmpl b/skins/xstyle/vtxpage.tmpl
index 5223971..ebef3b9 100644
--- a/skins/xstyle/vtxpage.tmpl
+++ b/skins/xstyle/vtxpage.tmpl
@@ -8,7 +8,7 @@
 <table border="0">
 <tr><td><form>
     <select name='chan' onChange="di(this.form.chan.options[this.form.chan.options.selectedIndex].value, '?cmd=vt&amp;channel=')">
-	<?% FOREACH ch = param.channels %?>
+	<?% FOREACH ch IN param.channels %?>
 	    <option value="<?% ch.1 %?>" <?% "selected" IF channel == ch.1 %?>><?% ch.0 %?></option>
 	<?% END %?>
     </select>
@@ -35,7 +35,7 @@
 <?% END %?>
 
 <br />
-<?% FOREACH zeile = data %?>
+<?% FOREACH zeile IN data %?>
 <?% id=zeile.0;page=zeile.1;subpage=zeile.2;channels=zeile.3;prev=zeile.4;next=zeile.5;mtime=zeile.6 %?>
 <div style="float:left; margin:5px;" id="<?% id %?>">
   <h2><?% gettext("Page") %?>&nbsp;<?% page; IF subpage > 0 %?>/<?% subpage; END %?></h2>
diff --git a/skins/xstyle/widgets/checkbox.tmpl b/skins/xstyle/widgets/checkbox.tmpl
index 631db79..a3b09d3 100644
--- a/skins/xstyle/widgets/checkbox.tmpl
+++ b/skins/xstyle/widgets/checkbox.tmpl
@@ -7,9 +7,9 @@
         <?% val = cgi.param(data.NAME) || data.def %?>
         <table style="border:0px solid #000000;"><tr>
         <?% c = 0 %?>
-        <?% FOREACH wert = data.choices %?>
+        <?% FOREACH wert IN data.choices %?>
             <?% "</tr><tr>" IF (c mod 3) == 0 %?>
-            <td><input type="checkbox" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val.grep("^${wert}").size %?> <?% FOREACH p = param.tags; "$p ";END %?>><?% wert %?></td>
+            <td><input type="checkbox" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val.grep("^${wert}").size %?> <?% FOREACH p IN param.tags; "$p ";END %?>><?% wert %?></td>
             <?% c = c + 1 %?>
         <?% END %?>
         </tr></table>
diff --git a/skins/xstyle/widgets/date.tmpl b/skins/xstyle/widgets/date.tmpl
index 565d3f2..67a3dde 100644
--- a/skins/xstyle/widgets/date.tmpl
+++ b/skins/xstyle/widgets/date.tmpl
@@ -22,9 +22,9 @@ function ch_input (checkbox, input) {
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>><br/>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>><br/>
         <?% valarr = val.split(''); z = 0 %?>
-        <?% FOREACH dd = gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
+        <?% FOREACH dd IN gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
         <input type="checkbox" name="Weekday" <?% "checked" IF ! val.search('^\d+') && valarr.$z != '-' %?> onchange='ch_input(this.form.Weekday, this.form.<?% data.NAME %?>)'><?% dd %?>
         <?% z = z + 1;
         END %?>
diff --git a/skins/xstyle/widgets/dir.tmpl b/skins/xstyle/widgets/dir.tmpl
index 38c2358..d529cbb 100644
--- a/skins/xstyle/widgets/dir.tmpl
+++ b/skins/xstyle/widgets/dir.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>
+        <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>
             onBlur="check<?% data.NAME %?>Dir()"><br>
         <span id='id<?% param.count %?>'></span>
     </td>
diff --git a/skins/xstyle/widgets/file.tmpl b/skins/xstyle/widgets/file.tmpl
index 2c41fe4..cbc7c85 100644
--- a/skins/xstyle/widgets/file.tmpl
+++ b/skins/xstyle/widgets/file.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>
+            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>
                 onBlur="check<?% data.NAME %?>File()"><br>
             <span id='id<?% param.count %?>'></span>
     </td>
diff --git a/skins/xstyle/widgets/footer.tmpl b/skins/xstyle/widgets/footer.tmpl
index 1f95f2c..48da67a 100644
--- a/skins/xstyle/widgets/footer.tmpl
+++ b/skins/xstyle/widgets/footer.tmpl
@@ -8,7 +8,7 @@
 		<h2 class="tab">Last Logs</h2>
 
 		<table>
-        <?% FOREACH logline = llog(5) %?>
+        <?% FOREACH logline IN llog(5) %?>
         <tr><td>
             <div style='font-size:10px'><?% logline %?><br></div>
         </td></tr>
@@ -20,7 +20,7 @@
 	<div class="tab-page" id="tabPage2">
 		<h2 class="tab">Benchmark</h2>
             <table width=100%>
-                <?% FOREACH n = data.keys.sort %?>
+                <?% FOREACH n IN data.keys.sort %?>
                     <?% NEXT IF data.$n > 1000 %?>
                     <?% ges = data.$n + ges %?>
                 <tr>
diff --git a/skins/xstyle/widgets/host.tmpl b/skins/xstyle/widgets/host.tmpl
index cf90c8a..0a3d11a 100644
--- a/skins/xstyle/widgets/host.tmpl
+++ b/skins/xstyle/widgets/host.tmpl
@@ -9,7 +9,7 @@
             type="text"
             name="<?% data.NAME %?>"
             value="<?% val %?>"
-            <?% FOREACH p = param.tags; "$p ";END %?>
+            <?% FOREACH p IN param.tags; "$p ";END %?>
             onBlur="check<?% data.NAME %?>Host()"
         ><br/>
         <span id='id<?% param.count %?>'></span>
diff --git a/skins/xstyle/widgets/integer.tmpl b/skins/xstyle/widgets/integer.tmpl
index bbde2c3..315f86c 100644
--- a/skins/xstyle/widgets/integer.tmpl
+++ b/skins/xstyle/widgets/integer.tmpl
@@ -4,6 +4,6 @@
         <?% data.msg %?>
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
-        <input type="text" name="<?% data.NAME %?>" value="<?% cgi.param(data.NAME) || data.def %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+        <input type="text" name="<?% data.NAME %?>" value="<?% cgi.param(data.NAME) || data.def %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
     </td>
 </tr>
diff --git a/skins/xstyle/widgets/list.tmpl b/skins/xstyle/widgets/list.tmpl
index a4bdcf2..a535f08 100644
--- a/skins/xstyle/widgets/list.tmpl
+++ b/skins/xstyle/widgets/list.tmpl
@@ -11,19 +11,19 @@
             <?% values = val %?>
         <?% END %?>
         <?% IF data.options == 'multi' %?>
-            <select name="<?% data.NAME %?>" multiple size="10" <?% FOREACH p = param.tags; "$p ";END %?>>
+            <select name="<?% data.NAME %?>" multiple size="10" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% ELSE %?>
-            <select name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+            <select name="<?% data.NAME %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% END %?>
-            <?% FOREACH l = data.choices %?>
+            <?% FOREACH l IN data.choices %?>
                 <?% sel = '' %?>
                 <?% dis = '' %?>
-                <?% FOREACH valch = values %?>
+                <?% FOREACH valch IN values %?>
 					          <?% IF valch == l.1 %?>
                     <?% sel = ' selected="selected"';LAST %?>
                     <?% END %?>
                 <?% END %?>
-                <?% FOREACH valch = data.disabled %?>
+                <?% FOREACH valch IN data.disabled %?>
 					          <?% IF valch == l.1 %?>
                     <?% dis = ' disabled="disabled"';LAST %?>
                     <?% END %?>
diff --git a/skins/xstyle/widgets/littlemenu.tmpl b/skins/xstyle/widgets/littlemenu.tmpl
index 8ae191f..8cacdfe 100644
--- a/skins/xstyle/widgets/littlemenu.tmpl
+++ b/skins/xstyle/widgets/littlemenu.tmpl
@@ -4,7 +4,7 @@
 <h1><?% data.title %?></h1>
 <?% END %?>
 
-<?% FOREACH l = data.links %?>
+<?% FOREACH l IN data.links %?>
 <?% "<b>" IF data.highlight == l.key %?>
 <a href="<?% l.value.link %?>">[<?% l.value.text %?>]</a>&nbsp;
 <?% "</b>" IF data.highlight == l.key %?>
diff --git a/skins/xstyle/widgets/menu.tmpl b/skins/xstyle/widgets/menu.tmpl
index 5554916..8b90e2e 100644
--- a/skins/xstyle/widgets/menu.tmpl
+++ b/skins/xstyle/widgets/menu.tmpl
@@ -5,7 +5,7 @@
 <?% END %?>
 
 <ul>
-<?% FOREACH field = data %?>
+<?% FOREACH field IN data %?>
     <?% group = field.0; short = field.1; name = field.2; descr = field.3 %?>
     <?% IF ! oldgroup.defined %?>
 <li><?% group %?><ul>
diff --git a/skins/xstyle/widgets/password.tmpl b/skins/xstyle/widgets/password.tmpl
index f6b043e..7a18927 100644
--- a/skins/xstyle/widgets/password.tmpl
+++ b/skins/xstyle/widgets/password.tmpl
@@ -5,7 +5,7 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p = param.tags; "$p ";END %?>><br/>
-        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p = param.tags; "$p ";END %?> title='<?% gettext("Repeat entry") %?>'>
+        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p IN param.tags; "$p ";END %?>><br/>
+        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p IN param.tags; "$p ";END %?> title='<?% gettext("Repeat entry") %?>'>
     </td>
 </tr>
diff --git a/skins/xstyle/widgets/radio.tmpl b/skins/xstyle/widgets/radio.tmpl
index acd42f5..afe953c 100644
--- a/skins/xstyle/widgets/radio.tmpl
+++ b/skins/xstyle/widgets/radio.tmpl
@@ -5,8 +5,8 @@
     </td>
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
-        <?% FOREACH wert = data.choices %?>
-            <input type="radio" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val == wert %?><?% FOREACH p = param.tags; " $p";END %?>><?% wert %?><br>
+        <?% FOREACH wert IN data.choices %?>
+            <input type="radio" name="<?% data.NAME %?>" value="<?% wert %?>" <?% "checked" IF val == wert %?><?% FOREACH p IN param.tags; " $p";END %?>><?% wert %?><br>
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/xstyle/widgets/remote.tmpl b/skins/xstyle/widgets/remote.tmpl
index 942481d..fc5d3a0 100644
--- a/skins/xstyle/widgets/remote.tmpl
+++ b/skins/xstyle/widgets/remote.tmpl
@@ -123,7 +123,7 @@ aktiv = window.setInterval("grab()", inter);
 <tr>
   <td colspan="3" align="center">
       <select style="width:150px;" name="vdr">
-      <?% FOREACH l = param.vdrlist %?>
+      <?% FOREACH l IN param.vdrlist %?>
           <option value='<?% l.1 %?>'<?% IF l.1 == param.vdr %?> selected<?% END %?>><?% l.0 %?></option>
       <?% END %?>
       </select>
@@ -139,7 +139,7 @@ aktiv = window.setInterval("grab()", inter);
 <tr>
   <td colspan="3" align="center">
       <select style="width:150px;" name="channels" onchange="post('?cmd=switch&amp;data='+ this.form.channels.options[this.form.channels.options.selectedIndex].value)">
-      <?% FOREACH l = param.channels %?>
+      <?% FOREACH l IN param.channels %?>
       <?% IF l.2 && l.2 != optgroup %?>
         <?% IF optgroup %?>
         </optgroup>
diff --git a/skins/xstyle/widgets/string.tmpl b/skins/xstyle/widgets/string.tmpl
index f8c4880..1056f21 100644
--- a/skins/xstyle/widgets/string.tmpl
+++ b/skins/xstyle/widgets/string.tmpl
@@ -6,11 +6,11 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <?% IF data.readonly %?>
-        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <span<?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% val %?>
         </span>
         <?% ELSE %?>
-            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/xstyle/widgets/table.tmpl b/skins/xstyle/widgets/table.tmpl
index 109ab56..401c3c0 100644
--- a/skins/xstyle/widgets/table.tmpl
+++ b/skins/xstyle/widgets/table.tmpl
@@ -8,7 +8,7 @@
     <?% IF ! param.hide_HeadRow %?>
     <th width="1%">Name</th><th>Value</th>
     <?% END %?>
-    <?% FOREACH name = data.keys.sort %?>
+    <?% FOREACH name IN data.keys.sort %?>
     <?% NEXT IF name.match('^__') %?>
     <tr>
         <td width="50%"><?% name %?></td><td><?% data.$name %?></td>
@@ -17,7 +17,7 @@
 <?% ELSE %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = fields %?>
+        <?% FOREACH field IN fields %?>
             <?% NEXT IF field.match('^__') %?>
             <th>
                 <nobr><?% field %?>
@@ -29,10 +29,10 @@
             </th>
         <?% END %?>
         </tr>
-        <?% FOREACH zeile = data %?>
+        <?% FOREACH zeile IN data %?>
         <tr>
             <?% c = -1 %?>
-            <?% FOREACH field = zeile %?>
+            <?% FOREACH field IN zeile %?>
                 <?% c = c + 1 %?>
                 <?% NEXT IF fields.$c.match('^__') %?>
                 <td><?% field %?></td>
diff --git a/skins/xstyle/widgets/textfield.tmpl b/skins/xstyle/widgets/textfield.tmpl
index 06296bf..67985e9 100644
--- a/skins/xstyle/widgets/textfield.tmpl
+++ b/skins/xstyle/widgets/textfield.tmpl
@@ -6,11 +6,11 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <?% IF data.readonly %?>
-        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <span<?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% val %?>
         </span>
         <?% ELSE %?>
-            <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?>><?% val | replace("<br />","
+            <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p IN param.tags; "$p ";END %?>><?% val | replace("<br />","
 ")%?></textarea>
         <?% END %?>
     </td>
diff --git a/skins/xstyle/widgets/time.tmpl b/skins/xstyle/widgets/time.tmpl
index 4e984bc..1d2a814 100644
--- a/skins/xstyle/widgets/time.tmpl
+++ b/skins/xstyle/widgets/time.tmpl
@@ -6,11 +6,11 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <?% IF data.readonly %?>
-        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <span<?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% val %?>
         </span>
         <?% ELSE %?>
-            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+            <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p IN param.tags; "$p ";END %?>>
         <?% END %?>
     </td>
 </tr>
-- 
cgit v1.2.3