diff --git a/create.sh b/create.sh
index 8cac62d..ac64afd 100755
--- a/create.sh
+++ b/create.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
+# 
+#  Copyright: ©2006–2010, Laurence Withers.
+#  Author: Laurence Withers <l@lwithers.me.uk>
+#  License: GPLv3
 #
-#  (c)2009, Laurence Withers. Released under the GNU GPL. See file
-#  COPYING for details.
 #
 
 
@@ -53,6 +55,11 @@ then
     exit 1
 fi
 do_cmd source "${LWBUILDRC}" || exit 1
+if [ -z "${COPYRIGHT}" ]
+then
+    echo "You now need to set COPYRIGHT= in ~/.lwbuildrc ."
+    exit 1
+fi
 
 
 
@@ -84,8 +91,8 @@ do_cmd find . -type f -exec sed \
 	-e "s,@P@,${P},g" \
 	-e "s,@AUTHOR@,${AUTHOR},g" \
     -e "s,@EMAIL@,${EMAIL},g" \
+    -e "s,@COPYRIGHT@,${COPYRIGHT},g" \
 	-e "s,@YEAR@,${YEAR},g" \
-    -e "s,@KATE_MODELINE@,${KATE_MODELINE},g" \
     -e "s,@VIM_MODELINE@,${VIM_MODELINE},g" \
 	-i {} \; || exit 1
 
@@ -97,5 +104,4 @@ echo "    ======== TODO list ========"
 find . -type f -a -not -path './scripts/build.*' -exec grep -Hrn @TODO@ {} \;
 print_success "Done"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: expandtab:ts=4:sw=4
diff --git a/install-symlinks.sh b/install-symlinks.sh
index 9ac1c83..e9517e1 100755
--- a/install-symlinks.sh
+++ b/install-symlinks.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
-#
-#  (c)2009, Laurence Withers. Released under the GNU GPL. See file
-#  COPYING for details.
+# 
+#  Copyright: ©2006–2010, Laurence Withers.
+#  Author: Laurence Withers <l@lwithers.me.uk>
+#  License: GPLv3
 #
 
 [ -z "${VERBOSE}" ] && VERBOSE="0"
@@ -59,5 +60,4 @@ echo "  ${SCRIPT_ROOT}/scripts/  ->  ${PROJECT_ROOT}/scripts/"
 do_cmd ln -s ${SCRIPT_ROOT}/scripts/* scripts/ || exit 1
 print_success "Done"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: expandtab:ts=4:sw=4
diff --git a/scripts/build.app.c++-qt/000_TopSource.cpp b/scripts/build.app.c++-qt/000_TopSource.cpp
index 77e982e..00b1687 100644
--- a/scripts/build.app.c++-qt/000_TopSource.cpp
+++ b/scripts/build.app.c++-qt/000_TopSource.cpp
@@ -1,13 +1,12 @@
 /* @P@/src/@NAME@/000_TopSource.cpp
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 // Below are all the includes used throughout the application.
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.app.c++-qt/build.app b/scripts/build.app.c++-qt/build.app
index 67568a0..b399600 100644
--- a/scripts/build.app.c++-qt/build.app
+++ b/scripts/build.app.c++-qt/build.app
@@ -6,7 +6,7 @@
 if [ -z ${@CNAME@_BUILT} ]
 then
     @CNAME@="obj/@NAME@"
-    EXTRAS="${QTSTUFF}" # @TODO@ cflags, libs
+    EXTRAS="-D_GNU_SOURCE -DAPP_NAME=\"@NAME@\" ${QTSTUFF}" # TODO: more flags
 
     echo "Building application ${@CNAME@}..."
 
@@ -37,5 +37,4 @@ then
 
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c++-qt/build.install-app b/scripts/build.app.c++-qt/build.install-app
index 00d58b2..bc84449 100644
--- a/scripts/build.app.c++-qt/build.install-app
+++ b/scripts/build.app.c++-qt/build.install-app
@@ -8,5 +8,4 @@ echo "Installing binaries into '${@DEST_BINDIR@}'"
 install_file "${@CNAME@}" "${@DEST_BINDIR@}" 0755 || return 1
 print_success "Done"
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c++-qt/build.monolithic b/scripts/build.app.c++-qt/build.monolithic
index 25a9f2f..1cd89c0 100644
--- a/scripts/build.app.c++-qt/build.monolithic
+++ b/scripts/build.app.c++-qt/build.monolithic
@@ -23,5 +23,4 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c++-qt/instantiate b/scripts/build.app.c++-qt/instantiate
index 0acb289..25c3d99 100644
--- a/scripts/build.app.c++-qt/instantiate
+++ b/scripts/build.app.c++-qt/instantiate
@@ -14,5 +14,4 @@ add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 add_config_option "QTSTUFF" "${COPT_QTSTUFF_DEFAULT}"
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.app.c++/000_TopSource.cpp b/scripts/build.app.c++/000_TopSource.cpp
index ba43316..9799177 100644
--- a/scripts/build.app.c++/000_TopSource.cpp
+++ b/scripts/build.app.c++/000_TopSource.cpp
@@ -1,13 +1,12 @@
 /* @P@/src/@NAME@/TopSource.cpp
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 // Below are all the includes used throughout the application.
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.app.c++/build.app b/scripts/build.app.c++/build.app
index 9b524d5..38b2fef 100644
--- a/scripts/build.app.c++/build.app
+++ b/scripts/build.app.c++/build.app
@@ -6,7 +6,7 @@
 if [ -z ${@CNAME@_BUILT} ]
 then
     @CNAME@="obj/@NAME@"
-    EXTRAS="" # @TODO@ cflags, libs
+    EXTRAS="-D_GNU_SOURCE -DAPP_NAME=\"@NAME@\"" # TODO: more flags
 
     echo "Building application ${@CNAME@}..."
 
@@ -37,5 +37,4 @@ then
 
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c++/build.install-app b/scripts/build.app.c++/build.install-app
index 00d58b2..bc84449 100644
--- a/scripts/build.app.c++/build.install-app
+++ b/scripts/build.app.c++/build.install-app
@@ -8,5 +8,4 @@ echo "Installing binaries into '${@DEST_BINDIR@}'"
 install_file "${@CNAME@}" "${@DEST_BINDIR@}" 0755 || return 1
 print_success "Done"
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c++/build.monolithic b/scripts/build.app.c++/build.monolithic
index 7d331e8..4a774c8 100644
--- a/scripts/build.app.c++/build.monolithic
+++ b/scripts/build.app.c++/build.monolithic
@@ -14,5 +14,4 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c++/instantiate b/scripts/build.app.c++/instantiate
index 1c9a04a..6aaf6ee 100644
--- a/scripts/build.app.c++/instantiate
+++ b/scripts/build.app.c++/instantiate
@@ -13,5 +13,4 @@ add_config_option "CXX" "${COPT_CXX_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.app.c/000_TopSource.c b/scripts/build.app.c/000_TopSource.c
index bd23796..8d21882 100644
--- a/scripts/build.app.c/000_TopSource.c
+++ b/scripts/build.app.c/000_TopSource.c
@@ -1,13 +1,12 @@
 /* @P@/src/@NAME@/000_TopSource.c
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 /* Below are all the includes used throughout the application. */
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.app.c/build.app b/scripts/build.app.c/build.app
index df73192..adbaa23 100644
--- a/scripts/build.app.c/build.app
+++ b/scripts/build.app.c/build.app
@@ -6,7 +6,7 @@
 if [ -z ${@CNAME@_BUILT} ]
 then
     @CNAME@="obj/@NAME@"
