diff --git a/apps/bridge/app.rc b/apps/bridge/app.rc
index 7348e59..60850e3 100644
--- a/apps/bridge/app.rc
+++ b/apps/bridge/app.rc
@@ -31,7 +31,7 @@ fn bridge_init {
                 ll_add handlers_body_foot template apps/bridge/foot.tpl
         }
         if not if(~ $REQUEST_METHOD GET)
-            ll_add handlers_body_foot echo '<hr /><p>To post a comment you need to <a href="/_users/login">login</a> first.</p>'
+            ll_add handlers_body_foot echo '<hr><p>To post a comment you need to <a href="/_users/login">login</a> first.</p>'
     }
 }
 
diff --git a/apps/bridge/comments_list.tpl b/apps/bridge/comments_list.tpl
index abaad55..03e0ddc 100644
--- a/apps/bridge/comments_list.tpl
+++ b/apps/bridge/comments_list.tpl
@@ -1,4 +1,4 @@
-<hr />
+<hr>
 <h2>Comments</h2>
 
 % for(c in `{ls $comments_dir/}) {
@@ -6,8 +6,8 @@
         <div class="comment">
             <h5>By: <i>%(`{cat $c/user}%)</i></b> (%(`{cat $c/posted}%))
         </h5>
-%       cat $c/body | escape_html | sed 's,$,<br />,'
-        <hr /></div>
+%       cat $c/body | escape_html | sed 's,$,<br>,'
+        <hr></div>
 %    }
 % }
 
diff --git a/apps/bridge/foot.tpl b/apps/bridge/foot.tpl
index 84d9b81..fba1ed7 100644
--- a/apps/bridge/foot.tpl
+++ b/apps/bridge/foot.tpl
@@ -1,22 +1,22 @@
-<hr />
+<hr>
 
 % notices_handler
 <form action="" method="post">
     <textarea name="comment_text" id="comment_text" cols="80" rows="16">%($"saved_comment_text%)</textarea>
-    <br />
-    <input type="submit" name="bridge_post" value="Post a comment" />
+    <br>
+    <input type="submit" name="bridge_post" value="Post a comment">
 
 % if(~ $#logged_user 0 && ! ~ $#allow_new_user_comments 0) {
     <label>New user name:
-        <input type="text" name="comment_user" value="%($"post_arg_comment_user%)" />
+        <input type="text" name="comment_user" value="%($"post_arg_comment_user%)">
     </label>
 
     <label>Password:
-        <input type="password" name="comment_passwd" value="" />
+        <input type="password" name="comment_passwd" value="">
     </label>
 
     <label>Repeat password:
-        <input type="password" name="comment_passwd2" value="" />
+        <input type="password" name="comment_passwd2" value="">
     </label>
     <div style="font-size: 70%">
     Enter your desired user name/password and after your comment has been reviewed by an admin it will be posted and your account will be enabled. If you are already registered please <a href="/_users/login">login</a> before posting.
diff --git a/apps/dirdir/edit.tpl b/apps/dirdir/edit.tpl
index 9e50638..1a5b206 100644
--- a/apps/dirdir/edit.tpl
+++ b/apps/dirdir/edit.tpl
@@ -1,7 +1,7 @@
 <div>
     <h1>Editing: <a href="%($req_path%)">%($req_path%)</a></h1>
-    <br />
-    <form action="" method="post">
+    <br>
+    <form action="" method="POST">
         <textarea name="edit_text" id="edit_text" cols="80" rows="43">%{
 # FIXME Extra trailing new lines get added to the content somehow, should avoid it.
             if(~ $#post_arg_edit_text 0 && test -f $dirdir_file)
@@ -10,15 +10,15 @@
                 echo -n $post_arg_edit_text | escape_html
 
         %}</textarea>
-        <br />
-        <input type="submit" name="dirdir_save" value="Save"/>
-        <input type="submit" name="dirdir_preview" value="Preview" />
+        <br>
+        <input type="submit" name="dirdir_save" value="Save">
+        <input type="submit" name="dirdir_preview" value="Preview">
         <small>DirDir documents are written using <a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a>.</small>
     </form>
 </div>
 
 % if(! ~ $"post_arg_dirdir_preview '') {
-            <H2>Preview:</H2>
+            <h2>Preview:</h2>
             <div id="preview">
 %               echo $post_arg_edit_text | $formatter
             </div>
diff --git a/tpl/_debug.tpl b/tpl/_debug.tpl
index 597347f..4d650ea 100644
--- a/tpl/_debug.tpl
+++ b/tpl/_debug.tpl
@@ -1,7 +1,7 @@
 % if(! ~ $#debug_shell 0) {
 <form method="POST" name="prompt">
-<input size="80" type="text" name="command" value="%($"post_arg_command%)" />
-<input type="submit" Value="Run" />
+<input size="80" type="text" name="command" value="%($"post_arg_command%)">
+<input type="submit" Value="Run">
 </form>
 <script language="javascript"><!--
 document.prompt.command.focus()
@@ -14,16 +14,16 @@ fn evl {
     rc -c 'flag s +; flag x +;'^$post_arg_command
 }
     if(! ~ $#post_arg_command 0 && ! ~ $#post_arg_command '') {
-        echo '<hr /><pre>'
+        echo '<hr><pre>'
         evl | escape_html |[2] awk '{print "<b>"$0"</b>"}' 
         echo '</pre>'
     }
 %}
 % }
 
-<hr /><pre>
+<hr><pre>
 % env | escape_html
-</pre><hr />
+</pre><hr>
 
 % umask
 
diff --git a/tpl/_users/login.tpl b/tpl/_users/login.tpl
index 7ef856e..5857188 100644
--- a/tpl/_users/login.tpl
+++ b/tpl/_users/login.tpl
@@ -6,13 +6,13 @@
 % if not {
 %    if (~ $REQUEST_METHOD POST)
 %        echo '<div class="notify_errors">Login failed!</div>'
-<form method="post" action="" style="text-align: right; float: left;">
+<form method="POST" action="" style="text-align: right; float: left;">
 <fieldset>
-    <label>User name: <input type="text" name="user_name" value="%($"post_arg_user_name%)"/></label><br />
-    <label>User password: <input type="password" name="user_password" /></label><br />
-    <input name="s" type="submit" value="Login" />
+    <label>User name: <input type="text" name="user_name" value="%($"post_arg_user_name%)"/></label><br>
+    <label>User password: <input type="password" name="user_password"></label><br>
+    <input name="s" type="submit" value="Login">
 </fieldset>
 </form>
 % }
 
-<br style="clear:left" />
+<br style="clear:left">