diff --git a/Makefile b/Makefile
index 559f5798..e96864a8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,4 +12,3 @@ clean: clean.pkgconfig
 
 clean.pkgconfig:
 	rm -rf pkgconfig
-
diff --git a/conf/Makefile b/conf/Makefile
index f7620e44..2f00ade7 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -2,4 +2,3 @@ TOPDIR = ..
 
 include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/dirs.mk
-
diff --git a/conf/jcs/jcs.mk b/conf/jcs/jcs.mk
index ea05c144..696d42e3 100644
--- a/conf/jcs/jcs.mk
+++ b/conf/jcs/jcs.mk
@@ -95,7 +95,7 @@ checksum: checkroot # TODO integrate tripwire
 
 install: checkroot $(LOCAL_INSTALL) install_inf install_link $(LOCAL_POST_INSTALL) checksum
 	$(recurse_subdirs)
-	
+
 setup: checkroot $(LOCAL_SETUP) setup_inf setup_link $(LOCAL_POST_SETUP) checksum
 	$(recurse_subdirs)
 
@@ -108,7 +108,7 @@ dist: clean
 		grep -ve "CVS\|trash\|$(MOD)/setup" | \
 		xargs tar -cvzf $(MOD).tar.gz ;\
 	mv $(MOD).tar.gz $(MOD)
-	
+
 checkroot:
 #	@if [ `whoami` != root ] ; then echo "Only root can do this." >&2; exit 1; fi
 
diff --git a/conf/jcs/templates/dir/src/Makefile b/conf/jcs/templates/dir/src/Makefile
index a4ee2c0d..26e5e73f 100644
--- a/conf/jcs/templates/dir/src/Makefile
+++ b/conf/jcs/templates/dir/src/Makefile
@@ -2,14 +2,14 @@
 # (c) 2000 jannet
 # contact@jannet.de
 MAKE_SH := jcs smake
- 
+
 SUBDIRS = cur
- 
+
 setup:
 	$(MAKE_SH) setup $(SUBDIRS)
- 
+
 install:
 	$(MAKE_SH) install $(SUBDIRS)
- 
+
 clean:
-	$(MAKE_SH) clean $(SUBDIRS)                                             
+	$(MAKE_SH) clean $(SUBDIRS)
diff --git a/conf/profile/Makefile b/conf/profile/Makefile
index 75df414d..6a9f7847 100644
--- a/conf/profile/Makefile
+++ b/conf/profile/Makefile
@@ -2,4 +2,3 @@ TOPDIR = ../..
 
 include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/profile.mk
-
diff --git a/htdocs/Makefile b/htdocs/Makefile
index a9aa72d0..a1660691 100644
--- a/htdocs/Makefile
+++ b/htdocs/Makefile
@@ -3,4 +3,3 @@ TOPDIR = ..
 include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/dirs.mk
 include $(MODDIR)/make/htdocs.mk
-
diff --git a/htdocs/images/Makefile b/htdocs/images/Makefile
index 10a814db..42d26d00 100644
--- a/htdocs/images/Makefile
+++ b/htdocs/images/Makefile
@@ -3,4 +3,3 @@ TOPDIR = ../..
 include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/dirs.mk
 include $(MODDIR)/make/htdocs.mk
-
diff --git a/htdocs/images/logo-janware/Makefile b/htdocs/images/logo-janware/Makefile
index 2606b2dc..18af8fa5 100644
--- a/htdocs/images/logo-janware/Makefile
+++ b/htdocs/images/logo-janware/Makefile
@@ -5,4 +5,3 @@ SVG_GENERATE_FORMATS ?= svg
 include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/svg.mk
 include $(MODDIR)/make/htdocs.mk
-
diff --git a/make/Makefile b/make/Makefile
index b7a352aa..0c16fc45 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -34,4 +34,3 @@ grep-vars:
 
 $(INSTALL_MAKEDIR)/%.tmpl: %.tmpl $(TOPDIR)/dir_install_MAKE.done
 	$(INSTALL) -o $(MAKEOWNER) -g $(MAKEGROUP) -m $(MAKEMODE) $< $@A
-
diff --git a/make/cleandirs.mk b/make/cleandirs.mk
index e4cd85dd..56d5f1ee 100644
--- a/make/cleandirs.mk
+++ b/make/cleandirs.mk
@@ -13,8 +13,8 @@ ifeq ($(FORCE_REBUILD_CLEANDIRS),true)
   SUBDIRS_ALL                = $(SUBDIRS)
   SUBDIRS_INSTALL            = $(SUBDIRS)
 else
-  SUBDIRS_ALL               ?= 
-  SUBDIRS_INSTALL           ?= 
+  SUBDIRS_ALL               ?=
+  SUBDIRS_INSTALL           ?=
 endif
 
 do.all:
@@ -26,4 +26,3 @@ do.install:
 do.%:
 	set -e; for d in $(SUBDIRS); do make -wC $$d $*; done
 	$(RM) -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done
-
diff --git a/make/contrib.mk b/make/contrib.mk
index 151c3ac0..850bbb53 100644
--- a/make/contrib.mk
+++ b/make/contrib.mk
@@ -45,4 +45,3 @@ distclean:
 
 unpack: unpack.done
 apply-patches: apply-patches.done
-
diff --git a/make/cpp.mk b/make/cpp.mk
index 2e832215..50257781 100644
--- a/make/cpp.mk
+++ b/make/cpp.mk
@@ -1,2 +1 @@
 include $(MODDIR)/make/tools.mk
-
diff --git a/make/dav.mk b/make/dav.mk
index 66bc1055..504291b0 100644
--- a/make/dav.mk
+++ b/make/dav.mk
@@ -8,7 +8,7 @@ DAV_RSYNC_DIR               ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJ
 DAV_RSYNC_URL                = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR)
 DAV_RSYNC_EXCLUDE           ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files)
 DAV_RSYNC_EXCLUDE_OPTS       = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done')
-DAV_RSYNC_EXTRA_OPTS        ?= 
+DAV_RSYNC_EXTRA_OPTS        ?=
 DAV_RSYNC                   ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS)
 DAV_RSYNC_MODE              ?= 664
 DAV_RSYNC_DIRMODE           ?= 775
@@ -42,4 +42,3 @@ dload.done:
 
 dav.clean:
 	$(RM) -f upload.done dload.done
-
diff --git a/make/debugger.mk b/make/debugger.mk
index a5e09f26..a64f8324 100644
--- a/make/debugger.mk
+++ b/make/debugger.mk
@@ -68,7 +68,7 @@ localcore:
 	cp `ls -rt /var/cores/*core* 2>/dev/null | tail -1` .
 
 centralcore:
-	echo /var/cores/core.%h.%e.%p | sudo tee /proc/sys/kernel/core_pattern 
+	echo /var/cores/core.%h.%e.%p | sudo tee /proc/sys/kernel/core_pattern
 
 coreclean: centralcore-clean
 
diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk
index 71abbddf..72276919 100644
--- a/make/defs-cpp.mk
+++ b/make/defs-cpp.mk
@@ -12,11 +12,11 @@ endif
 ifeq ($(TARGET_ARCH),armv7hl)
   PROJECT_CFLAGS            += -fPIC
   PROJECT_CPPFLAGS          += -fPIC
-  PROJECT_LDFLAGS           += 
+  PROJECT_LDFLAGS           +=
 else ifeq ($(TARGET_ARCH),aarch64)
   PROJECT_CFLAGS            += -fPIC
   PROJECT_CPPFLAGS          += -fPIC
-  PROJECT_LDFLAGS           += 
+  PROJECT_LDFLAGS           +=
 endif
 
 ifeq ($(findstring $(TARGET_OS),linux),)
@@ -78,7 +78,7 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling
   ifeq ($(TARGET),mingw)
 
     ifneq ($(wildcard $(TC_BIN_PREFIX)gcc),)
-      CROSS_TOOL_DIR        ?= 
+      CROSS_TOOL_DIR        ?=
       TC_SYS_ROOT           ?= /usr/$(TARGET_TRIPLET)/sys-root/mingw
     else
       CROSS_TOOL_DIR        ?= /opt/cross-tools
@@ -107,7 +107,7 @@ endif
 ifeq ($(TARGET_ARCH),x86_64)
   BUILD_CFLAGS              += -fPIC
   BUILD_CPPFLAGS            += -fPIC
-  LIBFLAGS                  += 
+  LIBFLAGS                  +=
 endif
 
 ifeq ($(TARGET_TRIPLET),arm-none-eabi)
@@ -319,7 +319,7 @@ endif
 ifeq ($(USE_VALGRIND),true)
   BUILD_CFLAGS              += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
   BUILD_CPPFLAGS            += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
-  # BUILD_LDFLAGS           += 
+  # BUILD_LDFLAGS           +=
 endif
 
 ifeq ($(USE_MCHECK),true)
@@ -536,7 +536,7 @@ ifeq ($(USE_PROJECT_LIB),true)
   VERSION_SCRIPT             = $(BUILD_LIBDIR)/version.ldscript
   # TODO: use something like this as unifying variable, there are far too many
   #       lib-related variables
-  LOCAL_LIBS                += 
+  LOCAL_LIBS                +=
   ifneq ($(TARGET),mingw)
     LIB_A                    = $(BUILD_LIBDIR)/lib$(LIBNAME).a
     SO_SUFFIX                = so.$(MAJOR_MINOR_RELEASE)
@@ -552,7 +552,7 @@ ifeq ($(USE_PROJECT_LIB),true)
     WINRES_RC                = $(BUILD_LIBDIR)/$(PROJECT).rc
     WINRES_O                 = $(WINRES_RC).o
     SO_SUFFIX                = dll