-    EXTRAS="" # @TODO@ cflags, libs
+    EXTRAS="-std=gnu99 -D_GNU_SOURCE -DAPP_NAME=\"@NAME@\"" # TODO: more flags
 
     echo "Building application ${@CNAME@}..."
 
@@ -37,5 +37,4 @@ then
 
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c/build.install-app b/scripts/build.app.c/build.install-app
index 00d58b2..bc84449 100644
--- a/scripts/build.app.c/build.install-app
+++ b/scripts/build.app.c/build.install-app
@@ -8,5 +8,4 @@ echo "Installing binaries into '${@DEST_BINDIR@}'"
 install_file "${@CNAME@}" "${@DEST_BINDIR@}" 0755 || return 1
 print_success "Done"
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c/build.monolithic b/scripts/build.app.c/build.monolithic
index c69d732..053b600 100644
--- a/scripts/build.app.c/build.monolithic
+++ b/scripts/build.app.c/build.monolithic
@@ -14,5 +14,4 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c/instantiate b/scripts/build.app.c/instantiate
index 9773141..d2a678d 100644
--- a/scripts/build.app.c/instantiate
+++ b/scripts/build.app.c/instantiate
@@ -13,5 +13,4 @@ add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.app.sh/build.install-app b/scripts/build.app.sh/build.install-app
index c3b3ec7..f2702db 100644
--- a/scripts/build.app.sh/build.install-app
+++ b/scripts/build.app.sh/build.install-app
@@ -9,5 +9,4 @@ do
 done
 print_success "Done"
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.sh/instantiate b/scripts/build.app.sh/instantiate
index ab30e7b..363031d 100644
--- a/scripts/build.app.sh/instantiate
+++ b/scripts/build.app.sh/instantiate
@@ -11,5 +11,4 @@ esac
 do_parameter_subst DEST_BINDIR
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.docs.doxygen/Doxyfile.in b/scripts/build.docs.doxygen/Doxyfile.in
index 15b5cea..0edf187 100644
--- a/scripts/build.docs.doxygen/Doxyfile.in
+++ b/scripts/build.docs.doxygen/Doxyfile.in
@@ -1,8 +1,8 @@
 # @P@/src/@NAME@/Doxyfile.in
 #
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@ <@EMAIL@>
+#  License: GPLv3
 #
 
 DOXYFILE_ENCODING      = UTF-8
diff --git a/scripts/build.docs.doxygen/MainPage.dox b/scripts/build.docs.doxygen/MainPage.dox
index 2abbeac..c75e493 100644
--- a/scripts/build.docs.doxygen/MainPage.dox
+++ b/scripts/build.docs.doxygen/MainPage.dox
@@ -1,15 +1,14 @@
 /* @P@/src/@NAME@/MainPage.dox
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 /*! \mainpage
 
 */
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@:syntax=doxygen
 */
