diff --git a/Chapters/ch01-an-example-application.xml b/Chapters/ch01-an-example-application.xml
index 8816d9a..c128101 100644
--- a/Chapters/ch01-an-example-application.xml
+++ b/Chapters/ch01-an-example-application.xml
@@ -195,7 +195,7 @@ ENDPROC</code>
 
 <code id="list-example-app-init-temp" lang="bbcbasic" title="Initialising the window templates">REM Load the window templates
 
-DIM TemplateName% 12
+DIM TemplateName% 11
 
 SYS &quot;Wimp_OpenTemplate&quot;,,&quot;&lt;PaneDemo$Dir&gt;.Templates&quot;
 
@@ -211,12 +211,12 @@ SYS &quot;Wimp_CloseTemplate&quot;</code>
 
 <p>The code opens the <file>Templates</file> file with <swi>Wimp_OpenTemplate</swi>, then loads the templates for the main window and program information window in turn. For each, a window is created immediately using <swi>Wimp_CreateWindow</swi>, with the handles being stored in the <variable>MainWindow%</variable> and <variable>InfoWindow%</variable> variables respectively. We also take the opportunity to calculate the width and height of the main window in OS&nbsp;Units, and store the values in the <variable>WindowWidth%</variable> and <variable>WindowHeight%</variable> variables for future reference.</p>
 
-<p>The code uses <function>PROCtemplate_load()</function>, which puts a friendly wrapping around the <swi>Wimp_LoadTemplate</swi> SWI and expects there to be a global <variable>TemplateName%</variable> variable pointing to a 12 character plus terminator, word-aligned buffer for holding the template names. Its definition can be seen in <reference id="list-example-app-load-temp" />.</p>
+<p>The code uses <function>PROCtemplate_load()</function>, which puts a friendly wrapping around the <swi>Wimp_LoadTemplate</swi> SWI and expects there to be a global <variable>TemplateName%</variable> variable pointing to a 12 character, word-aligned buffer for holding the template names. Its definition can be seen in <reference id="list-example-app-load-temp" />.</p>
 
 <code id="list-example-app-load-temp" lang="bbcbasic" title="Load a window template into memory">DEF PROCtemplate_load(name$, buffer%, size%, fonts%)
 LOCAL templ_size%, indir_size%, workspace%
 
-$TemplateName% = LEFT$(name$ + STRING$(12, CHR$(13)), 12)
+$TemplateName% = LEFT$(name$, 11)
 
 REM Find the size required for the template and indirected data.
 
diff --git a/Chapters/ch04-column-headings.xml b/Chapters/ch04-column-headings.xml
index a0556b7..568615f 100644
--- a/Chapters/ch04-column-headings.xml
+++ b/Chapters/ch04-column-headings.xml
@@ -70,7 +70,7 @@
 
 <code id="list-col-head-load" lang="bbcbasic" title="Loading the three window templates">REM Load the window templates
 
-DIM TemplateName% 12
+DIM TemplateName% 11
 
 SYS &quot;Wimp_OpenTemplate&quot;,,&quot;&lt;PaneDemo$Dir&gt;.Templates&quot;
 
diff --git a/Downloads/Chapter01/ExampleApp/!PaneDemo/!RunImage,ffb b/Downloads/Chapter01/ExampleApp/!PaneDemo/!RunImage,ffb
index ef386fe..ee13f39 100644
Binary files a/Downloads/Chapter01/ExampleApp/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter01/ExampleApp/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter02/SideBox1/!PaneDemo/!RunImage,ffb b/Downloads/Chapter02/SideBox1/!PaneDemo/!RunImage,ffb
index 1a3c526..74fbbd3 100644
Binary files a/Downloads/Chapter02/SideBox1/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter02/SideBox1/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter02/SideBox2/!PaneDemo/!RunImage,ffb b/Downloads/Chapter02/SideBox2/!PaneDemo/!RunImage,ffb
index 2aaa94c..fa093fa 100644
Binary files a/Downloads/Chapter02/SideBox2/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter02/SideBox2/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter02/SideBox3/!PaneDemo/!RunImage,ffb b/Downloads/Chapter02/SideBox3/!PaneDemo/!RunImage,ffb
index 497b512..38330f3 100644
Binary files a/Downloads/Chapter02/SideBox3/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter02/SideBox3/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter03/TopBar1/!PaneDemo/!RunImage,ffb b/Downloads/Chapter03/TopBar1/!PaneDemo/!RunImage,ffb
index f41e7c6..86c5c0e 100644
Binary files a/Downloads/Chapter03/TopBar1/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter03/TopBar1/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter03/TopBar2/!PaneDemo/!RunImage,ffb b/Downloads/Chapter03/TopBar2/!PaneDemo/!RunImage,ffb
index d31f83f..2784572 100644
Binary files a/Downloads/Chapter03/TopBar2/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter03/TopBar2/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter03/TopBar3/!PaneDemo/!RunImage,ffb b/Downloads/Chapter03/TopBar3/!PaneDemo/!RunImage,ffb
index b30cb02..44fcfc2 100644
Binary files a/Downloads/Chapter03/TopBar3/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter03/TopBar3/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter03/TopBar4/!PaneDemo/!RunImage,ffb b/Downloads/Chapter03/TopBar4/!PaneDemo/!RunImage,ffb
index 2c651bb..8f2f02a 100644
Binary files a/Downloads/Chapter03/TopBar4/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter03/TopBar4/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter04/ColHead1/!PaneDemo/!RunImage,ffb b/Downloads/Chapter04/ColHead1/!PaneDemo/!RunImage,ffb
index b0c02a6..e8695ca 100644
Binary files a/Downloads/Chapter04/ColHead1/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter04/ColHead1/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter04/ColHead2/!PaneDemo/!RunImage,ffb b/Downloads/Chapter04/ColHead2/!PaneDemo/!RunImage,ffb
index 19fd617..0b45604 100644
Binary files a/Downloads/Chapter04/ColHead2/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter04/ColHead2/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter05/ColHead3/!PaneDemo/!RunImage,ffb b/Downloads/Chapter05/ColHead3/!PaneDemo/!RunImage,ffb
index 4818437..7bcf801 100644
Binary files a/Downloads/Chapter05/ColHead3/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter05/ColHead3/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter05/ColHead4/!PaneDemo/!RunImage,ffb b/Downloads/Chapter05/ColHead4/!PaneDemo/!RunImage,ffb
index f046cbd..bea96cf 100644
Binary files a/Downloads/Chapter05/ColHead4/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter05/ColHead4/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter06/NestedFixed/!PaneDemo/!RunImage,ffb b/Downloads/Chapter06/NestedFixed/!PaneDemo/!RunImage,ffb
index b06886d..0c371bd 100644
Binary files a/Downloads/Chapter06/NestedFixed/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter06/NestedFixed/!PaneDemo/!RunImage,ffb differ
diff --git a/Downloads/Chapter06/NestedScroll/!PaneDemo/!RunImage,ffb b/Downloads/Chapter06/NestedScroll/!PaneDemo/!RunImage,ffb
index 14faaa6..33f5cca 100644
Binary files a/Downloads/Chapter06/NestedScroll/!PaneDemo/!RunImage,ffb and b/Downloads/Chapter06/NestedScroll/!PaneDemo/!RunImage,ffb differ