diff --git a/pythonrewrite/templates/form_config.cs b/pythonrewrite/templates/form_config.cs
deleted file mode 100644
index 28d8742..0000000
--- a/pythonrewrite/templates/form_config.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-<?cs # $Id$ ?>
-
-<div id="config">
-    <h1><?cs var:html_escape(Lang.Title.Config) ?></h1>
-
-      <?cs call:print_form_header("config_do") ?>
-	<?cs if:Data.Config.AdminPasswordIsSet ?>
-			<p><label for="current_admin_password"><?cs var:html_escape(Lang.Text.EnterCurrentAdminPassword) ?></label><br/>
-				<input type="password" id="current_admin_password" name="current_admin_password" size="20" maxlength="40" /> </p>
-	<?cs /if ?>
-
-	<!-- turned off - will get moved to system-settings
-	<p><label for="ip"><?cs var:html_escape(Lang.Text.IPAddress) ?></label><br/>
-		<input type="text" id="ip" size="16" maxsize="15" name="ip" 
-		    value="<?cs var:Data.Config.IP ?>" /><p>
-	-->
-
-	<p><label for="timeout"><?cs var:html_escape(Lang.Text.TimeOut) ?></label><br/>
-		<input type="text" id="timeout" size="5" maxsize="5" name="timeout"
-		    value="<?cs var:Data.Config.TimeOut ?>" /></p>
-
-	<p><label for="language"><?cs var:html_escape(Lang.Text.SelectLanguage) ?></label><br/>
-		<select name="language">
-		    <?cs each:item = Data.Languages ?>
-			<option value="<?cs name:item ?>" <?cs if:(name(item) == Data.Config.Language) ?>selected="selected"<?cs /if ?>><?cs var:item ?></option>
-		    <?cs /each ?>
-		</select></p>
-
-	<button type="submit"><?cs var:html_escape(Lang.Button.SaveConfig) ?></button>
-
-    </form>
-</div>
-
diff --git a/pythonrewrite/templates/form_init.cs b/pythonrewrite/templates/form_init.cs
deleted file mode 100644
index dde6899..0000000
--- a/pythonrewrite/templates/form_init.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-<?cs # $Id$ ?>
-
-<h1><?cs var:html_escape(Lang.Title.Init) ?></h1>
-
-<div class="init">
-	<?cs call:print_form_header("init_do") ?>
-
-		<p class="note"><?cs var:html_escape(Lang.Text.InitWarning) ?></p>
-		<p><label for="confirm"><?cs var:html_escape(Lang.Text.ConfirmInitHint) ?><br/>
-			<span class="note" id="confirmtext"><?cs var:html_escape(Lang.Text.ConfirmInit)
-				?></span></label><br/>
-			<input type="text" id="confirm" name="confirm" size="30" maxlength="50" /></p>
-		<?cs if:Data.Init.isCrypto ?>
-			<p><label for="crypto_password"><?cs var:html_escape(Lang.Text.EnterNewCryptoPassword) ?></label> <input type="password" id="crypto_password" name="crypto_password" /></p>
-			<p><label for="crypto_password2"><?cs var:html_escape(Lang.Text.EnterSameCryptoPassword) ?></label> <input type="password" id="crypto_password2" name="crypto_password2" /></p>
-			<input type="hidden" name="encryption" value="1" />
-		<?cs /if ?>
-		<input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
-		<button type="submit"><?cs var:html_escape(Lang.Button.DoInit) ?></button>
-	</form>
-</div>
-
-<hr/>
-
diff --git a/pythonrewrite/templates/form_init_partition.cs b/pythonrewrite/templates/form_init_partition.cs
deleted file mode 100644
index 860ef78..0000000
--- a/pythonrewrite/templates/form_init_partition.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-<?cs # $Id$ ?>
-
-<h1><?cs var:html_escape(Lang.Title.Init) ?></h1>
-
-<?cs call:print_form_header("volume_init_do") ?>
- 
-	<p class="note"><?cs var:html_escape(Lang.Text.InitWarning) ?></p>
-	<?cs if:Data.Config.AdminPasswordIsSet ?>
-		<p><label for="current_admin_password"><?cs
-			var:html_escape(Lang.Text.EnterCurrentAdminPassword) ?></label><br/>
-			<input type="password" id="current_admin_password" name="current_admin_password"
-				size="20" maxlength="40" /></p><?cs /if ?>
-	<?cs if:Data.CurrentDisk.InitParams.encrypted ?>
-		<p><label for="crypto_password"><?cs var:html_escape(Lang.Text.EnterNewCryptoPassword)
-				?></label><br/>
-			<input type="password" id="crypto_password" name="crypto_password"
-				size="20" maxlength="40" /></p>
-		<p><label for="crypto_password2"><?cs var:html_escape(Lang.Text.EnterSameCryptoPassword)
-				?></label><br/>
-			<input type="password" id="crypto_password2" name="crypto_password2"
-				size="20" maxlength="40" />
-			<input type="hidden" name="encryption" value="selected" /></p>
-	<?cs /if ?>
-			
- 	<p><label for="confirm"><?cs var:html_escape(Lang.Text.ConfirmInitHint) ?><br/>
- 		<span class="note" id="confirmtext"><?cs var:html_escape(Lang.Text.ConfirmInit) ?></span></label><br/>
- 		<input type="text" id="confirm" name="confirm" size="30" maxlength="50" /></p>
-
-	<p><input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-	<button type="submit"><?cs var:html_escape(Lang.Button.InitContainer) ?></button></p>
-</form>
-
diff --git a/pythonrewrite/templates/form_mount.cs b/pythonrewrite/templates/form_mount.cs
deleted file mode 100644
index 9c16061..0000000
--- a/pythonrewrite/templates/form_mount.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-<?cs # $Id$ ?>
-
-<?cs if:subcount(Data.Disks.passive) == 0 ?>
-
-	<?cs call:warning('NoDiskAvailableForMount') ?>
-
-<?cs else ?>
-
-	<h1><?cs var:html_escape(Lang.Title.Mount) ?></h1>
-
-	<div align="center">
-
-		<?cs call:print_form_header("mount_do") ?>
-
-		<?cs if:subcount(Data.Disks.passive) > 1 ?>
-			<p><label for="device"><?cs var:html_escape(Lang.Text.ChoosePartition) ?></label>
-				<select name="device" id="device" size="0">
-					<?cs each:partition = Data.Disks.passive ?><option value="<?cs
-						var:partition.device ?>"><?cs
-						var:partition.name ?></option>
-					<?cs /each ?>
-				</select></p>
-		<?cs else ?>
-			<p><?cs var:html_escape(Lang.Text.ChosenPartition) ?>: <?cs
-				var:Data.Disks.passive.0.name ?></p>
-			<input type="hidden" name="device" value="<?cs
-				var:Data.Disks.passive.0.device ?>"/>
-		<?cs /if ?>
-		<p><label for="crypto_passwort"><?cs var:html_escape(Lang.Text.EnterCurrentCryptoPassword)
-				?></label>
-			<input type="password" id="crypto_password" name="crypto_password" size="20" maxlength="40" /></p>
-
-		<button type="submit"><?cs var:html_escape(Lang.Button.Mount) ?></button>
-
-		</form>
-	</div>
-
-<?cs /if ?>
-
diff --git a/pythonrewrite/templates/form_system.cs b/pythonrewrite/templates/form_system.cs
index 8fdb6a7..cabb930 100644
--- a/pythonrewrite/templates/form_system.cs
+++ b/pythonrewrite/templates/form_system.cs
@@ -7,7 +7,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.Types.system && x.Rank == order ?>
+		?><?cs if:x.Enabled && x.Types.system && x.Rank == order ?>
 			<li><a href="<?cs call:link('plugins/' + name(x),'','','','') ?>" title="<?cs
 					var:html_escape(x.Link) ?>"><?cs var:html_escape(x.Link) ?></a></li><?cs
 			/if ?><?cs