diff --git a/scripts/build.docs.doxygen/build.docs b/scripts/build.docs.doxygen/build.docs
index 6be6f9d..02330bc 100644
--- a/scripts/build.docs.doxygen/build.docs
+++ b/scripts/build.docs.doxygen/build.docs
@@ -39,5 +39,4 @@ then
     @CNAME@_BUILT=1
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.docs.doxygen/build.install-docs b/scripts/build.docs.doxygen/build.install-docs
index a228999..6109d47 100644
--- a/scripts/build.docs.doxygen/build.install-docs
+++ b/scripts/build.docs.doxygen/build.install-docs
@@ -17,5 +17,4 @@ do
 done
 
 print_success "Documentation installed"
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.docs.doxygen/instantiate b/scripts/build.docs.doxygen/instantiate
index 0cf761b..9522da9 100644
--- a/scripts/build.docs.doxygen/instantiate
+++ b/scripts/build.docs.doxygen/instantiate
@@ -7,5 +7,4 @@ fi
 do_parameter_subst
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.docs.none/build.install-docs b/scripts/build.docs.none/build.install-docs
index 181a453..3ea1b55 100644
--- a/scripts/build.docs.none/build.install-docs
+++ b/scripts/build.docs.none/build.install-docs
@@ -10,5 +10,4 @@ do
 done
 
 print_success "Documentation installed"
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.docs.none/instantiate b/scripts/build.docs.none/instantiate
index 0cf761b..9522da9 100644
--- a/scripts/build.docs.none/instantiate
+++ b/scripts/build.docs.none/instantiate
@@ -7,5 +7,4 @@ fi
 do_parameter_subst
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.files.none/build.install-files b/scripts/build.files.none/build.install-files
index 632ed41..8407df2 100644
--- a/scripts/build.files.none/build.install-files
+++ b/scripts/build.files.none/build.install-files
@@ -12,5 +12,4 @@ do
 done
 
 print_success "Files installed"
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.files.none/instantiate b/scripts/build.files.none/instantiate
index 0cf761b..9522da9 100644
--- a/scripts/build.files.none/instantiate
+++ b/scripts/build.files.none/instantiate
@@ -7,5 +7,4 @@ fi
 do_parameter_subst
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.firmware.gpasm/000_TopSource.asm b/scripts/build.firmware.gpasm/000_TopSource.asm
index 495eadc..7fc1b21 100644
--- a/scripts/build.firmware.gpasm/000_TopSource.asm
+++ b/scripts/build.firmware.gpasm/000_TopSource.asm
@@ -1,8 +1,8 @@
 ; @P@/src/@NAME@/TopSource.asm
 ;
-;  (c)2010, @AUTHOR@, <@EMAIL@>.
-;  Released under the GNU GPLv3. See file COPYING or
-;  http://www.gnu.org/copyleft/gpl.html for details.
+;  Copyright: ©@YEAR@, @COPYRIGHT@
+;  Author: @AUTHOR@ <@EMAIL@>
+;  License: GPLv3
 ;
 
 	; include processor definitions
@@ -12,5 +12,4 @@
 	__CONFIG A & B
 
 ; options for text editors
-; kate: @KATE_MODELINE@
 ; vim: @VIM_MODELINE@
diff --git a/scripts/build.firmware.gpasm/BottomSource.asm b/scripts/build.firmware.gpasm/BottomSource.asm
index 01a77a0..91bb855 100644
--- a/scripts/build.firmware.gpasm/BottomSource.asm
+++ b/scripts/build.firmware.gpasm/BottomSource.asm
@@ -1,13 +1,12 @@
 ; @P@/src/@NAME@/BottomSource.asm
 ;
-;  (c)2010, @AUTHOR@, <@EMAIL@>.
-;  Released under the GNU GPLv3. See file COPYING or
-;  http://www.gnu.org/copyleft/gpl.html for details.
+;  Copyright: ©@YEAR@, @COPYRIGHT@
+;  Author: @AUTHOR@ <@EMAIL@>
+;  License: GPLv3
 ;
 
 	; EOF
 	END
 
 ; options for text editors
-; kate: @KATE_MODELINE@
 ; vim: @VIM_MODELINE@