-    SO_PREFIX               ?= 
+    SO_PREFIX               ?=
     LIB_DEF                  = $(BUILD_LIBDIR)/$(LIBNAME).def
     MSVCPP_IMPLIB            = $(BUILD_LIBDIR)/$(LIBNAME).lib
     LIB_SO                   = $(BUILD_LIBDIR)/$(LIBNAME).dll
diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index 3753fd5c..c4c63d3b 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -1,6 +1,6 @@
 # jw-build library
 # (c) 2001 jannet it services
-# contact@jannet.de     
+# contact@jannet.de
 # $Id$
 
 # -- files
@@ -28,7 +28,7 @@ RSYSLOG_DIR                 ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d
 IMG_PREFIX                  ?= $(PREFIX)
 LOG_PREFIX                  ?= $(PREFIX)/log
 JAVA_PREFIX                 ?= $(PREFIX)
-HDR_SCOPE_PREFIX            ?= 
+HDR_SCOPE_PREFIX            ?=
 
 IMAGEDIR                    ?= $(MODDIR)/../../images
 CTRLDIR                     ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
@@ -298,4 +298,3 @@ BREAK_ABI                   ?= true
 #INSTALL_HOME_BIN_WRAPPERS  ?= true
 
 #export MALLOC_CHECK_        = 3
-
diff --git a/make/defs-dirs.mk b/make/defs-dirs.mk
index 8ece8cd3..f26f019e 100644
--- a/make/defs-dirs.mk
+++ b/make/defs-dirs.mk
@@ -7,4 +7,3 @@ ALLOWED_SUBDIR_TARGETS      ?= all install clean distclean test link-in
 SUBDIRS                     ?= $(ORDERED_SUBDIRS) $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS))
 #SUBDIRS                    ?= $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS))
 #SUBDIRS                    ?= $(FIND_SUBDIRS)
-
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index bd8e9777..8c577687 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -1,6 +1,6 @@
 # jw-build library
 # (c) 2001 jannet it services
-# contact@jannet.de     
+# contact@jannet.de
 # $Id$
 
 # -- files
@@ -28,7 +28,7 @@ RSYSLOG_DIR                 ?= $(ENV_PREFIX)/etc/rsyslog.d
 IMG_PREFIX                  ?= $(PREFIX)
 LOG_PREFIX                  ?= $(ENV_PREFIX)/var/log
 JAVA_PREFIX                 ?= $(PREFIX)
-HDR_SCOPE_PREFIX            ?= 
+HDR_SCOPE_PREFIX            ?=
 
 IMAGEDIR                    ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images
 CTRLDIR                     ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
diff --git a/make/defs.mk b/make/defs.mk
index 6e53646c..21ed3f4e 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -41,7 +41,7 @@ ifeq ($(origin RM),default)
   RM                        := $(shell $(WHICH) rm)
 endif
 ifndef AR
-  AR                         = $(shell $(WHICH) ar)
+  AR                        := $(shell $(WHICH) ar)
 endif
 #ifndef PWD
   PWD                       := $(shell $(WHICH) pwd)
@@ -391,14 +391,14 @@ INSTALLED_MAKE              += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES))
 
 # -- IMG
 INSTALLATION_FILE_TYPES     += IMG
-BUILD_IMG                   ?= 
+BUILD_IMG                   ?=
 BUILD_IMGDIR                ?= $(TOPDIR)/images
 INSTALL_IMGDIR              ?= $(IMG_PREFIX)/images
 INSTALLED_IMG               ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES))
 
 # -- MO
 INSTALLATION_FILE_TYPES     += MO
-BUILD_MO                    ?= 
+BUILD_MO                    ?=
 BUILD_MODIR                 ?= $(CWD)
 INSTALL_MODIR               ?= $(ENV_PREFIX)/usr/share/locale/$(GETTEXT_LOCALE)/LC_MESSAGES
 INSTALLED_MO                ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo))
@@ -406,9 +406,9 @@ INSTALLED_MO                ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo))
 # -- LOG
 INSTALLATION_FILE_TYPES     += LOG
 BUILD_LOGDIR                ?= $(TOPDIR)/log
-BUILD_LOG                   ?= 
+BUILD_LOG                   ?=
 INSTALL_LOGDIR              ?= $(LOG_PREFIX)/$(PROJECT)
-INSTALLED_LOG               ?= 
+INSTALLED_LOG               ?=
 
 # -- PROFILE
 INSTALLATION_FILE_TYPES     += PROFILE
diff --git a/make/disabled.mk b/make/disabled.mk
index 8744906a..2b6558c8 100644
--- a/make/disabled.mk
+++ b/make/disabled.mk
@@ -5,4 +5,3 @@ all:
 
 install clean distclean:
 	$(call DISABLED,$@)
-
diff --git a/make/dist.mk b/make/dist.mk
index 4b87a828..52a7c2c9 100644
--- a/make/dist.mk
+++ b/make/dist.mk
@@ -85,4 +85,3 @@ install.dist: $(DIST_FILE) $(SSI_PREFIX)_$(PROJECT)_$(DIST_VERSION).html
 		$(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
 			cd $$DIR; find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" ;\
 	done
-
diff --git a/make/doc-rules.mk b/make/doc-rules.mk
index f8c6dbb8..8e411d49 100644
--- a/make/doc-rules.mk
+++ b/make/doc-rules.mk
@@ -10,5 +10,3 @@ distclean:
 
 doc.clean:
 	$(RM) -rf *~ .*.swp
-
-
diff --git a/make/doc.mk b/make/doc.mk
index ee2ace88..9ac38141 100644
--- a/make/doc.mk
+++ b/make/doc.mk
@@ -6,4 +6,3 @@
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/doc-rules.mk
-
diff --git a/make/doxygen.mk b/make/doxygen.mk
index fa262078..f482726e 100644
--- a/make/doxygen.mk
+++ b/make/doxygen.mk
@@ -31,8 +31,8 @@ DX_BROWSER                  ?= $(BROWSER)
 DX_FILE_PATTERNS            ?= *.h *.c *.cpp
 DX_INPUT_DIRS               ?= $(TOPDIR)/include
 DX_SRC_IS_JAVA              ?= NO
-DX_EXCLUDE_FILES            ?= 
-DX_INCLUDE_PATH             ?= 
+DX_EXCLUDE_FILES            ?=
+DX_INCLUDE_PATH             ?=
 DX_RECURSIVE                ?= YES
 DX_EXTRACT_STATIC           ?= NO
 DX_INLINE_SOURCES           ?= NO
@@ -51,7 +51,7 @@ doxygen.done: $(DX_UNTEMPLATED) $(DX_INCLUDE)
 	umask 022; doxygen $(DX_DOXYGEN_CONF)
 	touch $@
 
-cpfiles.done: doxygen.done $(DX_DOC_FILES) 
+cpfiles.done: doxygen.done $(DX_DOC_FILES)
 	umask 022; cp $(DX_DOC_FILES) $(DX_OUTPUT_DIR)
 	touch $@
 
@@ -70,7 +70,7 @@ clean.doxygen:
 inst-dir.done:
 	$(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR)
 	touch $@
-	
+
 install.done: doxygen.done inst-dir.done
 	make install.doxygen
 	touch $@
@@ -128,4 +128,3 @@ doxygen.conf.tmpl: | $(DX_FALLBACK_CONF_TMPL)
 	mv $@.tmp $@
 
 endif
-
diff --git a/make/exe.mk b/make/exe.mk
index 8d25b96a..c012ff69 100644
--- a/make/exe.mk
+++ b/make/exe.mk
@@ -19,4 +19,3 @@ $(LIB_SO): $(LIB_A)
 $(EXE): $(LIB_SO)
 endif
 all.dirs:
-
diff --git a/make/git-submod.mk b/make/git-submod.mk
index 0c48e81f..77bdb159 100644
--- a/make/git-submod.mk
+++ b/make/git-submod.mk
@@ -30,4 +30,3 @@ git-init-submod-remote:
 	git -C $(TOPDIR) submodule add -f $(GIT_REPO_URL) $(SUBMOD_PATH)
 	git submodule init
 	git commit -m "Add git submodule $(SUBMOD_PATH)" $(SUBMOD_SRC_DIR) $(TOPDIR)/.gitmodules
-
diff --git a/make/install-files.mk b/make/install-files.mk
index 58c66660..ebf3d813 100644
--- a/make/install-files.mk
+++ b/make/install-files.mk
@@ -52,4 +52,3 @@ install-old.done:
 		fi ;\
 	done
 	touch $@
-
diff --git a/make/isolinux.mk b/make/isolinux.mk
index 32dc0023..4014418e 100644
--- a/make/isolinux.mk
+++ b/make/isolinux.mk
@@ -60,4 +60,3 @@ BOOT_CONF                    = boot.conf
 
 $(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES)
 	$(GENERATE) -o $@ -d $(BUILD_DIR) -f $< $(CD_FILES)
-
diff --git a/make/js.mk b/make/js.mk
index 63ef5ed7..00f87957 100644
--- a/make/js.mk
+++ b/make/js.mk
@@ -2,7 +2,7 @@ JAVA                        ?= /usr/bin/java
 JS_MINIFY_FILTER_IN         ?= sed 's/console\.[a-z]\+([^)]\+) *;//g'
 JS_SRC                      ?= $(filter-out %.min.js,$(wildcard *.js))
 JS_GENERATED                ?= $(patsubst %.js,%.min.js,$(JS_SRC))
-JS_EXTRA_EXTERNS            ?= 
+JS_EXTRA_EXTERNS            ?=
 JS_CC_BUILD_ROOT            ?= $(PROJECTS_DIR)/closure-compiler/contrib/closure-compiler/install-root
 JS_EXTERNS_DIRS             ?= $(firstword $(wildcard $(JS_CC_BUILD_ROOT)/$(realpath $(PROJECTS_DIR))/closure-compiler/share/externs /opt/closure-compiler/share/externs))
 JS_EXTERNS                  ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js)
