19 files changed, 7 insertions, 7 deletions
diff --git a/ASCIIMathML.js b/templates/ASCIIMathML.js
index 282cc15fb..282cc15fb 100644
--- a/ASCIIMathML.js
+++ b/templates/ASCIIMathML.js
diff --git a/templates/Makefile b/templates/Makefile
index 9522666c5..db62173cf 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,13 +6,13 @@ TARGETS   := Text/Pandoc/ASCIIMathML.hs \
 
 all: $(TARGETS)
 
-Text/Pandoc/ASCIIMathML.hs: ASCIIMathML.hs $(PROCESSOR) $(VPATH)/ASCIIMathML.js
+Text/Pandoc/ASCIIMathML.hs: ASCIIMathML.hs $(PROCESSOR) ASCIIMathML.js
 	perl $(PROCESSOR) $@ $(VPATH)
 
-Text/Pandoc/Writers/S5.hs: S5.hs $(PROCESSOR) $(VPATH)/ui/default/*
+Text/Pandoc/Writers/S5.hs: S5.hs $(PROCESSOR) ui/default/*
 	perl $(PROCESSOR) $@ $(VPATH)
 
-Text/Pandoc/Writers/DefaultHeaders.hs: DefaultHeaders.hs $(PROCESSOR) $(VPATH)/headers/*
+Text/Pandoc/Writers/DefaultHeaders.hs: DefaultHeaders.hs $(PROCESSOR) headers/*
 	perl $(PROCESSOR) $@ $(VPATH)
 
 .PHONY: clean
diff --git a/templates/fillTemplates.pl b/templates/fillTemplates.pl
index 85e6eaa18..83c01a28e 100755
--- a/templates/fillTemplates.pl
+++ b/templates/fillTemplates.pl
@@ -41,7 +41,7 @@ my %processor = (
                          opera.css outline.css print.css);
 
         foreach my $file (@files) {
-	        my $replacement = escape_for_haskell(slurp "ui/default/$file");
+	        my $replacement = escape_for_haskell(slurp "templates/ui/default/$file");
             my $escapedfile = $file;
             $escapedfile =~ s/\./\\./g;
             $template =~ s/\@$escapedfile\@/$replacement/;
@@ -55,7 +55,7 @@ my %processor = (
 	proc     => sub {
 	    my ($template) = @_;
 
-	    my $script = escape_for_haskell(slurp "ASCIIMathML.js"); 
+	    my $script = escape_for_haskell(slurp "templates/ASCIIMathML.js"); 
 	    my $acknowledgements =
 		" ASCIIMathML.js - copyright Peter Jipsen,".
 		" released under the GPL\\nSee ".
@@ -72,9 +72,9 @@ my %processor = (
 	proc     => sub {
 	    my ($template) = @_;
 
-        my (@headers) = split(/\s/,`ls headers`);
+        my (@headers) = split(/\s/,`ls templates/headers`);
         foreach my $header (@headers) {
-           my ($replacement) = escape_for_haskell(slurp "headers/$header");
+           my ($replacement) = escape_for_haskell(slurp "templates/headers/$header");
            $template =~ s/\@$header\@/$replacement/;
         }
 	    
diff --git a/headers/ConTeXtHeader b/templates/headers/ConTeXtHeader
index fedc7e3de..fedc7e3de 100644
--- a/headers/ConTeXtHeader
+++ b/templates/headers/ConTeXtHeader
diff --git a/headers/DocbookHeader b/templates/headers/DocbookHeader
index 7b26b2c73..7b26b2c73 100644
--- a/headers/DocbookHeader
+++ b/templates/headers/DocbookHeader
diff --git a/headers/LaTeXHeader b/templates/headers/LaTeXHeader
index d891b5f63..d891b5f63 100644
--- a/headers/LaTeXHeader
+++ b/templates/headers/LaTeXHeader
diff --git a/headers/RTFHeader b/templates/headers/RTFHeader
index b4368694b..b4368694b 100644
--- a/headers/RTFHeader
+++ b/templates/headers/RTFHeader
diff --git a/headers/S5Header b/templates/headers/S5Header
index ebb24ebe2..ebb24ebe2 100644
--- a/headers/S5Header
+++ b/templates/headers/S5Header
diff --git a/ui/default/blank.gif b/templates/ui/default/blank.gif
index 75b945d25..75b945d25 100644
--- a/ui/default/blank.gif
+++ b/templates/ui/default/blank.gif
diff --git a/ui/default/bodybg.gif b/templates/ui/default/bodybg.gif
index 5f448a16f..5f448a16f 100644
--- a/ui/default/bodybg.gif
+++ b/templates/ui/default/bodybg.gif
diff --git a/ui/default/framing.css b/templates/ui/default/framing.css
index 14d8509e9..14d8509e9 100644
--- a/ui/default/framing.css
+++ b/templates/ui/default/framing.css
diff --git a/ui/default/iepngfix.htc b/templates/ui/default/iepngfix.htc
index bba2db756..bba2db756 100644
--- a/ui/default/iepngfix.htc
+++ b/templates/ui/default/iepngfix.htc
diff --git a/ui/default/opera.css b/templates/ui/default/opera.css
index 9e9d2a3c5..9e9d2a3c5 100644
--- a/ui/default/opera.css
+++ b/templates/ui/default/opera.css
diff --git a/ui/default/outline.css b/templates/ui/default/outline.css
index 62db519ed..62db519ed 100644
--- a/ui/default/outline.css
+++ b/templates/ui/default/outline.css
diff --git a/ui/default/pretty.css b/templates/ui/default/pretty.css
index 3d3acefff..3d3acefff 100644
--- a/ui/default/pretty.css
+++ b/templates/ui/default/pretty.css
diff --git a/ui/default/print.css b/templates/ui/default/print.css
index 4a3554ddd..4a3554ddd 100644
--- a/ui/default/print.css
+++ b/templates/ui/default/print.css
diff --git a/ui/default/s5-core.css b/templates/ui/default/s5-core.css
index 86444e041..86444e041 100644
--- a/ui/default/s5-core.css
+++ b/templates/ui/default/s5-core.css
diff --git a/ui/default/slides.css b/templates/ui/default/slides.css
index 0786d7dbd..0786d7dbd 100644
--- a/ui/default/slides.css
+++ b/templates/ui/default/slides.css
diff --git a/ui/default/slides.js b/templates/ui/default/slides.js
index 38fe8531c..38fe8531c 100644
--- a/ui/default/slides.js
+++ b/templates/ui/default/slides.js