diff --git a/scripts/build.firmware.gpasm/build.firmware b/scripts/build.firmware.gpasm/build.firmware
index d9fe502..899206d 100644
--- a/scripts/build.firmware.gpasm/build.firmware
+++ b/scripts/build.firmware.gpasm/build.firmware
@@ -38,5 +38,4 @@ then
 
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.gpasm/build.install-firmware b/scripts/build.firmware.gpasm/build.install-firmware
index 9e75af1..b44bc0e 100644
--- a/scripts/build.firmware.gpasm/build.install-firmware
+++ b/scripts/build.firmware.gpasm/build.install-firmware
@@ -8,5 +8,4 @@ echo "Installing firmware into '${HEXDIR}'"
 install_file "${@CNAME@}" "${HEXDIR}" 0755 || return 1
 print_success "Done"
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.gpasm/build.monolithic b/scripts/build.firmware.gpasm/build.monolithic
index d6c7529..27c8e6c 100644
--- a/scripts/build.firmware.gpasm/build.monolithic
+++ b/scripts/build.firmware.gpasm/build.monolithic
@@ -14,5 +14,4 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.gpasm/instantiate b/scripts/build.firmware.gpasm/instantiate
index 5fc8433..fd82515 100644
--- a/scripts/build.firmware.gpasm/instantiate
+++ b/scripts/build.firmware.gpasm/instantiate
@@ -10,5 +10,4 @@ add_config_option "GPASM" "gpasm"
 add_config_option "GPASM_FLAGS" ""
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.firmware.sdcc/000_TopSource.c b/scripts/build.firmware.sdcc/000_TopSource.c
index bd23796..8d21882 100644
--- a/scripts/build.firmware.sdcc/000_TopSource.c
+++ b/scripts/build.firmware.sdcc/000_TopSource.c
@@ -1,13 +1,12 @@
 /* @P@/src/@NAME@/000_TopSource.c
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 /* Below are all the includes used throughout the application. */
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.firmware.sdcc/build.firmware b/scripts/build.firmware.sdcc/build.firmware
index 044bd37..7612ca4 100644
--- a/scripts/build.firmware.sdcc/build.firmware
+++ b/scripts/build.firmware.sdcc/build.firmware
@@ -37,5 +37,4 @@ then
 
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.sdcc/build.install-firmware b/scripts/build.firmware.sdcc/build.install-firmware
index 9e75af1..b44bc0e 100644
--- a/scripts/build.firmware.sdcc/build.install-firmware
+++ b/scripts/build.firmware.sdcc/build.install-firmware
@@ -8,5 +8,4 @@ echo "Installing firmware into '${HEXDIR}'"
 install_file "${@CNAME@}" "${HEXDIR}" 0755 || return 1
 print_success "Done"
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.sdcc/build.monolithic b/scripts/build.firmware.sdcc/build.monolithic
index 146195d..b617509 100644
--- a/scripts/build.firmware.sdcc/build.monolithic
+++ b/scripts/build.firmware.sdcc/build.monolithic
@@ -14,5 +14,4 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.sdcc/instantiate b/scripts/build.firmware.sdcc/instantiate
index ef12e8a..bc0677d 100644
--- a/scripts/build.firmware.sdcc/instantiate
+++ b/scripts/build.firmware.sdcc/instantiate
@@ -10,5 +10,4 @@ add_config_option "SDCC" "sdcc"
 add_config_option "SDCCFLAGS" ""
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.lib.c++/000_TopHeader.h b/scripts/build.lib.c++/000_TopHeader.h
index 0705064..8bbd80a 100644
--- a/scripts/build.lib.c++/000_TopHeader.h
+++ b/scripts/build.lib.c++/000_TopHeader.h
@@ -1,9 +1,9 @@
 /* @P@/src/@NAME@/000_TopHeader.h
- *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ * 
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 #ifndef HEADER_@CNAME@
 #define HEADER_@CNAME@
@@ -11,6 +11,5 @@
 // standard includes, or includes needed for type declarations
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@:syntax=cpp.doxygen
 */
diff --git a/scripts/build.lib.c++/000_TopSource.cpp b/scripts/build.lib.c++/000_TopSource.cpp
index d309701..3132ec6 100644
--- a/scripts/build.lib.c++/000_TopSource.cpp
+++ b/scripts/build.lib.c++/000_TopSource.cpp
@@ -1,15 +1,14 @@
 /* @P@/src/@NAME@/TopSource.cpp
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 #include "@HEADER_NAME@"
 
 // Below are all the includes used throughout the library.
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.lib.c++/999_BottomHeader.h b/scripts/build.lib.c++/999_BottomHeader.h
index b1a4eac..21d963e 100644
--- a/scripts/build.lib.c++/999_BottomHeader.h
+++ b/scripts/build.lib.c++/999_BottomHeader.h
@@ -1,13 +1,12 @@
 /* @P@/src/@NAME@/999_BottomHeader.h
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 #endif
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@:syntax=cpp.doxygen
 */
diff --git a/scripts/build.lib.c++/build.install-lib b/scripts/build.lib.c++/build.install-lib
index adb6364..055b306 100644
--- a/scripts/build.lib.c++/build.install-lib
+++ b/scripts/build.lib.c++/build.install-lib
@@ -32,5 +32,4 @@ do_cmd_redir "${CONFFILE}" sed \
 do_cmd chmod 0644 "${CONFFILE}"
 print_success "Done"
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c++/build.lib b/scripts/build.lib.c++/build.lib
index f417ffb..792dab2 100644
--- a/scripts/build.lib.c++/build.lib
+++ b/scripts/build.lib.c++/build.lib
@@ -14,7 +14,8 @@ then
     @CNAME@="obj/${@CNAME@_BASE}.so.${SOMAJOR}.${SOMICRO}"
     @CNAME@_DEP_CFLAGS="" # @TODO@ cflags
     @CNAME@_DEP_LIBS="" # @TODO@ libs
-    SO_EXTRA="${@CNAME@_DEP_CFLAGS} ${@CNAME@_DEP_LIBS} -lstdc++ -lc"
+    SO_EXTRA="${@CNAME@_DEP_CFLAGS} ${@CNAME@_DEP_LIBS} -lstdc++ -lc \
+        -D_GNU_SOURCE"
 
     echo "Building library ${@CNAME@}..."
 
@@ -51,5 +52,5 @@ then
     @CNAME@_HEADER=${HDR}
 
 fi
-# kate: @KATE_MODELINE@
+
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c++/build.monolithic b/scripts/build.lib.c++/build.monolithic
index 38d4cd0..64ad876 100644
--- a/scripts/build.lib.c++/build.monolithic
+++ b/scripts/build.lib.c++/build.monolithic
@@ -17,5 +17,5 @@ then
     @CNAME@_MONOLITHIC=1
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
 fi
-# kate: @KATE_MODELINE@
+
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c++/config-script b/scripts/build.lib.c++/config-script
index d3e4b02..a63913e 100644
--- a/scripts/build.lib.c++/config-script
+++ b/scripts/build.lib.c++/config-script
@@ -94,5 +94,4 @@ true
 
 
 
-# vim: syntax=sh:@VIM_MODELINE@
 # kate: @KATE_MODELINE@