diff --git a/make/ldlibpath.mk b/make/ldlibpath.mk
index c8e14fc6..d640e0d6 100644
--- a/make/ldlibpath.mk
+++ b/make/ldlibpath.mk
@@ -1,4 +1,4 @@
-# jan's utility modules  
+# jan's utility modules
 # (c) 2001-2005 jannet it services
 # contact@jannet.de
 # $Id$
diff --git a/make/lib.mk b/make/lib.mk
index 3c8a895f..1f7f5218 100644
--- a/make/lib.mk
+++ b/make/lib.mk
@@ -89,4 +89,3 @@ clean: clean.winres
 #%.o : %.rc
 #	$(WINDRES) $^ -o $@
 endif
-
diff --git a/make/libsrc.mk b/make/libsrc.mk
index f644ddfc..5b1c184e 100644
--- a/make/libsrc.mk
+++ b/make/libsrc.mk
@@ -4,4 +4,3 @@
 # $Id$
 
 include $(MODDIR)/make/tools.mk
-
diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk
index de44a81e..1ccfa9e8 100644
--- a/make/linux-rpm-build.mk
+++ b/make/linux-rpm-build.mk
@@ -108,7 +108,7 @@ $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)-$(RPM_RELEASE): build.lxdone $(LOCAL_AFT
 $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)-$(RPM_RELEASE): $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)
 	cp $< $@
 
-$(F_TGZ): Makefile build.lxdone $(F_BOOTFILES) $(TMP_INSTALL)/$(F_SPEC) 
+$(F_TGZ): Makefile build.lxdone $(F_BOOTFILES) $(TMP_INSTALL)/$(F_SPEC)
 	tar -czf $@ \
 		$(F_BOOTFILES)  \
 		$(addprefix $(TMP_INSTALL)/, \
@@ -178,10 +178,10 @@ ping:
 	ping $(HOST)
 ssh:
 	$(CVS_RSH) -l root $(HOST)
-	
+
 # user targets
 unpack: unpack.done
-build: build.lxdone 
+build: build.lxdone
 driver: driver.done
 tgz: $(F_TGZ)
 spm: $(F_SPM)
diff --git a/make/lo.mk b/make/lo.mk
index b28993d4..08fe7c0f 100644
--- a/make/lo.mk
+++ b/make/lo.mk
@@ -2,7 +2,7 @@
 TOOLS_DIR                   ?= $(TOPDIR)/tools
 TOOLS_INCLUDE_DIR           ?= $(TOOLS_DIR)
 CPP_PREFIX                  ?= YLo
-CPP_SUFFIX                  ?= 
+CPP_SUFFIX                  ?=
 SO_PREFIX                   ?= lo_
 LOADABLE_OBJ_HOOK           ?= LOADABLE_OBJECT_HOOK
 # === change this <
diff --git a/make/make.mk b/make/make.mk
index 6ae6b16a..ebe78529 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -74,8 +74,6 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
 	mv $@.tmp $@
 
 $(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
-	
+
 clean.pkg-config:
 	$(RM) -f *.pc $(BUILD_PKG_CONFIG)
-
-
diff --git a/make/plugin-defs.mk b/make/plugin-defs.mk
index 2c591a31..e8eee125 100644
--- a/make/plugin-defs.mk
+++ b/make/plugin-defs.mk
@@ -26,4 +26,3 @@ PLUGIN_VERSION_LIB           = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME)
 #INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
 PROJECT_LDFLAGS             += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive
 endif
-
diff --git a/make/plugin-version.mk b/make/plugin-version.mk
index 67b2ba7e..ff68f376 100644
--- a/make/plugin-version.mk
+++ b/make/plugin-version.mk
@@ -15,4 +15,3 @@ clean.local:
 
 $(PLUGIN_VERSION_LIB): version.o
 	ar r $@ $<
-
diff --git a/make/prereq-installed.mk b/make/prereq-installed.mk
index f75ef52b..c4fa373a 100644
--- a/make/prereq-installed.mk
+++ b/make/prereq-installed.mk
@@ -3,4 +3,3 @@ PREREQ_INSTALLED_TARGETS += run gdb valgrind attach attach-strace libpath valgri
 ifneq ($(filter $(PREREQ_INSTALLED_TARGETS),$(MAKECMDGOALS)),)
 PREREQ_BUILD      += $(shell ls /etc/ld.so.conf.d | sed '/ld-.*.conf/ !d; s/ld-\(.*\).conf/\1/')
 endif
-
diff --git a/make/profile.mk b/make/profile.mk
index 2a60fba1..7341114e 100644
--- a/make/profile.mk
+++ b/make/profile.mk
@@ -4,7 +4,7 @@
 # $Id$
 
 PATH_PROFILE                ?= path-$(PROJECT).sh
-EXE_SH                       = 
+EXE_SH                       =
 
 ifeq ($(PROFILE),)
   PROFILE                    = $(PATH_PROFILE)
diff --git a/make/profiler-rules-run.mk b/make/profiler-rules-run.mk
index 29302f45..4cac7750 100644
--- a/make/profiler-rules-run.mk
+++ b/make/profiler-rules-run.mk
@@ -82,4 +82,3 @@ gprof-view-callgraph-pdf: gprof-callgraph.pdf
 	okular $<
 clean.gprof:
 	$(RM) -f gmon.out gprof.txt *.tmp gprof-callgraph.pdf
-
diff --git a/make/projdefs.mk b/make/projdefs.mk
index efe0b47c..a464411d 100644
--- a/make/projdefs.mk
+++ b/make/projdefs.mk
@@ -10,5 +10,3 @@ include $(MODDIR)/make/defs.mk
 $(CAP_PROJECT)_VERSION := $(VERSION)
 $(CAP_PROJECT)_INSTALL_LIBDIR := $(INSTALL_LIBDIR)
 $(CAP_PROJECT)_TOPDIR := $(TOPDIR)
-
-
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index 2dc6cf1d..4535ce3a 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -71,7 +71,7 @@ endif
 ifeq ($(OFFLINE),true)
   UNAVAILABLE_TARGETS       ?= pull.done update.done clone.done
 else
-  UNAVAILABLE_TARGETS       ?= 
+  UNAVAILABLE_TARGETS       ?=
   export CVSROOT             = :ext:$(JANWARE_USER)@cvs.janware.com:/srv/cvs
 endif
 
@@ -122,7 +122,7 @@ GIT_PROJECTS                 = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.gi
 CVS_PROJECTS                 = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUILD_PROJECTS)))))
 
 # ------------ targets
-  
+
 # --- mandatory targets
 
 all: $(filter-out $(UNAVAILABLE_TARGETS),pull.done links.done)
@@ -149,7 +149,7 @@ doc-project doc-module:
 	$(BROWSER) $(firstword $(shell sed '/https:/ !d; s%.*https%https%; s/ .*//' $(firstword $(MAKEFILE_LIST))))
 
 status: $(SSH_WRAPPER_SH)
-	for p in $(CVS_PROJECTS); do test -f $$d/CVS || echo $$p; done 
+	for p in $(CVS_PROJECTS); do test -f $$d/CVS || echo $$p; done
 	cvs status $(addsuffix VERSION,$(CVS_PROJECTS))
 	$(PGIT_SH) -uno status
 
diff --git a/make/py-defs.mk b/make/py-defs.mk
index 4d792010..6d6dd211 100644
--- a/make/py-defs.mk
+++ b/make/py-defs.mk
@@ -29,7 +29,7 @@ PY_MOD                      ?= $(subst /,.,$(PY_INSTALL_MOD))
 PY_INSTALL_DIR              ?= $(ENV_PREFIX)$(PY_SITE_PACKAGES_PATH)/$(patsubst .,/,$(PY_INSTALL_MOD))
 PY_INSTALLED_REG             = $(addprefix $(PY_INSTALL_DIR)/,$(PY_ALL_PY) $(PY_PYC))
 
-empty                       := 
+empty                       :=
 space                       := $(empty) $(empty)
 PYTHONPATH                  ?= $(call proj_query, pythonpath $(PROJECT))
 #PYTHONPATH                  = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d)))
diff --git a/make/py-run.mk b/make/py-run.mk
index c7d1b3c9..c088e8f1 100644
--- a/make/py-run.mk
+++ b/make/py-run.mk
@@ -13,4 +13,3 @@ distclean:
 
 run:
 	/usr/bin/python2 $(EXE) $(EXE_ARGS)
-
diff --git a/make/qt-defs.mk b/make/qt-defs.mk
index a0ffe203..cc3f7d2b 100644
--- a/make/qt-defs.mk
+++ b/make/qt-defs.mk
@@ -63,7 +63,7 @@ CPPFLAGS                    += -DQT_THREAD_SUPPORT
 #endif
 
 # ------------------------------- Qt defs
-	
+
 	#Qt5Designer  \
 
 ifeq ($(QT_MAJOR_VERSION),5)
@@ -155,4 +155,3 @@ OBJ                         += $(patsubst %.cpp,%.o,$(UIC_CPP))
 OBJ                         += $(patsubst %.cpp,%.o,$(RCC_CPP))
 
 endif # USE_QT
