diff --git a/CodeCorner3.md b/CodeCorner3.md
index ff4833f..429ecab 100644
--- a/CodeCorner3.md
+++ b/CodeCorner3.md
@@ -54,7 +54,7 @@ The optional file <tt>setup.inc.php</tt> in folder <tt>$app/setup</tt>?<br />
 </pre>
 
 <hr style="text-align: left; width: 99%;" /><br />
-Since we had our original application registered manually, we should unregister our baby, to avoid version-number conflicts that may occur, since the manually registered application had no ((VersionNumbers|version number)) at all.<br />
+Since we had our original application registered manually, we should unregister our baby, to avoid version-number conflicts that may occur, since the manually registered application had no Version Number at all.<br />
 So
 <ul>
 	<li>unregister the manually registered test application</li>
@@ -76,7 +76,7 @@ So
 	<li>call the test application.</li>
 </ul>
 It is still there nothing changed so far exept the way we handle the setup.<br />
-With the <tt>setup.inc.php</tt> we tell eGroupware how to handle our application, apply VersionNumbers and all the other fancy stuff we might need later on.<br />
+With the <tt>setup.inc.php</tt> we tell eGroupware how to handle our application, apply Version Numbers and all the other fancy stuff we might need later on.<br />
 &nbsp;
 <h4>Creating an eTemplate for the dialog</h4>
 Now we need a nice edit dialog and use an editor of our choice to do that.<br />
@@ -86,7 +86,7 @@ Assume that we wanted to name our first eTemplate <em>index</em>.<br />
 	<dd>
 	<dl>
 		<dt>Step 1</dt>
-		<dd>create a file <code>index.xet</code> in the <code>templates/default</code> directory of our app <code>test</code>. ... <pre>test/templates/default/index.xet</pre> .</dd>
+		<dd>create a file <code>index.xet</code> in the <code>templates/default</code> directory of our app <code>test</code>:<pre>test/templates/default/index.xet</pre> .</dd>
 	</dl>
 	</dd>
 </dl>
@@ -97,13 +97,13 @@ Assume that we wanted to name our first eTemplate <em>index</em>.<br />
 	<dl>
 		<dt>Step 2</dt>
 		<dd> Enter the basics:
-```
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
-<!-- $Id$ -->
-<overlay>
-</overlay>
-```
+<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd"&gt;
+&lt;!-- $Id$ --&gt;
+&lt;overlay&gt;
+&lt;/overlay&gt;
+</pre>
                 </dd>
 	</dl>
 	</dd>
@@ -115,20 +115,20 @@ Assume that we wanted to name our first eTemplate <em>index</em>.<br />
 	<dl>
 		<dt>Step 3</dt>
 		<dd>put in the basic template structure as it is used througout EGroupware
-```xml
-	<template id="test.index.dates" template="" lang="" group="0" version="1.1.001" >
+<pre>
+	&lt;template id="test.index.dates" template="" lang="" group="0" version="1.1.001" &gt;
 	
-	</template>
-	<template id="test.index.add" template="" lang="" group="0" version="1.1.001">
+	&lt;/template&gt;
+	&lt;template id="test.index.add" template="" lang="" group="0" version="1.1.001"&gt;
 	
-	</template>
-	<template id="test.index.rows" template="" lang="" group="0" version="1.1.001">
+	&lt;/template&gt;
+	&lt;template id="test.index.rows" template="" lang="" group="0" version="1.1.001"&gt;
 
-	</template>
-	<template id="test.index" template="" lang="" group="0" version="1.9.001">
-		<nextmatch id="nm" options="test.index.rows" header_left="test.index.add" header_right="test.index.dates"/>
-	</template>
-```
+	&lt;/template&gt;
+	&lt;template id="test.index" template="" lang="" group="0" version="1.9.001"&gt;
+		&lt;nextmatch id="nm" options="test.index.rows" header_left="test.index.add" header_right="test.index.dates"/&gt;
+	&lt;/template&gt;
+</pre>
 </dd>
 	</dl>