diff --git a/scripts/build.lib.c++/instantiate b/scripts/build.lib.c++/instantiate
index 3361389..4ade5e4 100644
--- a/scripts/build.lib.c++/instantiate
+++ b/scripts/build.lib.c++/instantiate
@@ -22,5 +22,4 @@ add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.lib.c++/soversion b/scripts/build.lib.c++/soversion
index 2b111ae..ea1d4f1 100644
--- a/scripts/build.lib.c++/soversion
+++ b/scripts/build.lib.c++/soversion
@@ -1,8 +1,8 @@
 # @P@/src/@NAME@/soversion
 #
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@ <@EMAIL@>
+#  License: GPLv3
 #
 
 
diff --git a/scripts/build.lib.c/000_TopHeader.h b/scripts/build.lib.c/000_TopHeader.h
index 1e51b0f..08c7fd4 100644
--- a/scripts/build.lib.c/000_TopHeader.h
+++ b/scripts/build.lib.c/000_TopHeader.h
@@ -1,9 +1,9 @@
 /* @P@/src/@NAME@/000_TopHeader.h
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 #ifndef HEADER_@CNAME@
 #define HEADER_@CNAME@
@@ -11,6 +11,5 @@
 /* standard includes, or includes needed for type declarations */
 
 /* options for text editors
-kate: @KATE_MODELINE@
-vim: @VIM_MODELINE@:syntax=c.doxygen
+vim: @VIM_MODELINE@:syntax=ch.doxygen
 */
diff --git a/scripts/build.lib.c/000_TopSource.c b/scripts/build.lib.c/000_TopSource.c
index 88c80a6..133b737 100644
--- a/scripts/build.lib.c/000_TopSource.c
+++ b/scripts/build.lib.c/000_TopSource.c
@@ -1,15 +1,14 @@
 /* @P@/src/@NAME@/000_TopSource.c
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 #include "@HEADER_NAME@"
 
 /* Below are all the includes used throughout the library. */
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.lib.c/999_BottomHeader.h b/scripts/build.lib.c/999_BottomHeader.h
index f079e3b..c3def5d 100644
--- a/scripts/build.lib.c/999_BottomHeader.h
+++ b/scripts/build.lib.c/999_BottomHeader.h
@@ -1,13 +1,12 @@
 /* @P@/src/@NAME@/999_BottomHeader.h
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 #endif
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@:syntax=c.doxygen
 */
diff --git a/scripts/build.lib.c/build.install-lib b/scripts/build.lib.c/build.install-lib
index bc50b4d..6cd141b 100644
--- a/scripts/build.lib.c/build.install-lib
+++ b/scripts/build.lib.c/build.install-lib
@@ -34,5 +34,4 @@ do_cmd_redir "${CONFFILE}" sed \
 do_cmd chmod 0755 "${CONFFILE}"
 print_success "Done"
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c/build.lib b/scripts/build.lib.c/build.lib
index 37ef229..54acbb0 100644
--- a/scripts/build.lib.c/build.lib
+++ b/scripts/build.lib.c/build.lib
@@ -14,7 +14,8 @@ then
     @CNAME@="obj/${@CNAME@_BASE}.so.${SOMAJOR}.${SOMICRO}"
     @CNAME@_DEP_CFLAGS="" # @TODO@ cflags
     @CNAME@_DEP_LIBS="" # @TODO@ libs
-    SO_EXTRA="${@CNAME@_DEP_CFLAGS} ${@CNAME@_DEP_LIBS} -lc"
+    SO_EXTRA="${@CNAME@_DEP_CFLAGS} ${@CNAME@_DEP_LIBS} -lc \
+        -D_GNU_SOURCE -std=gnu99"
 
     echo "Building library ${@CNAME@}..."
 
@@ -52,5 +53,4 @@ then
     @CNAME@_HEADER=${HDR}
 
 fi
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c/build.monolithic b/scripts/build.lib.c/build.monolithic
index 3cc0bc3..087f705 100644
--- a/scripts/build.lib.c/build.monolithic
+++ b/scripts/build.lib.c/build.monolithic
@@ -17,5 +17,4 @@ then
     @CNAME@_MONOLITHIC=1
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
 fi
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c/config-script b/scripts/build.lib.c/config-script
index d3e4b02..b88335b 100644
--- a/scripts/build.lib.c/config-script
+++ b/scripts/build.lib.c/config-script
@@ -95,4 +95,3 @@ true
 
 
 # vim: syntax=sh:@VIM_MODELINE@
-# kate: @KATE_MODELINE@
diff --git a/scripts/build.lib.c/instantiate b/scripts/build.lib.c/instantiate
index b91a56b..1a3b358 100644
--- a/scripts/build.lib.c/instantiate
+++ b/scripts/build.lib.c/instantiate
@@ -22,5 +22,4 @@ add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.lib.c/soversion b/scripts/build.lib.c/soversion
index 2b111ae..ea1d4f1 100644
--- a/scripts/build.lib.c/soversion
+++ b/scripts/build.lib.c/soversion
@@ -1,8 +1,8 @@
 # @P@/src/@NAME@/soversion
 #
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@ <@EMAIL@>
+#  License: GPLv3
 #
 
 
diff --git a/scripts/build.make.none/Makefile b/scripts/build.make.none/Makefile
index 3fa2d73..c9c8b0f 100644
--- a/scripts/build.make.none/Makefile
+++ b/scripts/build.make.none/Makefile
@@ -1,8 +1,8 @@
 # @P@/src/@NAME@/Makefile
 #
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@ <@EMAIL@>
+#  License: GPLv3
 #
 
 # Build files.