-
diff --git a/make/qt-pro.mk b/make/qt-pro.mk
index 19837b97..6baef2e5 100644
--- a/make/qt-pro.mk
+++ b/make/qt-pro.mk
@@ -17,4 +17,3 @@ all: $(QMAKE_MAKEFILE)
 qmake.clean:
 	if [ -f $(QMAKE_MAKEFILE) ]; then make -f $(QMAKE_MAKEFILE) clean; fi
 	$(RM) -f $(QMAKE_MAKEFILE) *.tmp $(EXE) .qmake.stash
-
diff --git a/make/qt-rules.mk b/make/qt-rules.mk
index 22484774..c71303cf 100644
--- a/make/qt-rules.mk
+++ b/make/qt-rules.mk
@@ -12,9 +12,9 @@ rcc_%.cpp: %.qrc
 	$(RCC) -o $@ $<
 
 ifeq ($(QT_MAJOR_VERSION),4)
-ui_%.h: %.ui 
+ui_%.h: %.ui
 else
-%.h: %.ui 
+%.h: %.ui
 endif
 	$(UIC) $< -o $@
 
@@ -22,7 +22,6 @@ ifeq ($(QT_MAJOR_VERSION),4)
 uic_%.cpp: ui_%.h
 	echo -e "#include \"$<\"\n" > $@
 else
-uic_%.cpp: %.h %.ui 
+uic_%.cpp: %.h %.ui
 	$(UIC) $*.ui -i $< -o $@
 endif
-
diff --git a/make/qtexe.mk b/make/qtexe.mk
index ac673a5b..e8bc1161 100644
--- a/make/qtexe.mk
+++ b/make/qtexe.mk
@@ -10,4 +10,3 @@ include $(MODDIR)/make/defs-cpp.mk
 include $(MODDIR)/make/qt-defs.mk
 include $(MODDIR)/make/exe.mk
 include $(MODDIR)/make/qt.mk
-
diff --git a/make/qtplugin.mk b/make/qtplugin.mk
index eb80a7fe..a1b65ecc 100644
--- a/make/qtplugin.mk
+++ b/make/qtplugin.mk
@@ -8,4 +8,3 @@ QT_MAJOR_VERSION ?= 4
 
 include $(MODDIR)/make/plugin.mk
 include $(MODDIR)/make/qt.mk
-
diff --git a/make/qtso.mk b/make/qtso.mk
index fb7774f2..603afefa 100644
--- a/make/qtso.mk
+++ b/make/qtso.mk
@@ -6,4 +6,3 @@
 include $(MODDIR)/make/qtversion.mk
 include $(MODDIR)/make/so.mk
 include $(MODDIR)/make/qt.mk
-
diff --git a/make/qttools.mk b/make/qttools.mk
index 15658647..b9808a72 100644
--- a/make/qttools.mk
+++ b/make/qttools.mk
@@ -7,7 +7,7 @@ include $(MODDIR)/make/qtversion.mk
 include $(MODDIR)/make/tools.mk
 #include $(MODDIR)/make/defs.mk
 #include $(MODDIR)/make/defs-cpp.mk
-#ALL += $(BUILD_LIBDIR) $(PREREQ_DONE) $(BUILD_HDR) $(LOCAL_EXE_SH) $(MEMBERS) 
+#ALL += $(BUILD_LIBDIR) $(PREREQ_DONE) $(BUILD_HDR) $(LOCAL_EXE_SH) $(MEMBERS)
 #include $(MODDIR)/make/rules.mk
 #clean: objclean textclean localclean
 #install: $(ALL)
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 5e048ad0..39b62777 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -145,7 +145,7 @@ clean.rpm:
 #$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE)
 #	sh $(MOD_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
 #	mv $@.tmp $@
-#	
+#
 #clean.mkspec:
 #	$(RM) -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp
 #
@@ -231,7 +231,7 @@ ifeq ($(wildcard $(TOPDIR)/.git),)
 
 SCM_COMMIT                   = cvs commit
 SCM_ADD                      = cvs add
-SCM_PUSH                     = 
+SCM_PUSH                     =
 SCM_PULL                     = cvs update -dP
 
 define check_scm_sync
@@ -302,7 +302,7 @@ define check_reinstall_old
 	(true $(addprefix && test -f ,$(DIST_PCKG_RPM)) && make pkg-uninstall && make pkg-install)
 endef
 
-md5: 
+md5:
 	echo $(HASH) > HASH
 
 pkg-next-build:
diff --git a/make/rules.mk b/make/rules.mk
index 83fe1a0f..c0464055 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -139,7 +139,7 @@ prepend_header:
 	set -e; for f in $(SRC_UNHEADERED); do sh $(TOPDIR)/hdr/prepend_header.sh $$f; done
 
 remake:
-	set -e; make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS)) 
+	set -e; make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS))
 
 echo-target:
 	@echo "TARGET_TUPLE         = $(TARGET_TUPLE)"
@@ -345,10 +345,10 @@ else
 endif
 
 $(EXE) $(EXE_BIN):
-	$(CPP) $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@ 
+	$(CPP) $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
 
 $(PLUGIN) $(PLUGIN_LIB):
