diff --git a/pythonrewrite/templates/form_system.cs b/pythonrewrite/templates/form_system.cs
index 7269960..a12163e 100644
--- a/pythonrewrite/templates/form_system.cs
+++ b/pythonrewrite/templates/form_system.cs
@@ -6,7 +6,7 @@
 
 <?cs # sort the Plugins - using the most stupid way :) ?>
 <?cs loop: order = #0, #100, #1
-	?><?cs # plugins ?><?cs each:x = Lang.Plugins
+	?><?cs # plugins ?><?cs each:x = Settings.PluginList
 		?><?cs if: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
@@ -15,7 +15,7 @@
 /loop ?>
 <?cs # maybe someone forgot to set the rank of a plugin: we try to catch them ?>
 
-<?cs # plugins ?><?cs each:x = Lang.Plugins ?><?cs
+<?cs # plugins ?><?cs each:x = Settings.PluginList ?><?cs
 	if:!x.Rank || !(x.Rank >= 0 && x.Rank <= 100) ?>
 		<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
diff --git a/pythonrewrite/templates/header.cs b/pythonrewrite/templates/header.cs
index ede42a2..8314bc0 100644
--- a/pythonrewrite/templates/header.cs
+++ b/pythonrewrite/templates/header.cs
@@ -11,7 +11,7 @@
 	<meta http-equiv="expires" content="0" />
 	<link rel="shortcut icon" href="/favicon.ico" />
 	<link rel="stylesheet" media="screen" href="<?cs var:Settings.Stylesheet ?>" type="text/css" />
-	<?cs if:Data.Redirect.URL ?><meta http-equiv="refresh" content="<?cs var:Data.Redirect.Delay ?>;url=<?cs var:Data.Redirect.URL ?>" /><?cs
+	<?cs if:?Data.Redirect.URL ?><meta http-equiv="refresh" content="<?cs var:Data.Redirect.Delay ?>;url=<?cs var:Data.Redirect.URL ?>" /><?cs
 	elif:Data.Redirect.Action ?><meta http-equiv="refresh" content="<?cs var:Data.Redirect.Delay ?>;url=<?cs call:link(Data.Redirect.Action,'','','','') ?>" /><?cs /if ?>
 </head>
 <body>
diff --git a/pythonrewrite/templates/main.cs b/pythonrewrite/templates/main.cs
index d5192ef..d11fcbf 100644
--- a/pythonrewrite/templates/main.cs
+++ b/pythonrewrite/templates/main.cs
@@ -3,14 +3,14 @@
 <?cs include:Settings.TemplateDir + '/macros.cs' ?>
 <?cs include:Settings.TemplateDir + '/header.cs' ?>
 
-<!-- chosen cryptobox template: <?cs var:Data.TemplateFile ?> -->
+<!-- chosen cryptobox template: <?cs var:Settings.TemplateFile ?> -->
 
 <?cs if:Data.Error ?>
 	<?cs include:Settings.TemplateDir + '/error.cs' ?>
 <?cs else ?>
 	<?cs if:Data.Warning ?><?cs call:warning(Data.Warning) ?><?cs /if ?>
 	<?cs if:Data.Success ?><?cs call:success(Data.Success) ?><?cs /if ?>
-	<?cs include:Data.TemplateFile ?>
+	<?cs include:Settings.TemplateFile ?>
 <?cs /if ?>
 
 <?cs include:Settings.TemplateDir + '/footer.cs' ?>
diff --git a/pythonrewrite/templates/show_doc.cs b/pythonrewrite/templates/show_doc.cs
index 4f8af80..98966ed 100644
--- a/pythonrewrite/templates/show_doc.cs
+++ b/pythonrewrite/templates/show_doc.cs
@@ -2,6 +2,6 @@
 
 <div id="doc">
 
-<?cs include:Settings.DocDir + '/' + Settings.DocLang + '/' + Data.Doc.Page + '.html' ?>
+<?cs include:Settings.DocDir + '/' + Settings.Language + '/' + Data.Doc.Page + '.html' ?>
 
 </div>