@@ -12,5 +12,4 @@ default:
 install:
 
 # options for text editors
-#  kate: @KATE_MODELINE@
 #  vim: syntax=make:@VIM_MODELINE@
diff --git a/scripts/build.make.none/build.install-make b/scripts/build.make.none/build.install-make
index 1b9408b..a65fcff 100644
--- a/scripts/build.make.none/build.install-make
+++ b/scripts/build.make.none/build.install-make
@@ -30,5 +30,4 @@ else
     exit 1
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.make.none/build.make b/scripts/build.make.none/build.make
index 8207c2c..7e5e56e 100644
--- a/scripts/build.make.none/build.make
+++ b/scripts/build.make.none/build.make
@@ -19,5 +19,4 @@ else
     exit 1
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.make.none/instantiate b/scripts/build.make.none/instantiate
index de033eb..83c18f5 100644
--- a/scripts/build.make.none/instantiate
+++ b/scripts/build.make.none/instantiate
@@ -9,5 +9,4 @@ add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.module.c/000_TopSource.c b/scripts/build.module.c/000_TopSource.c
index a68d935..220f3e3 100644
--- a/scripts/build.module.c/000_TopSource.c
+++ b/scripts/build.module.c/000_TopSource.c
@@ -1,13 +1,12 @@
 /* @P@/src/@NAME@/000_TopSource.c
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 /* Below are includes used throughout the module */
 
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.module.c/build.install-module b/scripts/build.module.c/build.install-module
index 0ecbca0..b1b57cd 100644
--- a/scripts/build.module.c/build.install-module
+++ b/scripts/build.module.c/build.install-module
@@ -8,5 +8,4 @@ echo "Installing module into '${MODULEDIR}'"
 install_file ${@CNAME@} ${MODULEDIR} 0755 || return 1
 print_success "Done"
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.module.c/build.module b/scripts/build.module.c/build.module
index cef9c24..ace93e4 100644
--- a/scripts/build.module.c/build.module
+++ b/scripts/build.module.c/build.module
@@ -35,5 +35,5 @@ then
 
     @CNAME@_BUILT=1
 fi
-# kate: @KATE_MODELINE@
+
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.module.c/build.monolithic b/scripts/build.module.c/build.monolithic
index 85f73ca..7c6c655 100644
--- a/scripts/build.module.c/build.monolithic
+++ b/scripts/build.module.c/build.monolithic
@@ -13,5 +13,5 @@ then
 
     @CNAME@_MONOLITHIC=1
 fi
-# kate: @KATE_MODELINE@
+
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.module.c/instantiate b/scripts/build.module.c/instantiate
index 2327f9a..c8619ac 100644
--- a/scripts/build.module.c/instantiate
+++ b/scripts/build.module.c/instantiate
@@ -10,5 +10,4 @@ add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 add_config_option "MODULEDIR" "\${LIBDIR}/@TODO@/"
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.tests.c++/build.default b/scripts/build.tests.c++/build.default
index fb77186..f89e9d0 100644
--- a/scripts/build.tests.c++/build.default
+++ b/scripts/build.tests.c++/build.default
@@ -1,3 +1 @@
 source src/@NAME@/build.tests
-# kate: @KATE_MODELINE@
-# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.tests.c++/build.tests b/scripts/build.tests.c++/build.tests
index de271b3..8d8282d 100644
--- a/scripts/build.tests.c++/build.tests
+++ b/scripts/build.tests.c++/build.tests
@@ -39,5 +39,4 @@ then
     @CNAME@_BUILT=1
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.tests.c++/instantiate b/scripts/build.tests.c++/instantiate
index 410a75f..a91765e 100644
--- a/scripts/build.tests.c++/instantiate
+++ b/scripts/build.tests.c++/instantiate
@@ -26,5 +26,4 @@ add_config_option "CXX" "${COPT_CXX_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.tests.c++/template b/scripts/build.tests.c++/template
index 19b2baa..b4fc5ce 100644
--- a/scripts/build.tests.c++/template
+++ b/scripts/build.tests.c++/template
@@ -1,16 +1,17 @@
 /* @P@/src/@NAME@/???.cpp
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 @TEST_HEADERS@
 #include <iostream>
 
 
 
-int main(int argc, char* argv[])
+int
+main(int argc, char* argv[])
 {
     if(argc == 2 && !strcmp(argv[1], "--print-summary")) {
         std::cout << "One line summary.\n";
@@ -37,7 +38,8 @@ int main(int argc, char* argv[])
     return ret;
 }
 
+
+
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@
 */
diff --git a/scripts/build.tests.c/build.default b/scripts/build.tests.c/build.default
index fb77186..f89e9d0 100644
--- a/scripts/build.tests.c/build.default
+++ b/scripts/build.tests.c/build.default
@@ -1,3 +1 @@
 source src/@NAME@/build.tests
-# kate: @KATE_MODELINE@
-# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.tests.c/build.tests b/scripts/build.tests.c/build.tests
index df52e52..8bc4d7c 100644
--- a/scripts/build.tests.c/build.tests
+++ b/scripts/build.tests.c/build.tests
@@ -39,5 +39,4 @@ then
     @CNAME@_BUILT=1
 fi
 
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.tests.c/instantiate b/scripts/build.tests.c/instantiate
index 3d5394f..658c764 100644
--- a/scripts/build.tests.c/instantiate
+++ b/scripts/build.tests.c/instantiate
@@ -26,5 +26,4 @@ add_config_option "CC" "${COPT_CC_DEFAULT}"
 add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.tests.c/template b/scripts/build.tests.c/template