-	$(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@ 
+	$(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
 #	mkdir -p $(BUILD_LIBDIR)
 #	$(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR)
 
diff --git a/make/run.mk b/make/run.mk
index e603a89e..40396727 100644
--- a/make/run.mk
+++ b/make/run.mk
@@ -6,7 +6,7 @@
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/defs-cpp.mk
 
-DIR_BASENAME                 = $(notdir $(shell $(PWD)))
+DIR_BASENAME                 = $(notdir $(CWD))
 
 ifeq ($(EXE_BASENAME),)
   ifneq ($(DIR_BASENAME),test)
@@ -17,13 +17,13 @@ ifeq ($(EXE_BASENAME),)
 endif
 
 ifneq ($(EXE_BASENAME),)
-ifneq ($(TARGET),mingw)
-EXE                         ?= $(EXE_BASENAME)
-SHORTCUT_SCRIPT             ?= ./run.sh
-else
-EXE                         ?= $(EXE_BASENAME).exe
-SHORTCUT_SCRIPT             ?= run.bat
-endif
+  ifneq ($(TARGET),mingw)
+    EXE                     ?= $(EXE_BASENAME)
+    SHORTCUT_SCRIPT         ?= ./run.sh
+  else
+    EXE                     ?= $(EXE_BASENAME).exe
+    SHORTCUT_SCRIPT         ?= run.bat
+  endif
 endif
 
 EXE_PATH                    ?= ./$(EXE)
@@ -33,7 +33,7 @@ LOCAL_CFLAGS                += -DEXE_NAME=\"$(EXE)\"
 LOCAL_CPPFLAGS              += -DEXE_NAME=\"$(EXE)\"
 
 include $(MODDIR)/make/profiler.mk
-BUILD_HDR                    = 
+BUILD_HDR                    =
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/ldlibpath.mk
 include $(MODDIR)/make/path-rules.mk
@@ -42,7 +42,7 @@ include $(MODDIR)/make/debugger.mk
 EXE_ARGS                    += $(LOCAL_EXE_ARGS)
 
 ifneq ($(wildcard local.supp),)
-VALGRIND_OPTS               += --suppressions=local.supp
+  VALGRIND_OPTS             += --suppressions=local.supp
 endif
 
 all:
@@ -108,7 +108,7 @@ valgrind: run-prereq
 valkyrie: run-prereq
 	$(RM) -f core.*
 	valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
- 
+
 efence: run-prereq
 	$(RM) -f core.*
 	ef $(EXE_PATH) $(EXE_ARGS)
@@ -157,4 +157,3 @@ kcg:
 	kcachegrind callgrind.*
 
 clean: runclean localclean
-
diff --git a/make/scripts-targets.mk b/make/scripts-targets.mk
index dd618988..6727f11f 100644
--- a/make/scripts-targets.mk
+++ b/make/scripts-targets.mk
@@ -34,4 +34,3 @@ install-home-bin: $(HOME_BIN_EXE_SH)
 
 clean.init:
 	$(RM) -f $(_INIT_SCRIPTS)
-
diff --git a/make/smart-selection.mk b/make/smart-selection.mk
index 7bfa97e4..f795fb62 100644
--- a/make/smart-selection.mk
+++ b/make/smart-selection.mk
@@ -68,4 +68,3 @@ smart-config.done:
 	sudo smart config --set rpm-check-signatures=false
 	sudo smart config --set remove-packages=false
 	touch $@
-
diff --git a/make/standalone-exe.mk b/make/standalone-exe.mk
index ab0da25e..962f6f62 100644
--- a/make/standalone-exe.mk
+++ b/make/standalone-exe.mk
@@ -31,4 +31,3 @@ strace: $(EXE) $(EXE_BIN)
 all.dirs:
 clean: execlean localclean clean.standalone-exe
 clean.standalone-exe:
-
diff --git a/make/std-tools.mk b/make/std-tools.mk
index c90c86f1..b9608fd8 100644
--- a/make/std-tools.mk
+++ b/make/std-tools.mk
@@ -29,7 +29,6 @@ install.std-tools.done: install.std-dir.done
 	$(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) $(PROFILE_SH) $(PROFILE_DIR)
 	touch $@
 
-install.std-dir.done: 
+install.std-dir.done:
 	mkdir -p $(PROFILE_DIR)
 	touch $@
-
diff --git a/make/subdirs.mk b/make/subdirs.mk
index 78ed3123..7679b54d 100644
--- a/make/subdirs.mk
+++ b/make/subdirs.mk
@@ -13,4 +13,3 @@ clean.var:
 	$(RM) -rf $(CLEAN)
 distclean.var:
 	$(RM) -rf $(DISTCLEAN)
-
diff --git a/make/subtree.mk b/make/subtree.mk
index 38779faa..d3e1e96b 100644
--- a/make/subtree.mk
+++ b/make/subtree.mk
@@ -37,4 +37,3 @@ $(INSTALLED_SUBTREE_DIRS):
 
 $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/%: %
 	$(INSTALL) -p -o $(SUBTREE_OWNER) -g $(SUBTREE_GROUP) -m $(SUBTREE_MODE) $< $@
-
diff --git a/make/swig.mk b/make/swig.mk
index 4fa19899..222c86ed 100644
--- a/make/swig.mk
+++ b/make/swig.mk
@@ -94,7 +94,7 @@ else ifeq ($(SWIG_TARGET),java)
   #SWIG_INSTALLED_EXTRA     += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
 
   INCLUDE                   += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-  #BUILD_LDFLAGS            += 
+  #BUILD_LDFLAGS            +=
 
   INSTALL_LIBDIR             = $(SWIG_MODULE_TARGET_DIR)
 
@@ -178,4 +178,3 @@ clean.generated:
 
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/depend.mk
-
diff --git a/make/test-exe.mk b/make/test-exe.mk
index 1a01da8e..a8ee9788 100644
--- a/make/test-exe.mk
+++ b/make/test-exe.mk
@@ -30,4 +30,3 @@ $(LIB_SO): $(LIB_A)
 $(EXE): $(LIB_SO)
 endif
 all.dirs:
-
diff --git a/make/tex.mk b/make/tex.mk
index 6370666c..ed40f6fa 100644
--- a/make/tex.mk
+++ b/make/tex.mk
@@ -8,7 +8,7 @@ CUSTOMER                    ?= jannet
 PROJECT                     ?= legal
 TOPIC                       ?= $(notdir $(shell $(PWD)))
 VERSION                     ?= $(shell sed "s/-dev$$//" VERSION)
-AUTHORS                     ?= 
+AUTHORS                     ?=
 #TITLE                      ?= Allgemeine Bedingungen für
 #SUBTITLE                   ?= Dienstgüte-Vereinbarungen
 DATE                        ?= $(shell date +'%Y/%m/%d')
@@ -314,7 +314,7 @@ dirs.done:
 	touch dirs.done
 
 dirs: dirs.done
- 
+
 arch:
 	test $(shell uname -s) = Linux
 
@@ -334,7 +334,7 @@ $(OUT).tex.zip: cfgtest $(LATEX_INPUT)
 
 #$(OUTPUT).dvi: $(LATEX_INPUT)
 #	@echo "-- creating dvi file"
-#	$(latex) $(MAIN).tex; $(latex) $(MAIN).tex; $(latex) $(MAIN).tex;			
+#	$(latex) $(MAIN).tex; $(latex) $(MAIN).tex; $(latex) $(MAIN).tex;
 #	cp $(MAIN).dvi $@
 
 #$(OUT).dvi.zip: $(OUTPUT).dvi
@@ -431,4 +431,3 @@ unzip:
 UPLOAD_FILES                 = $(OUTPUT).pdf
 
 include $(MODDIR)/make/upload.mk
-
diff --git a/make/text.mk b/make/text.mk
index 90112137..daee9a14 100644
--- a/make/text.mk
+++ b/make/text.mk
@@ -11,4 +11,3 @@ install:
 distclean: textclean localclean
 clean: textclean localclean
 test:
-
diff --git a/make/textest.mk b/make/textest.mk
index bb93cfff..55f8abab 100644
--- a/make/textest.mk
+++ b/make/textest.mk
@@ -32,4 +32,3 @@ $(OUT_PNG): $(OUT_PDF)
 
 clean.files:
 	$(RM) -rf *.done *.aux *.log *.pdf *.nav *.out *.snm *.toc .*.swp $(OUT_PNG) *.vrb
-
diff --git a/make/theme-images.mk b/make/theme-images.mk
index ea76b132..18dd3564 100644
--- a/make/theme-images.mk
+++ b/make/theme-images.mk
@@ -32,4 +32,3 @@ install-images.done: basedir.done generate.done $(INSTALLED_IMG)
 
 blah:
 	@echo GENERATED_IMAGES = $(GENERATED_IMAGES)
-
diff --git a/make/tmpl.mk b/make/tmpl.mk
index 83bb8485..1f048bd3 100644
--- a/make/tmpl.mk
+++ b/make/tmpl.mk
@@ -20,4 +20,3 @@ all:
 install: install_TMPL
 clean: textclean localclean doneclean
 test:
-
diff --git a/make/tools-matlab.mk b/make/tools-matlab.mk
index aa3fc3d9..9d7eed83 100644
--- a/make/tools-matlab.mk
+++ b/make/tools-matlab.mk
@@ -1,2 +1 @@
 include $(MODDIR)/make/dummy.mk
-
diff --git a/make/topdir.mk b/make/topdir.mk
index e8f9b3cc..882fc812 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -20,7 +20,7 @@ OPT_JANWARE_PROJECT         ?= -j
 ifeq ($(OPT_JANWARE_PROJECT),-j)
 REMOTE_GIT_FLAVOUR          ?= proj
 else
-OPT_JANWARE_PROJECT          = 
+OPT_JANWARE_PROJECT          =
 REMOTE_GIT_FLAVOUR          ?= priv
 endif
 
@@ -52,7 +52,7 @@ ifneq ($(SUBDIRS_TO_ITERATE),)
   else
     SUBDIR_TARGETS           = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
   endif
-  
+
 endif
 
 include $(MODDIR)/make/rpmdist.mk
diff --git a/make/upload-defs.mk b/make/upload-defs.mk
index 5a7c57a0..32c5a121 100644
--- a/make/upload-defs.mk
+++ b/make/upload-defs.mk
@@ -8,11 +8,11 @@ UPLOAD_USER                 ?= $(shell id -nu)
 UPLOAD_HOST_LOGIN           ?= root
 UPLOAD_HOST                 ?= files.janware.com
 UPLOAD_FILES_ROOT           ?= /srv/dav/pub/clients/$(JANWARE_CLIENT)
-#UPLOAD_TEST_PREFIX         ?= 
+#UPLOAD_TEST_PREFIX         ?=
 UPLOAD_MODULE_PATH          ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE)
 UPLOAD_MODULE_ROOT          ?= $(UPLOAD_FILES_ROOT)/$(UPLOAD_MODULE_PATH)
 UPLOAD_TARGET_PREFIX        ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_MODULE_ROOT)/