diff --git a/pythonrewrite/templates/form_umount.cs b/pythonrewrite/templates/form_umount.cs
deleted file mode 100644
index 2183413..0000000
--- a/pythonrewrite/templates/form_umount.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-<?cs # $Id$ ?>
-
-<?cs if:Data.activeDisksCount == 0 ?>
-
-	<?cs call:warning('NoDiskAvailableForUmount') ?>
-
-<?cs else ?>
-
-	<h1><?cs var:html_escape(Lang.Title.Umount) ?></h1>
-
-	<div align="center">
-		<?cs call:print_form_header("umount_do") ?>
-
-		<?cs if:Data.activeDisksCount > 1 ?>
-			<p><label for="device"><?cs var:html_escape(Lang.Text.ChoosePartition) ?></label>
-				<select name="device" id="device" size="0">
-					<?cs each:partition = Data.Disks
-					?><?cs if:partition.active ?><option value="<?cs
-						var:partition.device ?>"><?cs
-						var:partition.name ?></option><?cs /if ?>
-					<?cs /each ?>
-				</select></p>
-		<?cs else ?>
-			<?cs # the perl code should take care, that there is at least
-				one mounted disk - otherwise it should display a warning ?>
-			<?cs each:partition = Data.Disks ?><?cs
-				if:partition.active ?><?cs set:act_name = partition.name ?><?cs
-				act_device = partition.device ?><?cs /if ?><?cs /each ?>
-			<p><?cs var:html_escape(Lang.Text.ChosenPartition) ?>: <?cs
-				var:act_name ?></p>
-			<input type="hidden" name="device" value="<?cs
-				var:act_device ?>"/>
-		<?cs /if ?>
-		<button type="submit"><?cs var:html_escape(Lang.Button.Umount) ?></button>
-
-		</form>
-	</div>
-
-<?cs /if ?>
-
diff --git a/pythonrewrite/templates/volume_plugins.cs b/pythonrewrite/templates/volume_plugins.cs
index f0b749f..ed9d14e 100644
--- a/pythonrewrite/templates/volume_plugins.cs
+++ b/pythonrewrite/templates/volume_plugins.cs
@@ -10,7 +10,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.Types.volume && x.Rank == order ?>
+			?><?cs if:x.Enabled && x.Types.volume && x.Rank == order ?>
 				<td <?cs if:Data.ActivePlugin == name(x)
 						?>class="volume_plugin_active"<?cs
 					else ?>class="volume_plugin_passive"<?cs