index d998a76..74826d4 100644
--- a/scripts/build.tests.c/template
+++ b/scripts/build.tests.c/template
@@ -1,9 +1,9 @@
-/* @P@/src/@NAME@/???.c
+/* @P@/src/@NAME@/xxx.c
  *
- *  (c)2010, @AUTHOR@, <@EMAIL@>.
- *  Released under the GNU GPLv3. See file COPYING or
- *  http://www.gnu.org/copyleft/gpl.html for details.
-*/
+ *  Copyright: ©@YEAR@, @COPYRIGHT@
+ *  Author: @AUTHOR@ <@EMAIL@>
+ *  License: GPLv3
+ */
 
 @TEST_HEADERS@
 #include <stdio.h>
@@ -11,7 +11,8 @@
 
 
 
-int main(int argc, char* argv[])
+int
+main(int argc, char* argv[])
 {
     int ret = 0;
 
@@ -29,7 +30,8 @@ int main(int argc, char* argv[])
     return ret;
 }
 
+
+
 /* options for text editors
-kate: @KATE_MODELINE@
 vim: @VIM_MODELINE@
 */
diff --git a/scripts/config-printflags.sh b/scripts/config-printflags.sh
index 0f8f82c..f51bc01 100755
--- a/scripts/config-printflags.sh
+++ b/scripts/config-printflags.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 #  lw-build-system/scripts/config-printflags.sh
 #
-#  (c)2009, Laurence Withers <l@lwithers.me.uk>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©2007–2010, Laurence Withers
+#  Author: Laurence Withers <l@lwithers.me.uk>
+#  License: GPLv3
 #
 #  Script to print the flag lines for `config', given a library name.
 #
@@ -11,7 +11,9 @@
 
 for pkg in $@
 do
-	varname="$(echo "${pkg}" | tr 'a-z-+' 'A-Z__')"
-	echo '[ -z "${'${varname}'_CFLAGS}" ] && '${varname}'_CFLAGS="$('${pkg}'-config --cflags)"'
-	echo '[ -z "${'${varname}'_LIBS}" ] && '${varname}'_LIBS="$('${pkg}'-config --libs)"'
+    varname="$(echo "${pkg}" | tr 'a-z-+' 'A-Z__')"
+    echo '[ -z "${'${varname}'_CFLAGS}" ] && '${varname}'_CFLAGS="$('${pkg}'-config --cflags)"'
+    echo '[ -z "${'${varname}'_LIBS}" ] && '${varname}'_LIBS="$('${pkg}'-config --libs)"'
 done
+
+# vim: ts=4:sw=4:expandtab
diff --git a/scripts/module-create.sh b/scripts/module-create.sh
index 5cf3b9f..344e09e 100755
--- a/scripts/module-create.sh
+++ b/scripts/module-create.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # lw-build-system/scripts/module-create.sh
 #
-#  (c)2009, Laurence Withers, <l@lwithers.me.uk>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©2006–2010, Laurence Withers
+#  Author: Laurence Withers <l@lwithers.me.uk>
+#  License: GPLv3
 #
 
 # Creates a new source module.