-#UPLOAD_FILES               ?= 
+#UPLOAD_FILES               ?=
 REMOTE_TARGETS              ?= \
 	$(foreach f,$(notdir $(UPLOAD_FILES)),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
 UPLOAD_SRC_DIR              ?= .
diff --git a/make/upload-rules.mk b/make/upload-rules.mk
index dbb10816..9b1c645b 100644
--- a/make/upload-rules.mk
+++ b/make/upload-rules.mk
@@ -15,4 +15,3 @@ clean: upload.clean
 
 upload.clean:
 	$(RM) -f upload.dist yupdate.*.dist
-
diff --git a/make/upload.mk b/make/upload.mk
index 07be6bd3..d2ee499e 100644
--- a/make/upload.mk
+++ b/make/upload.mk
@@ -29,4 +29,3 @@ clean: upload.clean
 
 upload.clean:
 	$(RM) -f upload.dist
-
diff --git a/make/winres.rc.tmpl b/make/winres.rc.tmpl
index 278fa6cd..f3318605 100644
--- a/make/winres.rc.tmpl
+++ b/make/winres.rc.tmpl
@@ -51,4 +51,3 @@ BEGIN
         VALUE "Translation", 0x409, 1252
     END
 END
-
diff --git a/make/wt-defs.mk b/make/wt-defs.mk
index d3d9c0ce..19cd0f48 100644
--- a/make/wt-defs.mk
+++ b/make/wt-defs.mk
@@ -19,4 +19,3 @@ ifeq ($(USE_WT),true)
   PROJECT_LDFLAGS           += -lwt
 
 endif
-
diff --git a/make/yapp.mk b/make/yapp.mk
index 837ac6c8..b880c888 100644
--- a/make/yapp.mk
+++ b/make/yapp.mk
@@ -4,7 +4,7 @@ YAPP_CLASS                  ?= $(firstword $(basename $(notdir $(wildcard $(addp
 		    $(YAPP_INCLUDE_DIR)/, YApp*.h App*.h Y*.h *.h)))))
 YAPP_CLASS_H                ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
 	$(YAPP_INCLUDE_DIR) $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
-YAPP_NAMESPACE              ?= 
+YAPP_NAMESPACE              ?=
 
 ifneq ($(TARGET),mingw)
 LOCAL_LDFLAGS               += -rdynamic
@@ -26,4 +26,3 @@ main.cpp: $(YAPP_CLASS_H)
 	echo "#include <ytools/YAppRunner.h>" >> $@.tmp
 	echo "yapp_main($(YAPP_CLASS))" >> $@.tmp
 	mv $@.tmp $@
-
diff --git a/make/zip-windows-files.mk b/make/zip-windows-files.mk
index 64f64611..13e5ce5f 100644
--- a/make/zip-windows-files.mk
+++ b/make/zip-windows-files.mk
@@ -58,5 +58,3 @@ $(WINLIB): $(REQUIRED_H)
 	cp $(MODDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/
 	cd $(DISTDIR)/src; zip -r $(notdir $@) $(PROJECT)
 	mv $(DISTDIR)/src/$(notdir $@) $@
-
-
diff --git a/scripts/Makefile b/scripts/Makefile
index ed31d913..8a51da99 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -5,4 +5,3 @@ include $(TOPDIR)/make/proj.mk
 EXE_SH += jannet jcs jw-pkg
 
 include $(MODDIR)/make/scripts.mk
-
diff --git a/tmpl/doxygen/Makefile b/tmpl/doxygen/Makefile
index 8dc3caa5..352a06a0 100644
--- a/tmpl/doxygen/Makefile
+++ b/tmpl/doxygen/Makefile
@@ -22,4 +22,3 @@ $(LOGO): $(GENERATED_PNG)
 
 clean.local:
 	rm -f $(LOGO)
-
diff --git a/tmpl/doxygen/doxygen.conf.tmpl b/tmpl/doxygen/doxygen.conf.tmpl
index 86642cd2..fd23e4a9 100644
--- a/tmpl/doxygen/doxygen.conf.tmpl
+++ b/tmpl/doxygen/doxygen.conf.tmpl
@@ -15,11 +15,10 @@ GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 
 HTML_HEADER            = header.html
-HTML_FOOTER            = footer.html 
+HTML_FOOTER            = footer.html
 HTML_EXTRA_STYLESHEET  = styles.css
 EXCLUDE_SYMLINKS       = YES
 EXTRACT_STATIC         = __EXTRACT_STATIC__
 
 INLINE_SOURCES         = __INLINE_SOURCES__
 SOURCE_BROWSER         = __SOURCE_BROWSER__
-
diff --git a/tmpl/tagged/cortex-m/ld/30-mem.ld.tmpl b/tmpl/tagged/cortex-m/ld/30-mem.ld.tmpl
index 6d84b45b..1d7ad385 100644
--- a/tmpl/tagged/cortex-m/ld/30-mem.ld.tmpl
+++ b/tmpl/tagged/cortex-m/ld/30-mem.ld.tmpl
@@ -28,7 +28,7 @@
 /*
  * Memory Spaces Definitions.
  *
- * Need modifying for a specific board. 
+ * Need modifying for a specific board.
  *   FLASH.ORIGIN: starting address of flash
  *   FLASH.LENGTH: length of flash
  *   RAM.ORIGIN: starting address of RAM bank 0
diff --git a/tmpl/tagged/cortex-m/ld/50-cortex-m-sections.ld.tmpl b/tmpl/tagged/cortex-m/ld/50-cortex-m-sections.ld.tmpl
index 6651667e..ac8799fb 100644
--- a/tmpl/tagged/cortex-m/ld/50-cortex-m-sections.ld.tmpl
+++ b/tmpl/tagged/cortex-m/ld/50-cortex-m-sections.ld.tmpl
@@ -26,9 +26,9 @@
  */
 
 /*
- * Default linker script for Cortex-M (it includes specifics for 
+ * Default linker script for Cortex-M (it includes specifics for
  * STM32F[34]xx).
- * 
+ *
  * To make use of the multi-region initialisations, define
  * OS_INCLUDE_STARTUP_INIT_MULTIPLE_RAM_SECTIONS for the _startup.c file.
  */
@@ -42,7 +42,7 @@ _estack = __stack; 	/* STM specific definition */
 
 /*
  * Default stack sizes.
- * These are used by the startup in order to allocate stacks 
+ * These are used by the startup in order to allocate stacks
  * for the different modes.
  */
 
@@ -52,25 +52,25 @@ PROVIDE ( _Main_Stack_Size = __Main_Stack_Size ) ;
 
 __Main_Stack_Limit = __stack  - __Main_Stack_Size ;
 
-/* "PROVIDE" allows to easily override these values from an 
+/* "PROVIDE" allows to easily override these values from an
  * object file or the command line. */
 PROVIDE ( _Main_Stack_Limit = __Main_Stack_Limit ) ;
 
 /*
- * There will be a link error if there is not this amount of 
- * RAM free at the end. 
+ * There will be a link error if there is not this amount of
+ * RAM free at the end.
  */
 _Minimum_Stack_Size = 256 ;
 
 /*
  * Default heap definitions.
- * The heap start immediately after the last statically allocated 
+ * The heap start immediately after the last statically allocated
  * .sbss/.noinit section, and extends up to the main stack limit.
  */
 PROVIDE ( _Heap_Begin = _end_noinit ) ;
 PROVIDE ( _Heap_Limit = __stack - __Main_Stack_Size ) ;
 
-/* 
+/*
  * The entry point is informative, for debuggers and simulators,
  * since the Cortex-M vector points to it anyway.
  */
@@ -83,19 +83,19 @@ SECTIONS
 {
     /*
      * For Cortex-M devices, the beginning of the startup code is stored in
-     * the .isr_vector section, which goes to FLASH. 
+     * the .isr_vector section, which goes to FLASH.
      */
     .isr_vector : ALIGN(4)
     {
         FILL(0xFF)
-        
+
         __vectors_start = ABSOLUTE(.) ;
         __vectors_start__ = ABSOLUTE(.) ; /* STM specific definition */
         KEEP(*(.isr_vector))     	/* Interrupt vectors */
-        
-		KEEP(*(.cfmconfig))			/* Freescale configuration words */   
-		     
-        /* 
+
+		KEEP(*(.cfmconfig))			/* Freescale configuration words */
+
+        /*
          * This section is here for convenience, to store the
          * startup code at the beginning of the flash area, hoping that
          * this will increase the readability of the listing.
@@ -106,13 +106,13 @@ SECTIONS
 
     .inits : ALIGN(4)
     {
-        /* 
+        /*
          * Memory regions initialisation arrays.
          *
-         * Thee are two kinds of arrays for each RAM region, one for 
-         * data and one for bss. Each is iterrated at startup and the   
+         * Thee are two kinds of arrays for each RAM region, one for
+         * data and one for bss. Each is iterrated at startup and the
          * region initialisation is performed.
-         * 
+         *
          * The data array includes:
          * - from (LOADADDR())
          * - region_begin (ADDR())
@@ -122,34 +122,34 @@ SECTIONS
          * - region_begin (ADDR())
          * - region_end (ADDR()+SIZEOF())
          *
-         * WARNING: It is mandatory that the regions are word aligned, 
+         * WARNING: It is mandatory that the regions are word aligned,
          * since the initialisation code works only on words.
          */
-         
+
         __data_regions_array_start = .;
-        
+
         LONG(LOADADDR(.data));
         LONG(ADDR(.data));
         LONG(ADDR(.data)+SIZEOF(.data));
-        
+
         LONG(LOADADDR(.data_CCMRAM));
         LONG(ADDR(.data_CCMRAM));
         LONG(ADDR(.data_CCMRAM)+SIZEOF(.data_CCMRAM));
-        
+
         __data_regions_array_end = .;
-        
+
         __bss_regions_array_start = .;
-        
+
         LONG(ADDR(.bss));
         LONG(ADDR(.bss)+SIZEOF(.bss));
-        
+
         LONG(ADDR(.bss_CCMRAM));
         LONG(ADDR(.bss_CCMRAM)+SIZEOF(.bss_CCMRAM));
-        
+
         __bss_regions_array_end = .;
 
         /* End of memory regions initialisation arrays. */
-    
+
         /*
          * These are the old initialisation sections, intended to contain
          * naked code, with the prologue/epilogue added by crti.o/crtn.o
@@ -162,23 +162,23 @@ SECTIONS
 		. = ALIGN(4);
 
 		/*
-         * The preinit code, i.e. an array of pointers to initialisation 
+         * The preinit code, i.e. an array of pointers to initialisation
          * functions to be performed before constructors.
          */
 		PROVIDE_HIDDEN (__preinit_array_start = .);
-        
+
         /*
          * Used to run the SystemInit() before anything else.
          */
 		KEEP(*(.preinit_array_sysinit .preinit_array_sysinit.*))
-        
-        /* 
+
+        /*
          * Used for other platform inits.
          */
 		KEEP(*(.preinit_array_platform .preinit_array_platform.*))
-        
+
         /*
-         * The application inits. If you need to enforce some order in 
+         * The application inits. If you need to enforce some order in
          * execution, create new sections, as before.
          */
 		KEEP(*(.preinit_array .preinit_array.*))
@@ -215,27 +215,27 @@ SECTIONS
     {
         *(.flashtext .flashtext.*)	/* Startup code */
     } >FLASH
- 
-    
+
+
     /*
-     * The program code is stored in the .text section, 
+     * The program code is stored in the .text section,
      * which goes to FLASH.
      */
     .text : ALIGN(4)
     {
         *(.text .text.*)			/* all remaining code */
- 
+
  		/* read-only data (constants) */
-        *(.rodata .rodata.* .constdata .constdata.*) 		
+        *(.rodata .rodata.* .constdata .constdata.*)
 
         *(vtable)					/* C++ virtual tables */
 
 		KEEP(*(.eh_frame*))
 
 		/*
-		 * Stub sections generated by the linker, to glue together 
-		 * ARM and Thumb code. .glue_7 is used for ARM code calling 
-		 * Thumb code, and .glue_7t is used for Thumb code calling 
+		 * Stub sections generated by the linker, to glue together
+		 * ARM and Thumb code. .glue_7 is used for ARM code calling
+		 * Thumb code, and .glue_7t is used for Thumb code calling
 		 * ARM code. Apparently always generated by the linker, for some
 		 * architectures, so better leave them here.
 		 */
@@ -249,24 +249,24 @@ SECTIONS
    	{
        *(.ARM.extab* .gnu.linkonce.armextab.*)
    	} > FLASH
-   	
+
     . = ALIGN(4);
-   	__exidx_start = .;   	
+   	__exidx_start = .;
    	.ARM.exidx : ALIGN(4)
    	{
        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
    	} > FLASH
    	__exidx_end = .;
-   	
+
     . = ALIGN(4);
     _etext = .;
     __etext = .;
-    
+
     /* MEMORY_ARRAY */
     /*
     .ROarraySection :
     {
-     	*(.ROarraySection .ROarraySection.*)                          
+     	*(.ROarraySection .ROarraySection.*)
     } >MEMORY_ARRAY
     */
 
@@ -280,8 +280,8 @@ SECTIONS
        . = ALIGN(4) ;
     } > CCMRAM AT>FLASH
 
-	/* 
-     * This address is used by the startup code to 
+	/*
+     * This address is used by the startup code to
      * initialise the .data section.
      */
     _sidata = LOADADDR(.data);
@@ -291,7 +291,7 @@ SECTIONS
      *
      * The program executes knowing that the data is in the RAM
      * but the loader puts the initial values in the FLASH (inidata).
-     * It is one task of the startup to copy the initial values from 
+     * It is one task of the startup to copy the initial values from
      * FLASH to RAM.
      */
     .data : ALIGN(4)
@@ -303,7 +303,7 @@ SECTIONS
 		*(.data_begin .data_begin.*)
 
 		*(.data .data.*)
-		
+
 		*(.data_end .data_end.*)
 	    . = ALIGN(4);
 
@@ -312,12 +312,12 @@ SECTIONS
         __data_end__ = . ;
 
     } >RAM AT>FLASH
-    
+
     /*
      * The uninitialised data sections. NOLOAD is used to avoid
      * the "section `.bss' type changed to PROGBITS" warning
      */
-     
+
     /* The secondary uninitialised data section. */
 	.bss_CCMRAM (NOLOAD) : ALIGN(4)
 	{
@@ -333,7 +333,7 @@ SECTIONS
 
         *(.bss .bss.*)
         *(COMMON)
-        
+
         *(.bss_end .bss_end.*)
 	    . = ALIGN(4);
         __bss_end__ = .;        /* standard newlib definition */
@@ -342,25 +342,25 @@ SECTIONS
 
     .noinit_CCMRAM (NOLOAD) : ALIGN(4)
     {
-        *(.noinit.CCMRAM .noinit.CCMRAM.*)         
+        *(.noinit.CCMRAM .noinit.CCMRAM.*)
     } > CCMRAM
-    
+
     .noinit (NOLOAD) : ALIGN(4)
     {
         _noinit = .;
-        
-        *(.noinit .noinit.*) 
-        
+
+        *(.noinit .noinit.*)
+
          . = ALIGN(4) ;
-        _end_noinit = .;   
+        _end_noinit = .;
     } > RAM
-    
+
     /* Mandatory to be word aligned, _sbrk assumes this */
     PROVIDE ( end = _end_noinit ); /* was _ebss */
     PROVIDE ( _end = _end_noinit );
     PROVIDE ( __end = _end_noinit );
     PROVIDE ( __end__ = _end_noinit );
-    
+
     /*
      * Used for validation only, do not allocate anything here!
      *
@@ -371,10 +371,10 @@ SECTIONS
     {
         . = . + _Minimum_Stack_Size ;
     } >RAM
-    
+
     /*
      * The FLASH Bank1.
-     * The C or assembly source must explicitly place the code 
+     * The C or assembly source must explicitly place the code
      * or data there using the "section" attribute.
      */
     .b1text : ALIGN(4)
@@ -383,7 +383,7 @@ SECTIONS
         *(.b1rodata)                 /* read-only data (constants) */
         *(.b1rodata.*)
     } >FLASHB1
-    
+
     /*
      * The EXTMEM.
      * The C or assembly source must explicitly place the code or data there
@@ -397,7 +397,7 @@ SECTIONS
         *(.eb0rodata)                 /* read-only data (constants) */
         *(.eb0rodata.*)
     } >EXTMEMB0
-    
+
     /* EXTMEM Bank1 */
     .eb1text : ALIGN(4)
     {
@@ -405,7 +405,7 @@ SECTIONS
         *(.eb1rodata)                 /* read-only data (constants) */
         *(.eb1rodata.*)
     } >EXTMEMB1
-    
+
     /* EXTMEM Bank2 */
     .eb2text : ALIGN(4)
     {
@@ -413,7 +413,7 @@ SECTIONS
         *(.eb2rodata)                 /* read-only data (constants) */
         *(.eb2rodata.*)
     } >EXTMEMB2
-    
+
     /* EXTMEM Bank0 */
     .eb3text : ALIGN(4)
     {
@@ -421,12 +421,12 @@ SECTIONS
         *(.eb3rodata)                 /* read-only data (constants) */
         *(.eb3rodata.*)
     } >EXTMEMB3
-   
+
 
     /* After that there are only debugging sections. */
-    
-    /* This can remove the debugging information from the standard libraries */    
-    /* 
+
+    /* This can remove the debugging information from the standard libraries */
+    /*
     DISCARD :
     {
      libc.a ( * )
@@ -434,7 +434,7 @@ SECTIONS
      libgcc.a ( * )
      }
      */
-  
+
     /* Stabs debugging sections.  */
     .stab          0 : { *(.stab) }
     .stabstr       0 : { *(.stabstr) }
@@ -446,7 +446,7 @@ SECTIONS
     /*
      * DWARF debug sections.
      * Symbols in the DWARF debugging sections are relative to the beginning
-     * of the section so we begin them at 0.  
+     * of the section so we begin them at 0.
      */
     /* DWARF 1 */
     .debug          0 : { *(.debug) }
@@ -469,5 +469,5 @@ SECTIONS
     .debug_weaknames 0 : { *(.debug_weaknames) }
     .debug_funcnames 0 : { *(.debug_funcnames) }
     .debug_typenames 0 : { *(.debug_typenames) }
-    .debug_varnames  0 : { *(.debug_varnames) }    
+    .debug_varnames  0 : { *(.debug_varnames) }
 }
diff --git a/tmpl/tex/de_contract/frontpage.tex.tmpl b/tmpl/tex/de_contract/frontpage.tex.tmpl
index 94165ad6..a940e319 100644
--- a/tmpl/tex/de_contract/frontpage.tex.tmpl
+++ b/tmpl/tex/de_contract/frontpage.tex.tmpl
@@ -43,27 +43,27 @@
 \fbox{
 \parbox[t]{15cm}
 {
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Huge \bf __TITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
-\centerline{\Huge \bf __SUBTITLE__} 
+\centerline{\Huge \bf __SUBTITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 }}
 
-\vspace{3cm} 
+\vspace{3cm}
 
 \centerline{\Large __DATE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Large Dokumentversion: __VERSION__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \end{center}
 
@@ -76,5 +76,3 @@
 %\end{minipage}
 %\end{flushright}
 %\end{figure}
-
-
diff --git a/tmpl/tex/de_contract/header.tex.tmpl b/tmpl/tex/de_contract/header.tex.tmpl
index 7142ee63..b827bb03 100644
--- a/tmpl/tex/de_contract/header.tex.tmpl
+++ b/tmpl/tex/de_contract/header.tex.tmpl
@@ -180,7 +180,7 @@
 
 % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
 % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
- 
+
 
 \newcolumntype{v}[1]{%
 >{\raggedright\hspace{0pt}\arraybackslash}p{#1}%
@@ -217,7 +217,7 @@
 \fancyhead[C]{__TITLE__ __SUBTITLE__}
 %Linie oben
 %\renewcommand{\headrulewidth}{0.5pt}
- 
+
 %Fußzeile links bzw. innen
 \fancyfoot[L]{Dok.-Vers.: __VERSION__ vom __DATE__}
 %\fancyfoot[L]{__TITLE__ __SUBTITLE__ __VERSION__}
@@ -226,7 +226,7 @@
 \fancyfoot[R]{Seite \thepage \hspace{2pt} von \ztotpages}
 %Linie unten
 \renewcommand{\footrulewidth}{0.5pt}
- 
+
 % Fußzeile auf jeder Seite - auch Kapitel und Inhaltsverzeichnis
 \fancypagestyle{plain}{%
    \fancyhf{}%
@@ -235,5 +235,3 @@
    \renewcommand{\headrulewidth}{0.0pt} %obere Linie ausblenden
    \fancyfoot[R]{\thepage}
 }
-
-
diff --git a/tmpl/tex/de_contract/index_head.html.tmpl b/tmpl/tex/de_contract/index_head.html.tmpl
index de4f1d7e..8ac66da7 100644
--- a/tmpl/tex/de_contract/index_head.html.tmpl
+++ b/tmpl/tex/de_contract/index_head.html.tmpl
@@ -44,7 +44,7 @@
 
 <h2>Achtung!</h2>
 
-Diese Website wurde automatisch mit Hilfe des Skripts 
+Diese Website wurde automatisch mit Hilfe des Skripts
 <a
 href="http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html">latex2html</a> erstellt.
 Obwohl es ein sehr n&uuml;tzliches Programm ist, ist bei seiner Anwendung ein Teil des urspr&uuml;ichen Dokuments verloren gegangen.
diff --git a/tmpl/tex/de_presentation/frontpage.tex.tmpl b/tmpl/tex/de_presentation/frontpage.tex.tmpl
index 94165ad6..a940e319 100644
--- a/tmpl/tex/de_presentation/frontpage.tex.tmpl
+++ b/tmpl/tex/de_presentation/frontpage.tex.tmpl
@@ -43,27 +43,27 @@
 \fbox{
 \parbox[t]{15cm}
 {
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Huge \bf __TITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
-\centerline{\Huge \bf __SUBTITLE__} 
+\centerline{\Huge \bf __SUBTITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 }}
 
-\vspace{3cm} 
+\vspace{3cm}
 
 \centerline{\Large __DATE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Large Dokumentversion: __VERSION__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \end{center}
 
@@ -76,5 +76,3 @@
 %\end{minipage}
 %\end{flushright}
 %\end{figure}
-
-
diff --git a/tmpl/tex/de_presentation/header.tex.tmpl b/tmpl/tex/de_presentation/header.tex.tmpl
index 53b23039..907cff88 100644
--- a/tmpl/tex/de_presentation/header.tex.tmpl
+++ b/tmpl/tex/de_presentation/header.tex.tmpl
@@ -20,4 +20,3 @@
 \title{__TITLE__ -- __SUBTITLE__}
 \author[__AUTHORS__]{__AUTHORS__\\\href{mailto:__CONTACT_EMAIL__}{\code{__CONTACT_EMAIL__}}}
 \date{__DATE__}
-
diff --git a/tmpl/tex/de_presentation/index_head.html.tmpl b/tmpl/tex/de_presentation/index_head.html.tmpl
index de4f1d7e..8ac66da7 100644
--- a/tmpl/tex/de_presentation/index_head.html.tmpl
+++ b/tmpl/tex/de_presentation/index_head.html.tmpl
@@ -44,7 +44,7 @@
 
 <h2>Achtung!</h2>
 
-Diese Website wurde automatisch mit Hilfe des Skripts 
+Diese Website wurde automatisch mit Hilfe des Skripts
 <a
 href="http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html">latex2html</a> erstellt.
 Obwohl es ein sehr n&uuml;tzliches Programm ist, ist bei seiner Anwendung ein Teil des urspr&uuml;ichen Dokuments verloren gegangen.
diff --git a/tmpl/tex/de_technical/frontpage.ger.tmpl b/tmpl/tex/de_technical/frontpage.ger.tmpl
index 459df930..430befe9 100644
--- a/tmpl/tex/de_technical/frontpage.ger.tmpl
+++ b/tmpl/tex/de_technical/frontpage.ger.tmpl
@@ -45,27 +45,27 @@ DELETE
 \fbox{
 \parbox[t]{15.0cm}
 {
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Huge \bf __TITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
-\centerline{\Huge \bf __SUBTITLE__} 
+\centerline{\Huge \bf __SUBTITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 }}
 
-\vspace{3cm} 
+\vspace{3cm}
 
 \centerline{\Large __DATE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Large Dokumentversion: __VERSION__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \end{center}
 
@@ -78,5 +78,3 @@ DELETE
 \end{minipage}
 \end{flushright}
 \end{figure}
-
-
diff --git a/tmpl/tex/de_technical/frontpage.tex.tmpl b/tmpl/tex/de_technical/frontpage.tex.tmpl
index e87ebe76..92ea5c8e 100644
--- a/tmpl/tex/de_technical/frontpage.tex.tmpl
+++ b/tmpl/tex/de_technical/frontpage.tex.tmpl
@@ -51,27 +51,27 @@
 \fbox{
 \parbox[t]{15cm}
 {
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Huge \bf __TITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
-\centerline{\Huge \bf __SUBTITLE__} 
+\centerline{\Huge \bf __SUBTITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 }}
 
-\vspace{3cm} 
+\vspace{3cm}
 
 \centerline{\Large __DATE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Large Dokumentversion: __VERSION__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \end{center}
 
@@ -84,5 +84,3 @@
 \end{minipage}
 \end{flushright}
 \end{figure}
-
-
diff --git a/tmpl/tex/de_technical/header.ger.tmpl b/tmpl/tex/de_technical/header.ger.tmpl
index 0fed819e..6dd653e3 100644
--- a/tmpl/tex/de_technical/header.ger.tmpl
+++ b/tmpl/tex/de_technical/header.ger.tmpl
@@ -118,7 +118,7 @@ DELETE
 
 % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
 % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
- 
+
 
 \renewcommand\floatpagefraction{.9}
 \renewcommand\topfraction{.9}
@@ -126,7 +126,7 @@ DELETE
 \renewcommand\textfraction{.1}
 
 \newenvironment{prog}{\begin{quote}}{\end{quote} }
- 
-linkcolor=blue, 
-linkcolor=blue, 
+
+linkcolor=blue,
+linkcolor=blue,
             citecolor=blue, urlcolor=blue
diff --git a/tmpl/tex/de_technical/header.tex.tmpl b/tmpl/tex/de_technical/header.tex.tmpl
index 97164f7d..8d2bef66 100644
--- a/tmpl/tex/de_technical/header.tex.tmpl
+++ b/tmpl/tex/de_technical/header.tex.tmpl
@@ -180,7 +180,7 @@
 
 % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
 % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
- 
+
 
 \newcolumntype{v}[1]{%
 >{\raggedright\hspace{0pt}\arraybackslash}p{#1}%
@@ -217,7 +217,7 @@
 \fancyhead[C]{__TITLE__ __SUBTITLE__}
 %Linie oben
 %\renewcommand{\headrulewidth}{0.5pt}
- 
+
 %Fußzeile links bzw. innen
 \fancyfoot[L]{Dok.-Vers.: __VERSION__ vom __DATE__}
 %\fancyfoot[L]{__TITLE__ __SUBTITLE__ __VERSION__}
@@ -226,7 +226,7 @@
 \fancyfoot[R]{Seite \thepage \hspace{2pt} von \ztotpages}
 %Linie unten
 \renewcommand{\footrulewidth}{0.5pt}
- 
+
 % Fußzeile auf jeder Seite - auch Kapitel und Inhaltsverzeichnis
 \fancypagestyle{plain}{%
    \fancyhf{}%
@@ -235,5 +235,3 @@
    \renewcommand{\headrulewidth}{0.0pt} %obere Linie ausblenden
    \fancyfoot[R]{\thepage}
 }
-
-
diff --git a/tmpl/tex/de_technical/index_head.html.tmpl b/tmpl/tex/de_technical/index_head.html.tmpl
index de4f1d7e..8ac66da7 100644
--- a/tmpl/tex/de_technical/index_head.html.tmpl
+++ b/tmpl/tex/de_technical/index_head.html.tmpl
@@ -44,7 +44,7 @@
 
 <h2>Achtung!</h2>
 
-Diese Website wurde automatisch mit Hilfe des Skripts 
+Diese Website wurde automatisch mit Hilfe des Skripts
 <a
 href="http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html">latex2html</a> erstellt.
 Obwohl es ein sehr n&uuml;tzliches Programm ist, ist bei seiner Anwendung ein Teil des urspr&uuml;ichen Dokuments verloren gegangen.
diff --git a/tmpl/tex/en_technical/frontpage.ger.tmpl b/tmpl/tex/en_technical/frontpage.ger.tmpl
index c5955bf5..2c5adde7 100644
--- a/tmpl/tex/en_technical/frontpage.ger.tmpl
+++ b/tmpl/tex/en_technical/frontpage.ger.tmpl
@@ -43,27 +43,27 @@
 \fbox{
 \parbox[t]{15cm}
 {
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Huge \bf __TITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
-\centerline{\Huge \bf __SUBTITLE__} 
+\centerline{\Huge \bf __SUBTITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 }}
 
-\vspace{3cm} 
+\vspace{3cm}
 
 \centerline{\Large __DATE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Large Document Version: __VERSION__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \end{center}
 
@@ -76,5 +76,3 @@
 \end{minipage}
 \end{flushright}
 \end{figure}
-
-
diff --git a/tmpl/tex/en_technical/frontpage.tex.tmpl b/tmpl/tex/en_technical/frontpage.tex.tmpl
index 0b509e49..b3c545bd 100644
--- a/tmpl/tex/en_technical/frontpage.tex.tmpl
+++ b/tmpl/tex/en_technical/frontpage.tex.tmpl
@@ -43,31 +43,31 @@
 \fbox{
 \parbox[t]{15cm}
 {
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Huge \bf __TITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
-\centerline{\Huge \bf __SUBTITLE__} 
+\centerline{\Huge \bf __SUBTITLE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 }}
 
-\vspace{3cm} 
+\vspace{3cm}
 
-\centerline{\Huge \bf __CONFIDENTIAL_REMARK__} 
+\centerline{\Huge \bf __CONFIDENTIAL_REMARK__}
 
-\vspace{3cm} 
+\vspace{3cm}
 
 \centerline{\Large __DATE__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \centerline{\Large Document Version: __VERSION__}
 
-\vspace{0.3cm} 
+\vspace{0.3cm}
 
 \end{center}
 
diff --git a/tmpl/tex/en_technical/header.ger.tmpl b/tmpl/tex/en_technical/header.ger.tmpl
index 708780fa..45de46d7 100644
--- a/tmpl/tex/en_technical/header.ger.tmpl
+++ b/tmpl/tex/en_technical/header.ger.tmpl
@@ -117,7 +117,7 @@
 
 % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
 % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
- 
+
 
 \renewcommand\floatpagefraction{.9}
 \renewcommand\topfraction{.9}
@@ -125,4 +125,3 @@
 \renewcommand\textfraction{.1}
 
 \newenvironment{prog}{\begin{quote}}{\end{quote} }
- 
diff --git a/tmpl/tex/en_technical/header.tex.tmpl b/tmpl/tex/en_technical/header.tex.tmpl
index bfa439dd..87a8155a 100644
--- a/tmpl/tex/en_technical/header.tex.tmpl
+++ b/tmpl/tex/en_technical/header.tex.tmpl
@@ -127,7 +127,7 @@
 
 % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
 % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
- 
+
 
 \newcolumntype{v}[1]{%
 >{\raggedright\hspace{0pt}\arraybackslash}p{#1}%
@@ -139,4 +139,3 @@
 \renewcommand\textfraction{.1}
 
 \newenvironment{prog}{\begin{quote}}{\end{quote} }
-