diff --git a/scripts/build.app.c++-qt/TopSource.cpp b/scripts/build.app.c++-qt/000_TopSource.cpp
similarity index 100%
rename from scripts/build.app.c++-qt/TopSource.cpp
rename to scripts/build.app.c++-qt/000_TopSource.cpp
diff --git a/scripts/build.app.c++-qt/build.app b/scripts/build.app.c++-qt/build.app
index c9e0aaf..67568a0 100644
--- a/scripts/build.app.c++-qt/build.app
+++ b/scripts/build.app.c++-qt/build.app
@@ -38,4 +38,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_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 739cc0c..8d77b7f 100644
--- a/scripts/build.app.c++-qt/build.install-app
+++ b/scripts/build.app.c++-qt/build.install-app
@@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_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 2df0dc8..9fb05f8 100644
--- a/scripts/build.app.c++-qt/build.monolithic
+++ b/scripts/build.app.c++-qt/build.monolithic
@@ -24,4 +24,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c++-qt/instantiate b/scripts/build.app.c++-qt/instantiate
index 22a11a0..646a88d 100644
--- a/scripts/build.app.c++-qt/instantiate
+++ b/scripts/build.app.c++-qt/instantiate
@@ -12,4 +12,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.app.c++/TopSource.cpp b/scripts/build.app.c++/000_TopSource.cpp
similarity index 100%
rename from scripts/build.app.c++/TopSource.cpp
rename to scripts/build.app.c++/000_TopSource.cpp
diff --git a/scripts/build.app.c++/build.app b/scripts/build.app.c++/build.app
index 397c3a2..9b524d5 100644
--- a/scripts/build.app.c++/build.app
+++ b/scripts/build.app.c++/build.app
@@ -38,4 +38,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_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 739cc0c..8d77b7f 100644
--- a/scripts/build.app.c++/build.install-app
+++ b/scripts/build.app.c++/build.install-app
@@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c++/build.monolithic b/scripts/build.app.c++/build.monolithic
index 53f171c..ba32701 100644
--- a/scripts/build.app.c++/build.monolithic
+++ b/scripts/build.app.c++/build.monolithic
@@ -15,4 +15,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c++/instantiate b/scripts/build.app.c++/instantiate
index 492e72e..b4b8819 100644
--- a/scripts/build.app.c++/instantiate
+++ b/scripts/build.app.c++/instantiate
@@ -11,4 +11,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.app.c/TopSource.c b/scripts/build.app.c/000_TopSource.c
similarity index 89%
rename from scripts/build.app.c/TopSource.c
rename to scripts/build.app.c/000_TopSource.c
index debda3b..e7768f2 100644
--- a/scripts/build.app.c/TopSource.c
+++ b/scripts/build.app.c/000_TopSource.c
@@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopSource.c
+/* @P@/src/@NAME@/000_TopSource.c
  *
  *  (c)2007, @AUTHOR@, <@EMAIL@>.
  *  Released under the GNU GPLv2. See file COPYING or
diff --git a/scripts/build.app.c/build.app b/scripts/build.app.c/build.app
index 11b22c6..df73192 100644
--- a/scripts/build.app.c/build.app
+++ b/scripts/build.app.c/build.app
@@ -38,4 +38,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_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 739cc0c..8d77b7f 100644
--- a/scripts/build.app.c/build.install-app
+++ b/scripts/build.app.c/build.install-app
@@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c/build.monolithic b/scripts/build.app.c/build.monolithic
index d56c004..8f540e6 100644
--- a/scripts/build.app.c/build.monolithic
+++ b/scripts/build.app.c/build.monolithic
@@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
 
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)"
     make_monolithic ${SRC} C || return 1
 
     @CNAME@_MONOLITHIC=1
@@ -15,4 +15,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.c/instantiate b/scripts/build.app.c/instantiate
index dc6b368..da8f4af 100644
--- a/scripts/build.app.c/instantiate
+++ b/scripts/build.app.c/instantiate
@@ -11,4 +11,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=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 a6e27a5..645d595 100644
--- a/scripts/build.app.sh/build.install-app
+++ b/scripts/build.app.sh/build.install-app
@@ -10,4 +10,4 @@ done
 print_success "Done"
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.app.sh/instantiate b/scripts/build.app.sh/instantiate
index 10fc290..62eafc5 100644
--- a/scripts/build.app.sh/instantiate
+++ b/scripts/build.app.sh/instantiate
@@ -9,4 +9,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.docs.doxygen/build.docs b/scripts/build.docs.doxygen/build.docs
index a90714c..6be6f9d 100644
--- a/scripts/build.docs.doxygen/build.docs
+++ b/scripts/build.docs.doxygen/build.docs
@@ -40,4 +40,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_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 d6d60a2..a228999 100644
--- a/scripts/build.docs.doxygen/build.install-docs
+++ b/scripts/build.docs.doxygen/build.install-docs
@@ -18,4 +18,4 @@ done
 
 print_success "Documentation installed"
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.docs.doxygen/instantiate b/scripts/build.docs.doxygen/instantiate
index 5c0eb7c..9dcd4d8 100644
--- a/scripts/build.docs.doxygen/instantiate
+++ b/scripts/build.docs.doxygen/instantiate
@@ -9,4 +9,4 @@ add_config_option "DOCSDIR" "${COPT_DOCSDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=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 8a59f39..181a453 100644
--- a/scripts/build.docs.none/build.install-docs
+++ b/scripts/build.docs.none/build.install-docs
@@ -11,4 +11,4 @@ done
 
 print_success "Documentation installed"
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.docs.none/instantiate b/scripts/build.docs.none/instantiate
index 5c0eb7c..9dcd4d8 100644
--- a/scripts/build.docs.none/instantiate
+++ b/scripts/build.docs.none/instantiate
@@ -9,4 +9,4 @@ add_config_option "DOCSDIR" "${COPT_DOCSDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=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 d2be502..e6daf59 100644
--- a/scripts/build.files.none/build.install-files
+++ b/scripts/build.files.none/build.install-files
@@ -13,4 +13,4 @@ done
 
 print_success "Files installed"
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.files.none/instantiate b/scripts/build.files.none/instantiate
index 9fb90de..0cf761b 100644
--- a/scripts/build.files.none/instantiate
+++ b/scripts/build.files.none/instantiate
@@ -8,4 +8,4 @@ do_parameter_subst
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.firmware.gpasm/TopSource.asm b/scripts/build.firmware.gpasm/000_TopSource.asm
similarity index 100%
rename from scripts/build.firmware.gpasm/TopSource.asm
rename to scripts/build.firmware.gpasm/000_TopSource.asm
diff --git a/scripts/build.firmware.gpasm/build.firmware b/scripts/build.firmware.gpasm/build.firmware
index 6651c69..d9fe502 100644
--- a/scripts/build.firmware.gpasm/build.firmware
+++ b/scripts/build.firmware.gpasm/build.firmware
@@ -39,4 +39,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_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 e720ead..9e75af1 100644
--- a/scripts/build.firmware.gpasm/build.install-firmware
+++ b/scripts/build.firmware.gpasm/build.install-firmware
@@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${HEXDIR}" 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.gpasm/build.monolithic b/scripts/build.firmware.gpasm/build.monolithic
index 15bf7da..68df7a9 100644
--- a/scripts/build.firmware.gpasm/build.monolithic
+++ b/scripts/build.firmware.gpasm/build.monolithic
@@ -15,4 +15,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.gpasm/instantiate b/scripts/build.firmware.gpasm/instantiate
index 813a515..95e47b8 100644
--- a/scripts/build.firmware.gpasm/instantiate
+++ b/scripts/build.firmware.gpasm/instantiate
@@ -11,4 +11,4 @@ add_config_option "GPASM_FLAGS" ""
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.firmware.sdcc/TopSource.c b/scripts/build.firmware.sdcc/000_TopSource.c
similarity index 89%
rename from scripts/build.firmware.sdcc/TopSource.c
rename to scripts/build.firmware.sdcc/000_TopSource.c
index debda3b..e7768f2 100644
--- a/scripts/build.firmware.sdcc/TopSource.c
+++ b/scripts/build.firmware.sdcc/000_TopSource.c
@@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopSource.c
+/* @P@/src/@NAME@/000_TopSource.c
  *
  *  (c)2007, @AUTHOR@, <@EMAIL@>.
  *  Released under the GNU GPLv2. See file COPYING or
diff --git a/scripts/build.firmware.sdcc/build.firmware b/scripts/build.firmware.sdcc/build.firmware
index 33ce002..044bd37 100644
--- a/scripts/build.firmware.sdcc/build.firmware
+++ b/scripts/build.firmware.sdcc/build.firmware
@@ -38,4 +38,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_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 e720ead..9e75af1 100644
--- a/scripts/build.firmware.sdcc/build.install-firmware
+++ b/scripts/build.firmware.sdcc/build.install-firmware
@@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${HEXDIR}" 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.sdcc/build.monolithic b/scripts/build.firmware.sdcc/build.monolithic
index cd0120f..9065ded 100644
--- a/scripts/build.firmware.sdcc/build.monolithic
+++ b/scripts/build.firmware.sdcc/build.monolithic
@@ -15,4 +15,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.firmware.sdcc/instantiate b/scripts/build.firmware.sdcc/instantiate
index 7947a79..37a2891 100644
--- a/scripts/build.firmware.sdcc/instantiate
+++ b/scripts/build.firmware.sdcc/instantiate
@@ -11,4 +11,4 @@ add_config_option "SDCCFLAGS" ""
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.lib.c++/TopHeader.h b/scripts/build.lib.c++/000_TopHeader.h
similarity index 90%
rename from scripts/build.lib.c++/TopHeader.h
rename to scripts/build.lib.c++/000_TopHeader.h
index 347827c..84aecc7 100644
--- a/scripts/build.lib.c++/TopHeader.h
+++ b/scripts/build.lib.c++/000_TopHeader.h
@@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopHeader.h
+/* @P@/src/@NAME@/000_TopHeader.h
  *
  *  (c)2007, @AUTHOR@, <@EMAIL@>.
  *  Released under the GNU GPLv2. See file COPYING or
diff --git a/scripts/build.lib.c++/TopSource.cpp b/scripts/build.lib.c++/000_TopSource.cpp
similarity index 100%
rename from scripts/build.lib.c++/TopSource.cpp
rename to scripts/build.lib.c++/000_TopSource.cpp
diff --git a/scripts/build.lib.c++/BottomHeader.h b/scripts/build.lib.c++/999_BottomHeader.h
similarity index 86%
rename from scripts/build.lib.c++/BottomHeader.h
rename to scripts/build.lib.c++/999_BottomHeader.h
index 27b7e48..4523c61 100644
--- a/scripts/build.lib.c++/BottomHeader.h
+++ b/scripts/build.lib.c++/999_BottomHeader.h
@@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/BottomHeader.h
+/* @P@/src/@NAME@/999_BottomHeader.h
  *
  *  (c)2007, @AUTHOR@, <@EMAIL@>.
  *  Released under the GNU GPLv2. See file COPYING or
diff --git a/scripts/build.lib.c++/build.install-lib b/scripts/build.lib.c++/build.install-lib
index 721f818..80df111 100644
--- a/scripts/build.lib.c++/build.install-lib
+++ b/scripts/build.lib.c++/build.install-lib
@@ -36,4 +36,4 @@ do_cmd chmod 0644 "${CONFFILE}"
 print_success "Done"
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c++/build.lib b/scripts/build.lib.c++/build.lib
index 06949ab..dda7750 100644
--- a/scripts/build.lib.c++/build.lib
+++ b/scripts/build.lib.c++/build.lib
@@ -52,4 +52,4 @@ then
 
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c++/build.monolithic b/scripts/build.lib.c++/build.monolithic
index 5e8b56f..5435506 100644
--- a/scripts/build.lib.c++/build.monolithic
+++ b/scripts/build.lib.c++/build.monolithic
@@ -18,4 +18,4 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c++/config-script b/scripts/build.lib.c++/config-script
index 39b7ba6..d3e4b02 100644
--- a/scripts/build.lib.c++/config-script
+++ b/scripts/build.lib.c++/config-script
@@ -94,5 +94,5 @@ true
 
 
 
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
 # kate: @KATE_MODELINE@
diff --git a/scripts/build.lib.c++/instantiate b/scripts/build.lib.c++/instantiate
index 963f530..840ecf6 100644
--- a/scripts/build.lib.c++/instantiate
+++ b/scripts/build.lib.c++/instantiate
@@ -28,4 +28,4 @@ add_config_option "FINALINCLUDEDIR" "${COPT_FINALINCLUDEDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.lib.c/TopHeader.h b/scripts/build.lib.c/000_TopHeader.h
similarity index 90%
rename from scripts/build.lib.c/TopHeader.h
rename to scripts/build.lib.c/000_TopHeader.h
index 18d1c02..9aad683 100644
--- a/scripts/build.lib.c/TopHeader.h
+++ b/scripts/build.lib.c/000_TopHeader.h
@@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopHeader.h
+/* @P@/src/@NAME@/000_TopHeader.h
  *
  *  (c)2007, @AUTHOR@, <@EMAIL@>.
  *  Released under the GNU GPLv2. See file COPYING or
diff --git a/scripts/build.lib.c/TopSource.c b/scripts/build.lib.c/000_TopSource.c
similarity index 90%
rename from scripts/build.lib.c/TopSource.c
rename to scripts/build.lib.c/000_TopSource.c
index 32f6799..61916e9 100644
--- a/scripts/build.lib.c/TopSource.c
+++ b/scripts/build.lib.c/000_TopSource.c
@@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopSource.c
+/* @P@/src/@NAME@/000_TopSource.c
  *
  *  (c)2007, @AUTHOR@, <@EMAIL@>.
  *  Released under the GNU GPLv2. See file COPYING or
diff --git a/scripts/build.lib.c/BottomHeader.h b/scripts/build.lib.c/999_BottomHeader.h
similarity index 86%
rename from scripts/build.lib.c/BottomHeader.h
rename to scripts/build.lib.c/999_BottomHeader.h
index 27b7e48..4523c61 100644
--- a/scripts/build.lib.c/BottomHeader.h
+++ b/scripts/build.lib.c/999_BottomHeader.h
@@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/BottomHeader.h
+/* @P@/src/@NAME@/999_BottomHeader.h
  *
  *  (c)2007, @AUTHOR@, <@EMAIL@>.
  *  Released under the GNU GPLv2. See file COPYING or
diff --git a/scripts/build.lib.c/build.install-lib b/scripts/build.lib.c/build.install-lib
index 7fa800f..b07ef88 100644
--- a/scripts/build.lib.c/build.install-lib
+++ b/scripts/build.lib.c/build.install-lib
@@ -37,4 +37,4 @@ do_cmd chmod 0755 "${CONFFILE}"
 print_success "Done"
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c/build.lib b/scripts/build.lib.c/build.lib
index 0ee113e..48d0819 100644
--- a/scripts/build.lib.c/build.lib
+++ b/scripts/build.lib.c/build.lib
@@ -52,4 +52,4 @@ then
 
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c/build.monolithic b/scripts/build.lib.c/build.monolithic
index bdecb43..ef8f88d 100644
--- a/scripts/build.lib.c/build.monolithic
+++ b/scripts/build.lib.c/build.monolithic
@@ -18,4 +18,4 @@ then
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.lib.c/config-script b/scripts/build.lib.c/config-script
index 39b7ba6..d3e4b02 100644
--- a/scripts/build.lib.c/config-script
+++ b/scripts/build.lib.c/config-script
@@ -94,5 +94,5 @@ true
 
 
 
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
 # kate: @KATE_MODELINE@
diff --git a/scripts/build.lib.c/instantiate b/scripts/build.lib.c/instantiate
index cd9a400..e533e63 100644
--- a/scripts/build.lib.c/instantiate
+++ b/scripts/build.lib.c/instantiate
@@ -28,4 +28,4 @@ add_config_option "FINALINCLUDEDIR" "${COPT_FINALINCLUDEDIR_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/build.module.c/TopSource.c b/scripts/build.module.c/000_TopSource.c
similarity index 88%
rename from scripts/build.module.c/TopSource.c
rename to scripts/build.module.c/000_TopSource.c
index 2eb68a0..d1fdb98 100644
--- a/scripts/build.module.c/TopSource.c
+++ b/scripts/build.module.c/000_TopSource.c
@@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopSource.c
+/* @P@/src/@NAME@/000_TopSource.c
  *
  *  (c)2007, @AUTHOR@, <@EMAIL@>.
  *  Released under the GNU GPLv2. See file COPYING or
diff --git a/scripts/build.module.c/build.install-module b/scripts/build.module.c/build.install-module
index c6254d6..0ecbca0 100644
--- a/scripts/build.module.c/build.install-module
+++ b/scripts/build.module.c/build.install-module
@@ -9,4 +9,4 @@ install_file ${@CNAME@} ${MODULEDIR} 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.module.c/build.module b/scripts/build.module.c/build.module
index f80b382..cef9c24 100644
--- a/scripts/build.module.c/build.module
+++ b/scripts/build.module.c/build.module
@@ -36,4 +36,4 @@ then
     @CNAME@_BUILT=1
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.module.c/build.monolithic b/scripts/build.module.c/build.monolithic
index 789dc9e..54fdd56 100644
--- a/scripts/build.module.c/build.monolithic
+++ b/scripts/build.module.c/build.monolithic
@@ -14,4 +14,4 @@ then
     @CNAME@_MONOLITHIC=1
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.module.c/instantiate b/scripts/build.module.c/instantiate
index 1c99bcd..8061987 100644
--- a/scripts/build.module.c/instantiate
+++ b/scripts/build.module.c/instantiate
@@ -12,4 +12,4 @@ add_config_option "MODULEDIR" "${COPT_LIBDIR_DEFAULT}/@TODO@/"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=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 e31fc6a..fb77186 100644
--- a/scripts/build.tests.c++/build.default
+++ b/scripts/build.tests.c++/build.default
@@ -1,3 +1,3 @@
 source src/@NAME@/build.tests
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.tests.c++/build.tests b/scripts/build.tests.c++/build.tests
index 3724ef8..de271b3 100644
--- a/scripts/build.tests.c++/build.tests
+++ b/scripts/build.tests.c++/build.tests
@@ -40,4 +40,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.tests.c++/instantiate b/scripts/build.tests.c++/instantiate
index 0e73269..35a2f78 100644
--- a/scripts/build.tests.c++/instantiate
+++ b/scripts/build.tests.c++/instantiate
@@ -27,4 +27,4 @@ add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=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 e31fc6a..fb77186 100644
--- a/scripts/build.tests.c/build.default
+++ b/scripts/build.tests.c/build.default
@@ -1,3 +1,3 @@
 source src/@NAME@/build.tests
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.tests.c/build.tests b/scripts/build.tests.c/build.tests
index 97399a8..ff20411 100644
--- a/scripts/build.tests.c/build.tests
+++ b/scripts/build.tests.c/build.tests
@@ -40,4 +40,4 @@ then
 fi
 
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
diff --git a/scripts/build.tests.c/instantiate b/scripts/build.tests.c/instantiate
index 9f52395..0d4ab2d 100644
--- a/scripts/build.tests.c/instantiate
+++ b/scripts/build.tests.c/instantiate
@@ -27,4 +27,4 @@ add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/module-create.sh b/scripts/module-create.sh
index 4fefccb..7c66add 100755
--- a/scripts/module-create.sh
+++ b/scripts/module-create.sh
@@ -127,4 +127,4 @@ grep -r "@TODO@" .
 true
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
diff --git a/scripts/release.sh b/scripts/release.sh
index 66d5498..4279441 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -89,4 +89,4 @@ fi
 rm -rf "${PKGNAME}" "${PKGNAME}-doc"
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: ts=4:sw=4:expandtab
+# vim: syntax=sh:ts=4:sw=4:expandtab