@@ -63,7 +63,8 @@ get_cname() {
 do_parameter_subst() {
     CNAME=$(get_cname ${NAME})
     do_cmd source "${HOME}/.lwbuildrc" || exit 1
-    for param in P NAME CNAME AUTHOR EMAIL VIM_MODELINE KATE_MODELINE $@
+    YEAR="`date +%Y`"
+    for param in P YEAR COPYRIGHT NAME CNAME AUTHOR EMAIL VIM_MODELINE KATE_MODELINE $@
     do
         do_cmd_redir sedscript echo "s,@${param}@,${!param},g" || exit 1
     done
@@ -119,5 +120,4 @@ print_success "Module instantiated"
 grep -r "@TODO@" .
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/release.sh b/scripts/release.sh
index 6566bdc..31abde5 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # lw-build-system/scripts/release.sh
-#
-#  (c)2009, Laurence Withers, <l@lwithers.me.uk>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+# 
+#  Copyright: ©2006–2010, Laurence Withers
+#  Author: Laurence Withers <l@lwithers.me.uk>
+#  License: GPLv3
 #
 
 # Prepares package for release. Expects the version number on the
@@ -56,7 +56,13 @@ do_cmd ./make.sh || exit 1
 
 # build and save the documentation, if required
 BUILD_DOCS=""
-[ -e src/docs ] && BUILD_DOCS="1"
+test_params_for_doxygen() {
+    [ "$2" == "doxygen" ] && BUILD_DOCS="1"
+}
+for params in src/*/.params
+do
+    test_params_for_doxygen $(cat ${params})
+done
 if [ ! -z ${BUILD_DOCS} ]
 then
     do_cmd ./make.sh docs || exit 1
@@ -88,5 +94,4 @@ fi
 # clean up
 rm -rf "${PKGNAME}" "${PKGNAME}-doc"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: syntax=sh:ts=4:sw=4:expandtab
diff --git a/scripts/version.sh b/scripts/version.sh
index 79f4b8f..de0540c 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 #  lw-build-system/scripts/version.sh
 #
-#  (c)2009, Laurence Withers <l@lwithers.me.uk>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©2007–2010, Laurence Withers
+#  Author: Laurence Withers <l@lwithers.me.uk>
+#  License: GPLv3
 #
 #  Script to automate bumping of version or soversion files, and pushing
 #  changes (and tags) to the origin repository.
diff --git a/skel-.lwbuildrc b/skel-.lwbuildrc
index 876a9d6..dc2a63a 100644
--- a/skel-.lwbuildrc
+++ b/skel-.lwbuildrc
@@ -5,8 +5,7 @@
 
 AUTHOR=""
 EMAIL=""
-KATE_MODELINE="replace-trailing-space-save true; space-indent true; tab-width 4;"
+COPYRIGHT=""
 VIM_MODELINE="expandtab:ts=4:sw=4"
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: expandtab:ts=4:sw=4
diff --git a/skel/README b/skel/README
index 96c6cc6..6e2b938 100644
--- a/skel/README
+++ b/skel/README
@@ -1,8 +1,10 @@
 @P@
 ========================================================================
-(c)2010, @AUTHOR@, <@EMAIL@>.
-Released under the GNU GPLv3. See file COPYING or 
-http://www.gnu.org/copyleft/gpl.html for details.
+Copyright: ©@YEAR@, @COPYRIGHT@
+Author: @AUTHOR@ <@EMAIL@>
+License: GPLv3
+
+See file COPYING for detail license information.
 
 Really Quick Instructions
 -------------------------
diff --git a/skel/config b/skel/config
index 0fcaff7..a875abd 100644
--- a/skel/config
+++ b/skel/config
@@ -1,10 +1,9 @@
 # @P@/config
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
 #
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@ <@EMAIL@>
+#  License: GPLv3
 #
 # This file contains options used to build @P@.
 
diff --git a/skel/make.sh b/skel/make.sh
index 048e8f6..8c04df2 100755
--- a/skel/make.sh
+++ b/skel/make.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # @P@/make.sh
-#
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+# 
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@ <@EMAIL@>
+#  License: GPLv3
 #
 
 
@@ -292,5 +292,4 @@ done
 
 exit 0
 
-# kate: @KATE_MODELINE@
 # vim: @VIM_MODELINE@
diff --git a/skel/run-test.sh b/skel/run-test.sh
index a1ca55c..83aa7dc 100755
--- a/skel/run-test.sh
+++ b/skel/run-test.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # @P@/test.sh
-#
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+# 
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@ <@EMAIL@>
+#  License: GPLv3
 #
 
 # Running this script on its own will display a summary of all the
@@ -21,7 +21,7 @@ run_test() {
         return 1
     fi
 
-    LD_LIBRARY_PATH="obj" "${EXE}" "$@" || return 1
+    LD_LIBRARY_PATH="obj:${LD_LIBRARY_PATH}" "${EXE}" "$@" || return 1
     return 0
 }
 
@@ -50,5 +50,4 @@ fi
 
 run_test $*
 
-# kate: @KATE_MODELINE@
 # vim: @VIM_MODELINE@
diff --git a/skel/scripts/functions.sh b/skel/scripts/functions.sh
index 4916597..56af7b0 100644
--- a/skel/scripts/functions.sh
+++ b/skel/scripts/functions.sh
@@ -1,8 +1,8 @@
 # @P@/scripts/functions.sh
 #
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@, <@EMAIL@>
+#  License: GPLv3
 #
 
 # Common functions
@@ -63,5 +63,4 @@ do_cmd_redir() {
     fi
 }
 
-# kate: @KATE_MODELINE@
 # vim: @VIM_MODELINE@
diff --git a/skel/scripts/paths b/skel/scripts/paths
index d5e0280..71e0bbb 100644
--- a/skel/scripts/paths
+++ b/skel/scripts/paths
@@ -1,8 +1,8 @@
 # @P@/scripts/paths
 #
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@, <@EMAIL@>
+#  License: GPLv3
 #
 #  Default path setup. Not meant for editing; use environment variables 
 #  to override values if needed.
@@ -60,5 +60,4 @@ fi
 [ -z "${WEBDIR}" ] && WEBDIR="${SRVDIR}/http"
 [ -z "${CGIDIR}" ] && CGIDIR="${WEBDIR}/cgi-bin"
  
-# kate: @KATE_MODELINE@
 # vim: syntax=sh:@VIM_MODELINE@
diff --git a/skel/version b/skel/version
index 00f2c85..1de0fed 100644
--- a/skel/version
+++ b/skel/version
@@ -1,8 +1,8 @@
 # @P@/version
-#
-#  (c)2010, @AUTHOR@, <@EMAIL@>.
-#  Released under the GNU GPLv3. See file COPYING or
-#  http://www.gnu.org/copyleft/gpl.html for details.
+# 
+#  Copyright: ©@YEAR@, @COPYRIGHT@
+#  Author: @AUTHOR@ <@EMAIL@>
+#  License: GPLv3
 #
 
 
@@ -13,5 +13,4 @@ VERMAJOR=0
 VERMINOR=0
 VERMICRO=0
 
-# kate: @KATE_MODELINE@
 # vim: @VIM_MODELINE@:syntax=sh
diff --git a/update.sh b/update.sh
index 3fbf4d5..e9fc137 100755
--- a/update.sh
+++ b/update.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
-#
-#  (c)2009, Laurence Withers. Released under the GNU GPL. See file
-#  COPYING for details.
+# 
+#  Copyright: ©2010, Laurence Withers.
+#  Author: Laurence Withers <l@lwithers.me.uk>
+#  License: GPLv3
 #
 
 if [ $# -ne 1 ]
@@ -108,5 +109,4 @@ fi
 
 true
 
-# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
 # vim: expandtab:ts=4:sw=4