diff --git a/docs/changelog.txt b/docs/changelog.txt
index 556f0fb..2724af3 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -17,6 +17,7 @@
  - added identifier for events (goffy)
  - multiple selections for checkbox and combobox (goffy)
  - theme xswatch4_wge (goffy)
+ - replacing includeq and foreachq (mamba/goffy)
  
 ==============================================================
 1.0.0 [2022/01/04 9:28:23]
diff --git a/extras/themes/xswatch4_wge/modules/profile/profile_register.tpl b/extras/themes/xswatch4_wge/modules/profile/profile_register.tpl
index 9eb4901..79c5b40 100644
--- a/extras/themes/xswatch4_wge/modules/profile/profile_register.tpl
+++ b/extras/themes/xswatch4_wge/modules/profile/profile_register.tpl
@@ -1,9 +1,9 @@
-<{includeq file="db:profile_breadcrumbs.tpl"}>
+<{include file="db:profile_breadcrumbs.tpl"}>
 
 <{if $steps|@count > 1 AND $current_step >= 0}>
     <div class='register-steps'>
         <span class='caption'><{$lang_register_steps}></span>
-        <{foreachq item=step from=$steps key=stepno name=steploop}>
+        <{foreach item=step from=$steps key=stepno name=steploop}>
             <{if $stepno == $current_step}>
                 <span class='item current'><{$step.step_name}></span>
             <{else}>
@@ -34,7 +34,7 @@
     <{$regform.rendered}>
 <{*
     <h3><{$regform.title}></h3>
-    <{includeq file="db:profile_form.tpl" xoForm=$regform}>
+    <{include file="db:profile_form.tpl" xoForm=$regform}>
 *}>
 <{elseif $finish}>
     <h1><{$finish}></h1>
diff --git a/extras/themes/xswatch4_wge/modules/wglinks/admin/wglinks_admin_about.tpl b/extras/themes/xswatch4_wge/modules/wglinks/admin/wglinks_admin_about.tpl
index 65a81a7..dd88b1c 100644
--- a/extras/themes/xswatch4_wge/modules/wglinks/admin/wglinks_admin_about.tpl
+++ b/extras/themes/xswatch4_wge/modules/wglinks/admin/wglinks_admin_about.tpl
@@ -1,7 +1,7 @@
 <!-- Header -->
-<{includeq file='db:wglinks_admin_header.tpl'}>
+<{include file='db:wglinks_admin_header.tpl'}>
 
 <!-- About Page -->
 <div class="top"><{$about|default:false}></div>
 <!-- Footer -->
-<{includeq file='db:wglinks_admin_footer.tpl'}>
+<{include file='db:wglinks_admin_footer.tpl'}>
diff --git a/extras/themes/xswatch4_wge/modules/wglinks/admin/wglinks_admin_index.tpl b/extras/themes/xswatch4_wge/modules/wglinks/admin/wglinks_admin_index.tpl
index 37e1226..513e879 100644
--- a/extras/themes/xswatch4_wge/modules/wglinks/admin/wglinks_admin_index.tpl
+++ b/extras/themes/xswatch4_wge/modules/wglinks/admin/wglinks_admin_index.tpl
@@ -1,7 +1,7 @@
 <!-- Header -->
-<{includeq file='db:wglinks_admin_header.tpl'}>
+<{include file='db:wglinks_admin_header.tpl'}>
 
 <!-- Index Page -->
 <div class="top"><{$index|default:false}></div>
 <!-- Footer -->
-<{includeq file='db:wglinks_admin_footer.tpl'}>
+<{include file='db:wglinks_admin_footer.tpl'}>
diff --git a/extras/themes/xswatch4_wge/modules/wglinks/wglinks_header.tpl b/extras/themes/xswatch4_wge/modules/wglinks/wglinks_header.tpl
index 07c445f..f07414f 100644
--- a/extras/themes/xswatch4_wge/modules/wglinks/wglinks_header.tpl
+++ b/extras/themes/xswatch4_wge/modules/wglinks/wglinks_header.tpl
@@ -1,3 +1,3 @@
 <{if $show_breadcrumbs|default:false}>
-    <{includeq file='db:wglinks_breadcrumbs.tpl'}>
+    <{include file='db:wglinks_breadcrumbs.tpl'}>
 <{/if}>
diff --git a/extras/themes/xswatch4_wge/modules/wgsitenotice/admin/wgsitenotice_admin_about.tpl b/extras/themes/xswatch4_wge/modules/wgsitenotice/admin/wgsitenotice_admin_about.tpl
index 24857f9..76334a2 100644
--- a/extras/themes/xswatch4_wge/modules/wgsitenotice/admin/wgsitenotice_admin_about.tpl
+++ b/extras/themes/xswatch4_wge/modules/wgsitenotice/admin/wgsitenotice_admin_about.tpl
@@ -1,6 +1,6 @@
 <!-- Header -->
-<{includeq file="db:wgsitenotice_admin_header.tpl"}>
+<{include file="db:wgsitenotice_admin_header.tpl"}>
 <!-- About Page -->
 <div class="top"><{$about|default:''}></div>
 <!-- Footer -->
