diff --git a/plugins/disks/disks.cs b/plugins/disks/disks.cs
index d345ac0..1f7d369 100644
--- a/plugins/disks/disks.cs
+++ b/plugins/disks/disks.cs
@@ -1,7 +1,6 @@
 <?cs # $Id$ ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.disks.Title.Disks) ?></h1>
-
+<?cs call:show_plugin_title() ?>
 <?cs call:handle_messages() ?>
 
 <?cs if:subcount(Data.Disks) == 0 ?>
diff --git a/plugins/disks/language.hdf b/plugins/disks/language.hdf
index 1705bce..80acea4 100644
--- a/plugins/disks/language.hdf
+++ b/plugins/disks/language.hdf
@@ -1,7 +1,7 @@
 Name	= Disk overview
 Link	= Disks
 
-Title.Disks	= Available disks
+Title	= Available disks
 
 AdviceMessage {
 	NoDisksAvailable {
diff --git a/plugins/plugin-interface.txt b/plugins/plugin-interface.txt
index 819d1ac..a167233 100644
--- a/plugins/plugin-interface.txt
+++ b/plugins/plugin-interface.txt
@@ -70,11 +70,11 @@ Language file structure:
 
 
 Clearsilver template:
-	- heading:
-		- non-volume plugins: "<h1>" 
-		- volume plugins: "<?cs var:plugin_heading ?>" (very important - otherwise
-		  embedding of plugins breaks (see 'volume_properties'))
+	- for a nice title & icon insert: '<?cs call:show_plugin_title()
+	  ?>' at the top of the template
+	  	- define the displayed title with 'Title' in the language file
 	- the title should be followd by '<?cs call:handle_messages() ?>'
+	  this will display important messages
 	- usually you should supply some helpful information afterwards (only displayed
 	  if the user enabled inline-help before):
 	  	"<?cs call:show_help(Lang.Plugins.PLUGINNAME.Help.Text) ?>"
diff --git a/plugins/shutdown/form_shutdown.cs b/plugins/shutdown/form_shutdown.cs
index 8e3e428..fcd569a 100644
--- a/plugins/shutdown/form_shutdown.cs
+++ b/plugins/shutdown/form_shutdown.cs
@@ -1,7 +1,6 @@
 <?cs # $Id$ ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.shutdown.Title.Shutdown) ?></h1>
-
+<?cs call:show_plugin_title() ?>
 <?cs call:handle_messages() ?>
 
 <?cs call:show_help(Lang.Plugins.shutdown.Help.Shutdown) ?>
diff --git a/plugins/shutdown/language.hdf b/plugins/shutdown/language.hdf
index 16f56fa..bb05590 100644
--- a/plugins/shutdown/language.hdf
+++ b/plugins/shutdown/language.hdf
@@ -1,9 +1,11 @@
 Name	= Shutdown or reboot the computer
 Link	= Shutdown
 
-Title.Shutdown	= Shutdown computer
-Title.ProgressShutdown	= The CryptoBox is shutting down
-Title.ProgressReboot	= The CryptoBox is rebooting
+Title	= Shutdown computer
+Title {
+	ProgressShutdown	= The CryptoBox is shutting down
+	ProgressReboot	= The CryptoBox is rebooting
+}
 
 Button.Shutdown	= Poweroff
 Button.Reboot	= Reboot