diff --git a/make/tex.mk b/make/tex.mk
index 2903d156..655e61e8 100644
--- a/make/tex.mk
+++ b/make/tex.mk
@@ -3,16 +3,20 @@
 # contact@jannet.de
 # $Id$
 
+IMAGES = $(patsubst %,$(IMAGEDIR)/%,$(FRONTLOGO_EPS) $(FRONTLOGO_WEB) \
+	$(ICON_UP) $(ICON_PREV) $(ICON_NEXT) $(ICON_INDEX) $(ICON_CONTENTS))
+LOCAL_IMPORTED_TEMPLATES = $(notdir $(IMPORTED_TEMPLATES))
 FMT_OFFLINE = tex dvi ps pdf txt
 FMT = $(FMT_OFFLINE) html
-OUT = $(DISTDIR)/$(PROJECT)
+OUT = $(DISTDIR)/$(OUTPUT)
 FMT_OUT = $(patsubst %,$(OUT).%.zip,$(FMT))
 FMT_OFFLINE_OUT = $(patsubst %,$(OUT).%.zip,$(FMT_OFFLINE))
 ALL = $(FMT_OUT) html_install
 PRE_HTML = $(patsubst %.tmpl,%,$(wildcard *.html.tmpl))
-PRE_TEX  = $(patsubst %.tmpl,%,$(wildcard *.tex.tmpl))
-TEXSRC = $(wildcard *.tex $(IMAGEDIR)/* $(LOCAL_SRC)) $(PRE_TEX)
-
+PRE_TEX  = $(patsubst %.tmpl,%,$(wildcard *.tex.tmpl) $(LOCAL_IMPORTED_TEMPLATES))
+TEXSRC = $(wildcard *.tex $(IMAGES) $(LOCAL_SRC)) $(PRE_TEX)
+test:
+	echo $(LOCAL_IMPORTED_TEMPLATES) + $(IMPORTED_TEMPLATES) + $(TEX_TMPL_DIR)
 DATE := $(shell date +'%b, %d, %Y')
 
 WD = `pwd`
@@ -20,21 +24,33 @@ NEWDIRS = $(DISTDIR) $(HTMLDIR) $(DVIDIR)
 
 define replace_macros
 	@echo replacing macros in templates
+	TMPIMAGEDIR="`echo $(IMAGEDIR) | sed -e 's/\//\\\\\//g;'`" ;\
 	cat $< | sed -e "\
 		s/__DATE__/$(DATE)/g; \
 		s/__AUTHORS__/$(AUTHORS)/g; \
 		s/__TITLE__/$(TITLE)/g; \
+		s/__VERSION__/$(VERSION)/g; \
 		s/__SUBTITLE__/$(SUBTITLE)/g; \
+		s/__HEADER__/$(HEADER)/g; \
+		s/__FRONTPAGE__/$(FRONTPAGE)/g; \
+		s/__FRONTLOGO_EPS__/$$TMPIMAGEDIR\/$(FRONTLOGO_EPS)/g; \
+		s/__FRONTLOGO_WEB__/$(FRONTLOGO_WEB)/g; \
+		s/__ICON_UP__/$(ICON_UP)/g; \
+		s/__ICON_INDEX__/$(ICON_INDEX)/g; \
+		s/__ICON_CONTENTS__/$(ICON_CONTENTS)/g; \
+		s/__ICON_PREV__/$(ICON_PREV)/g; \
+		s/__ICON_NEXT__/$(ICON_NEXT)/g; \
 	" > $@
 endef
 
-all: $(ALL)
+all: dirs $(ALL)
 
-tex: $(OUT).tex.zip
-dvi: $(OUT).dvi.zip
-ps: $(OUT).ps.zip
-txt: $(OUT).txt.zip
-html: $(OUT).html.zip
+tex: dirs $(OUT).tex.zip
+dvi: dirs $(OUT).dvi.zip
+ps: dirs $(OUT).ps.zip
+txt: dirs $(OUT).txt.zip
+html: dirs $(OUT).html.zip
+pdf: dirs $(OUT).pdf.zip
 
 %.tex: %.tex.tmpl
 	$(replace_macros)
@@ -42,8 +58,11 @@ html: $(OUT).html.zip
 %.html: %.html.tmpl
 	$(replace_macros)
 
+%.tmpl: $(TEX_TMPL_DIR)/%.tmpl
+	cp $< $@
+
 cfgtest.done:
-	test -n "$(PROJECT)" # PROJECT
+	test -n "$(OUTPUT)" # OUTPUT
 	test -n "$(DISTDIR)" # DISTDIR
 	test -n "$(HTMLDIR)" # HTMLDIR
 	test -n "$(TARGET_HOST)" # TARGET_HOST
@@ -52,16 +71,20 @@ cfgtest.done:
 	test -n "$(TARGET_FILE_MODE)" # TARGET_FILE_MODE
 	test -n "$(TARGET_USER)" # TARGET_USER
 	test -n "$(MAIN)" # MAIN
-	test -n "$(IMAGEDIR)" # MAIN
+	test -n "$(FRONTPAGE)" # FRONTPAGE
+	test -n "$(IMAGES)" # IMAGES
 	test -n "$(AUTHORS)" # AUTHORS
 	test -n "$(TITLE)" # TITLE
 	test -n "$(SUBTITLE)" # SUBTITLE
+	test -d "$(IMAGEDIR)" # IMAGEDIR
+	@for IMG in $(IMAGES); do if [ ! -f $$IMG ]; then echo "$$IMG is missing"; exit 1; fi; done
+	test -n "$(VERSION)" # VERSION
 	touch $@
 
 cfgtest: cfgtest.done
 
-%.clean:
-	rm -rf $(OUT).%.zip
+#%.clean:
+#	rm -rf $(OUT).%.zip
 
 dirs.done:
 	mkdir -p $(NEWDIRS)
@@ -69,7 +92,7 @@ dirs.done:
 
 dirs: dirs.done
  
-platform:
+arch:
 	test $(shell uname -s) = Linux
 
 xdvi:
@@ -77,23 +100,24 @@ xdvi:
 	latex $(MAIN).tex
 	xdvi $(MAIN).dvi
 
-$(OUT).tex.zip: cfgtest dirs $(TEXSRC)
+$(OUT).tex.zip: cfgtest $(TEXSRC)
 	@echo "-- creating zipfile with tex source files"
 	zip $@ $(TEXSRC) 2>/dev/null
 
-$(PROJECT).dvi: $(TEXSRC)
+$(OUTPUT).dvi: $(TEXSRC)
 	@echo "-- creating dvi file"
+	echo $(TEXSRC)
 	latex $(MAIN).tex; latex $(MAIN).tex; latex $(MAIN).tex;			
 	cp $(MAIN).dvi $@
 
-$(OUT).dvi.zip: $(PROJECT).dvi $(wildcard *.eps)
+$(OUT).dvi.zip: $(OUTPUT).dvi $(wildcard *.eps)
 	zip $@ $^
 
-$(PROJECT).txt: $(PROJECT).dvi
+$(OUTPUT).txt: $(OUTPUT).dvi
 	@echo "-- creating plain ascii file"
 	dvi2tty $< -w100 -o $@
 
-$(OUT).txt.zip: $(PROJECT).txt
+$(OUT).txt.zip: $(OUTPUT).txt
 	zip $@ $<
 
 $(HTMLDIR): $(TEXSRC) $(FMT_OFFLINE_OUT) $(PRE_HTML)
@@ -112,25 +136,25 @@ $(HTMLDIR): $(TEXSRC) $(FMT_OFFLINE_OUT) $(PRE_HTML)
 		echo >> $(HTMLDIR)/index.html ;\
 	done
 	cat index_tail.html >> $(HTMLDIR)/index.html
-	cp $(IMAGEDIR)/* $(HTMLDIR)
+	cp $(IMAGES) $(HTMLDIR)
 	touch $@
 
-$(OUT).html.zip: dirs $(HTMLDIR)
+$(OUT).html.zip: $(HTMLDIR)
 	@echo "-- creating zipfile with html source files"
 	zip -r $@ $(HTMLDIR)
 
-$(PROJECT).ps: $(PROJECT).dvi
+$(OUTPUT).ps: $(OUTPUT).dvi
 	@echo "-- creating postscript file"
 	dvips $<
 
-$(OUT).ps.zip: $(PROJECT).ps dirs
+$(OUT).ps.zip: $(OUTPUT).ps
 	zip $@ $<
 
-$(PROJECT).pdf: $(PROJECT).ps
+$(OUTPUT).pdf: $(OUTPUT).ps
 	@echo "-- creating pdf file"
 	ps2pdf $<
 
-$(OUT).pdf.zip: $(PROJECT).pdf
+$(OUT).pdf.zip: $(OUTPUT).pdf
 	zip $@ $<
 
 html_install: $(HTMLDIR)
@@ -144,5 +168,6 @@ html_install: $(HTMLDIR)
 clean:
 	@echo "-- cleaning up ..."
 	rm -rf *.aux *.toc *.dvi *.pdf *.ps *~ *.log *.done \
-		$(NEWDIRS) $(PRE_TEX) $(PRE_HTML) $(PROJECT).txt
+		$(NEWDIRS) $(PRE_TEX) $(PRE_HTML) $(OUTPUT).txt \
+		$(LOCAL_IMPORTED_TEMPLATES)