diff --git a/templates/header.cs b/templates/header.cs
index 425fe4b..da146a3 100644
--- a/templates/header.cs
+++ b/templates/header.cs
@@ -22,7 +22,7 @@
 	<?cs # sort the Plugins - using the most stupid way :) ?>
 	<?cs loop: order = #0, #100, #1
 		?><?cs # plugins ?><?cs each:x = Settings.PluginList
-			?><?cs if:x.Enabled && x.Types.menu && x.Rank == order ?>
+			?><?cs if:x.Types.system && x.Visible.menu && x.Rank == order ?>
 			<?cs call:show_plugin(name(x), 'menu') ?><?cs /if ?><?cs
 			/each ?><?cs
 		/loop ?>
diff --git a/templates/macros.cs b/templates/macros.cs
index 650e049..d514344 100644
--- a/templates/macros.cs
+++ b/templates/macros.cs
@@ -56,7 +56,8 @@ def:show_messageNode(node) ?><?cs
 def:message_dispatch(mname, type, category)
 	?><?cs # split the message name into a (potentially existing) plugin-name prefix and the suffix (the python equivalent of the following three lines would be:
 		plugPrefix, PlugSuffix = mname[0:mname.find(".",8), mname[mname.find(".",8)+1:]
-	?><?cs loop:x = #8, #40, #1 ?><?cs if:(string.slice(mname,x,x+1) == ".") && !(?savedX) ?><?cs set:savedX = x ?><?cs /if ?><?cs /loop
+	?><?cs # initialization ?><?cs set:savedX = 0 ?><?cs
+	loop:x = #8, #40, #1 ?><?cs if:(string.slice(mname,x,x+1) == ".") && !savedX ?><?cs set:savedX = x ?><?cs /if ?><?cs /loop
 	?><?cs set:plugPrefix = string.slice(mname,0,savedX)
 	?><?cs set:plugSuffix = string.slice(mname,savedX+1,string.length(mname))
 	?><?cs # choose the appropriate symbol file
diff --git a/templates/volume_plugins.cs b/templates/volume_plugins.cs
index b23b2e2..b781701 100644
--- a/templates/volume_plugins.cs
+++ b/templates/volume_plugins.cs
@@ -13,7 +13,7 @@
 	<?cs # sort the Plugins - using the most stupid way :) ?>
 	<?cs loop: order = #0, #100, #1
 		?><?cs # plugins ?><?cs each:x = Settings.PluginList
-			?><?cs if:x.Enabled && x.Types.volume && x.Rank == order ?>
+			?><?cs if:x.Types.volume && x.Visible.volume && x.Rank == order ?>
 				<td <?cs if:Data.ActivePlugin == name(x)
 						?>class="volume_plugin_active"<?cs
 					else ?>class="volume_plugin_passive"<?cs