-<{includeq file="db:wgsitenotice_admin_footer.tpl"}>
\ No newline at end of file
+<{include file="db:wgsitenotice_admin_footer.tpl"}>
\ No newline at end of file
diff --git a/extras/themes/xswatch4_wge/modules/wgsitenotice/admin/wgsitenotice_admin_index.tpl b/extras/themes/xswatch4_wge/modules/wgsitenotice/admin/wgsitenotice_admin_index.tpl
index edb57eb..5a3711a 100644
--- a/extras/themes/xswatch4_wge/modules/wgsitenotice/admin/wgsitenotice_admin_index.tpl
+++ b/extras/themes/xswatch4_wge/modules/wgsitenotice/admin/wgsitenotice_admin_index.tpl
@@ -1,6 +1,6 @@
 <!-- Header -->
-<{includeq file="db:wgsitenotice_admin_header.tpl"}>
+<{include file="db:wgsitenotice_admin_header.tpl"}>
 <!-- Index Page -->
 <div class="top"><{$index|default:''}></div>
 <!-- Footer -->
-<{includeq file="db:wgsitenotice_admin_footer.tpl"}>
\ No newline at end of file
+<{include file="db:wgsitenotice_admin_footer.tpl"}>
\ No newline at end of file
diff --git a/extras/themes/xswatch4_wge/modules/xmcontent/blocks/xmcontent_block.tpl b/extras/themes/xswatch4_wge/modules/xmcontent/blocks/xmcontent_block.tpl
index 1d9c0e1..bdd8643 100644
--- a/extras/themes/xswatch4_wge/modules/xmcontent/blocks/xmcontent_block.tpl
+++ b/extras/themes/xswatch4_wge/modules/xmcontent/blocks/xmcontent_block.tpl
@@ -3,7 +3,7 @@
 	<h2><{$block.title}></h2>
 	<{/if}>
 	<{foreach item=b_template from=$block.template}>
-		<{includeq file="$b_template"}>
+		<{include file="$b_template"}>
 	<{/foreach}>
 <{else}>
 	<{if $block.warning != ''}>
diff --git a/extras/themes/xswatch4_wge/modules/xmcontent/xmcontent_viewcontent.tpl b/extras/themes/xswatch4_wge/modules/xmcontent/xmcontent_viewcontent.tpl
index 702e34d..e6e7055 100644
--- a/extras/themes/xswatch4_wge/modules/xmcontent/xmcontent_viewcontent.tpl
+++ b/extras/themes/xswatch4_wge/modules/xmcontent/xmcontent_viewcontent.tpl
@@ -2,7 +2,7 @@
 	<{if $content_dotitle == 1}>
 	<h2><{$content_title}></h2>
 	<{/if}>
-	<{includeq file="$content_template"}>
+	<{include file="$content_template"}>
 <{else}>
 	<{if $content_warning != ''}>
 		<div class="row">
diff --git a/templates/admin/wgevents_admin_about.tpl b/templates/admin/wgevents_admin_about.tpl
index 5d59896..d7e514c 100644
--- a/templates/admin/wgevents_admin_about.tpl
+++ b/templates/admin/wgevents_admin_about.tpl
@@ -1,8 +1,8 @@
 <!-- Header -->
-<{includeq file='db:wgevents_admin_header.tpl' }>
+<{include file='db:wgevents_admin_header.tpl' }>
 
 <!-- About Page -->
 <div class="top"><{$about|default:false}></div>
 
 <!-- Footer -->
-<{includeq file='db:wgevents_admin_footer.tpl' }>
+<{include file='db:wgevents_admin_footer.tpl' }>
diff --git a/templates/admin/wgevents_admin_index.tpl b/templates/admin/wgevents_admin_index.tpl
index 7dd3dd8..9ad9b9e 100644
--- a/templates/admin/wgevents_admin_index.tpl
+++ b/templates/admin/wgevents_admin_index.tpl
@@ -1,8 +1,8 @@
 <!-- Header -->
-<{includeq file='db:wgevents_admin_header.tpl' }>
+<{include file='db:wgevents_admin_header.tpl' }>
 
 <!-- Index Page -->
 <div class="top"><{$index|default:false}></div>
 
 <!-- Footer -->
-<{includeq file='db:wgevents_admin_footer.tpl' }>
+<{include file='db:wgevents_admin_footer.tpl' }>
diff --git a/templates/wgevents_header.tpl b/templates/wgevents_header.tpl
index 03da7af..343bbee 100644
--- a/templates/wgevents_header.tpl
+++ b/templates/wgevents_header.tpl
@@ -1,5 +1,5 @@
 <{if $xoBreadcrumbs|default:''}>
-    <{includeq file='db:wgevents_breadcrumbs.tpl' }>
+    <{include file='db:wgevents_breadcrumbs.tpl' }>
 <{/if}>
 <{if $ads|default:''}>
     <div class='center'><{$ads|default:false}></div>