diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 0f6dcb27b614..04b579e419c0 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Template-Toolkit
-PORTVERSION=	2.14
-PORTREVISION=	2
+PORTVERSION=	2.15
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Template
@@ -22,22 +21,13 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathT
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=TEXT_AUTOFORMAT "With Text::Autoformat Plugin"		off \
-	GD		"With GD Plugin (needs perl5.6)"	off \
-	GD_TEXT		"With GD::Text Plugin (needs GD)"	off \
-	GD_GRAPH	"With GD::Graph Plugin (needs GD)"	off \
-	GD_GRAPH3D	"With GD::Graph3d Plugin (needs GD)"	off \
 	IMAGE_INFO	"With Image::Info Plugin"		off \
 	IMAGE_SIZE	"With Image::Size Plugin"		off \
 	DATE_CALC	"With Date::Calc Plugin"		off \
-	POD_POM		"With Pod::POM Plugin"			off \
-	TIE_DBI		"With Tie::DBI Plugin"			off \
-	XML_DOM		"With XML::DOM Plugin"			off \
-	XML_RSS		"With XML::RSS Plugin (needs perl5.6)"	off \
-	XML_XPATH	"With XML::XPath Plugin"		off \
-	DBI		"With DBI Plugin"			off
+	POD_POM		"With Pod::POM Plugin"			off
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	TT_DBI=n TT_ACCEPT=y
+CONFIGURE_ARGS+=	TT_ACCEPT=y
 
 MASTER_SITE_BACKUP+=	http://www.template-toolkit.org/download/
 
@@ -58,144 +48,19 @@ BUILD_DEPENDS+=${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-
 .if defined(WITH_POD_POM)
 BUILD_DEPENDS+=${SITE_PERL}/Pod/POM.pm:${PORTSDIR}/textproc/p5-Pod-POM
 .endif
-.if defined(WITH_TIE_DBI)
-BUILD_DEPENDS+=${SITE_PERL}/Tie/DBI.pm:${PORTSDIR}/databases/p5-Tie-DBI
-.endif
-.if defined(WITH_XML_DOM)
-BUILD_DEPENDS+=${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
-.endif
-.if defined(WITH_XML_XPATH)
-BUILD_DEPENDS+=${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath
-.endif
-
-.if defined(WITH_DBI)
-.if ${PERL_LEVEL} > 500600
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
-.else
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
-.endif
-.endif
-
-.if ${PERL_LEVEL} > 500600
-.if defined(WITH_GD)
-BUILD_DEPENDS+=${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
-.endif
-.if defined(WITH_GD_TEXT)
-BUILD_DEPENDS+=${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
-.endif
-.if defined(WITH_GD_GRAPH)
-BUILD_DEPENDS+=${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
-.endif
-.if defined(WITH_GD_GRAPH3D)
-BUILD_DEPENDS+=${SITE_PERL}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d
-.endif
-.if defined(WITH_XML_RSS)
-BUILD_DEPENDS+=${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS
-.endif
-.endif
 
 .if defined(BATCH)
 CONFIGURE_ENV=	|
 .endif
 
-MAN1=	tpage.1 ttree.1
-MAN3=	Template.3 \
-	Template::Base.3 \
-	Template::Constants.3 \
-	Template::Context.3 \
-	Template::Document.3 \
-	Template::Exception.3 \
-	Template::FAQ.3 \
-	Template::Filters.3 \
-	Template::Iterator.3 \
-	Template::Library::HTML.3 \
-	Template::Library::PostScript.3 \
-	Template::Library::Splash.3 \
-	Template::Manual.3 \
-	Template::Manual::Config.3 \
-	Template::Manual::Credits.3 \
-	Template::Manual::Directives.3 \
-	Template::Manual::Filters.3 \
-	Template::Manual::Internals.3 \
-	Template::Manual::Intro.3 \
-	Template::Manual::Plugins.3 \
-	Template::Manual::Refs.3 \
-	Template::Manual::Syntax.3 \
-	Template::Manual::VMethods.3 \
-	Template::Manual::Variables.3 \
-	Template::Manual::Views.3 \
-	Template::Modules.3 \
-	Template::Namespace::Constants.3 \
-	Template::Parser.3 \
-	Template::Plugin.3 \
-	Template::Plugin::Autoformat.3 \
-	Template::Plugin::CGI.3 \
-	Template::Plugin::DBI.3 \
-	Template::Plugin::Datafile.3 \
-	Template::Plugin::Date.3 \
-	Template::Plugin::Directory.3 \
-	Template::Plugin::Dumper.3 \
-	Template::Plugin::File.3 \
-	Template::Plugin::Filter.3 \
-	Template::Plugin::Format.3 \
-	Template::Plugin::GD::Constants.3 \
-	Template::Plugin::GD::Graph::area.3 \
-	Template::Plugin::GD::Graph::bars.3 \
-	Template::Plugin::GD::Graph::bars3d.3 \
-	Template::Plugin::GD::Graph::lines.3 \
-	Template::Plugin::GD::Graph::lines3d.3 \
-	Template::Plugin::GD::Graph::linespoints.3 \
-	Template::Plugin::GD::Graph::mixed.3 \
-	Template::Plugin::GD::Graph::pie.3 \
-	Template::Plugin::GD::Graph::pie3d.3 \
-	Template::Plugin::GD::Graph::points.3 \
-	Template::Plugin::GD::Image.3 \
-	Template::Plugin::GD::Polygon.3 \
-	Template::Plugin::GD::Text.3 \
-	Template::Plugin::GD::Text::Align.3 \
-	Template::Plugin::GD::Text::Wrap.3 \
-	Template::Plugin::HTML.3 \
-	Template::Plugin::Image.3 \
-	Template::Plugin::Iterator.3 \
-	Template::Plugin::Pod.3 \
-	Template::Plugin::Procedural.3 \
-	Template::Plugin::String.3 \
-	Template::Plugin::Table.3 \
-	Template::Plugin::URL.3 \
-	Template::Plugin::View.3 \
-	Template::Plugin::Wrap.3 \
-	Template::Plugin::XML::DOM.3 \
-	Template::Plugin::XML::RSS.3 \
-	Template::Plugin::XML::Simple.3 \
-	Template::Plugin::XML::Style.3 \
-	Template::Plugin::XML::XPath.3 \
-	Template::Plugins.3 \
-	Template::Provider.3 \
-	Template::Service.3 \
-	Template::Stash.3 \
-	Template::Stash::Context.3 \
-	Template::Stash::XS.3 \
-	Template::Test.3 \
-	Template::Tools::tpage.3 \
-	Template::Tools::ttree.3 \
-	Template::Tutorial.3 \
-	Template::Tutorial::Datafile.3 \
-	Template::Tutorial::Web.3 \
-	Template::View.3
+.include "Makefile.man"
 
 post-patch:
 	${PERL} -pi -e 's,/usr/local/tt2,${PREFIX}/share/tt2,g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
 .if ${PERL_LEVEL} < 500600
-	${FIND} ${WRKSRC} -name '*.orig' -delete
-
-post-configure:
-	${PERL} -pi -e 's/-I\S+PERL\S+ //g if m{PERL_DL_NONLAZY}' ${WRKSRC}/Makefile
-
-BUILD_DEPENDS+=	${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
-EXTRA_PATCHES=	${PATCHDIR}/5.005-lib-Template-Document.pm
-.else
-MAN3+=	Template::Config.3
+IGNORE=		requires perl 5.6.0 or later. Install lang/perl5.8 and try again
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Template-Toolkit/Makefile.man b/www/p5-Template-Toolkit/Makefile.man
new file mode 100644
index 000000000000..fb2e1475f5a3
--- /dev/null
+++ b/www/p5-Template-Toolkit/Makefile.man
@@ -0,0 +1,68 @@
+# $FreeBSD$
+MAN1+=	tpage.1
+MAN1+=	ttree.1
+
+MAN3+=	Template.3
+MAN3+=	Template::Base.3
+MAN3+=	Template::Config.3
+MAN3+=	Template::Constants.3
+MAN3+=	Template::Context.3
+MAN3+=	Template::Document.3
+MAN3+=	Template::Exception.3
+MAN3+=	Template::FAQ.3
+MAN3+=	Template::Filters.3
+MAN3+=	Template::Iterator.3
+MAN3+=	Template::Library::HTML.3
+MAN3+=	Template::Library::PostScript.3
+MAN3+=	Template::Library::Splash.3
+MAN3+=	Template::Manual.3
+MAN3+=	Template::Manual::Config.3
+MAN3+=	Template::Manual::Credits.3
+MAN3+=	Template::Manual::Directives.3
+MAN3+=	Template::Manual::Filters.3
+MAN3+=	Template::Manual::Internals.3
+MAN3+=	Template::Manual::Intro.3
+MAN3+=	Template::Manual::Plugins.3
+MAN3+=	Template::Manual::Refs.3
+MAN3+=	Template::Manual::Syntax.3
+MAN3+=	Template::Manual::VMethods.3
+MAN3+=	Template::Manual::Variables.3
+MAN3+=	Template::Manual::Views.3
+MAN3+=	Template::Modules.3
+MAN3+=	Template::Namespace::Constants.3
+MAN3+=	Template::Parser.3
+MAN3+=	Template::Plugin.3
+MAN3+=	Template::Plugin::Autoformat.3
+MAN3+=	Template::Plugin::CGI.3
+MAN3+=	Template::Plugin::Datafile.3
+MAN3+=	Template::Plugin::Date.3
+MAN3+=	Template::Plugin::Directory.3
+MAN3+=	Template::Plugin::Dumper.3
+MAN3+=	Template::Plugin::File.3
+MAN3+=	Template::Plugin::Filter.3
+MAN3+=	Template::Plugin::Format.3
+MAN3+=	Template::Plugin::HTML.3
+MAN3+=	Template::Plugin::Image.3
+MAN3+=	Template::Plugin::Iterator.3
+MAN3+=	Template::Plugin::Math.3
+MAN3+=	Template::Plugin::Pod.3
+MAN3+=	Template::Plugin::Procedural.3
+MAN3+=	Template::Plugin::String.3
+MAN3+=	Template::Plugin::Table.3
+MAN3+=	Template::Plugin::URL.3
+MAN3+=	Template::Plugin::View.3
+MAN3+=	Template::Plugin::Wrap.3
+MAN3+=	Template::Plugins.3
+MAN3+=	Template::Provider.3
+MAN3+=	Template::Service.3
+MAN3+=	Template::Stash.3
+MAN3+=	Template::Stash::Context.3
+MAN3+=	Template::Stash::XS.3
+MAN3+=	Template::Test.3
+MAN3+=	Template::Toolkit.3
+MAN3+=	Template::Tools::tpage.3
+MAN3+=	Template::Tools::ttree.3
+MAN3+=	Template::Tutorial.3
+MAN3+=	Template::Tutorial::Datafile.3
+MAN3+=	Template::Tutorial::Web.3
+MAN3+=	Template::View.3
diff --git a/www/p5-Template-Toolkit/distinfo b/www/p5-Template-Toolkit/distinfo
index 06d6f18cad62..f127baf46623 100644
--- a/www/p5-Template-Toolkit/distinfo
+++ b/www/p5-Template-Toolkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (Template-Toolkit-2.14.tar.gz) = 0eed60763ef2465c50f9b6a33e51cc14
-SHA256 (Template-Toolkit-2.14.tar.gz) = e4ffc4eece3970a34f18035284f18e16784c2ee7abcd2e3c09419c4b3c94c569
-SIZE (Template-Toolkit-2.14.tar.gz) = 843175
+MD5 (Template-Toolkit-2.15.tar.gz) = 26adb4e6d3f2f89e2b54a43f73b70a29
+SHA256 (Template-Toolkit-2.15.tar.gz) = f5eb767604b7d039523564d8e74996884d8eeac5396caceba4e204f56c407c02
+SIZE (Template-Toolkit-2.15.tar.gz) = 778706
diff --git a/www/p5-Template-Toolkit/files/5.005-lib-Template-Document.pm b/www/p5-Template-Toolkit/files/5.005-lib-Template-Document.pm
deleted file mode 100644
index 6617e52d3e52..000000000000
--- a/www/p5-Template-Toolkit/files/5.005-lib-Template-Document.pm
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/Template/Document.pm~	Mon Oct  4 12:27:39 2004
-+++ lib/Template/Document.pm	Tue Oct  5 16:08:42 2004
-@@ -37,17 +37,7 @@
- 
- BEGIN {
-     # UNICODE is supported in versions of Perl from 5.008 onwards
--    if ($UNICODE = $] > 5.007 ? 1 : 0) {
--        if ($^V gt v5.8.0) {
--            # utf8::is_utf8() available from Perl 5.8.1 onwards
--            *is_utf8 = \&utf8::is_utf8;
--        }
--        elsif ($^V eq v5.8.0) {
--            # use Encode::is_utf8() for Perl 5.8.0
--            require Encode;
--            *is_utf8 = \&Encode::is_utf8;
--        }
--    }
-+    $UNICODE = 0;
- }
- 
- 
diff --git a/www/p5-Template-Toolkit/pkg-plist b/www/p5-Template-Toolkit/pkg-plist
index b61b5250b18d..28311e01de84 100644
--- a/www/p5-Template-Toolkit/pkg-plist
+++ b/www/p5-Template-Toolkit/pkg-plist
@@ -1,5 +1,3 @@
-bin/tpage
-bin/ttree
 %%SITE_PERL%%/%%PERL_ARCH%%/Template.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Base.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Config.pm
@@ -34,7 +32,6 @@ bin/ttree
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Autoformat.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/CGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/DBI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Datafile.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Date.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Directory.pm
@@ -42,25 +39,10 @@ bin/ttree
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/File.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Filter.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Format.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/area.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/bars3d.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/lines3d.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/linespoints.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/mixed.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/pie3d.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph/points.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Image.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Polygon.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Align.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text/Wrap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/HTML.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Image.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Iterator.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Math.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Pod.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Procedural.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/String.pm
@@ -68,11 +50,6 @@ bin/ttree
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/URL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/View.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/DOM.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/RSS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/Style.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML/XPath.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugins.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Provider.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Service.pm
@@ -80,6 +57,7 @@ bin/ttree
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash/Context.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash/XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Test.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Template/Toolkit.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools/tpage.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools/ttree.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial.pod
@@ -89,6 +67,8 @@ bin/ttree
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.so
+bin/tpage
+bin/ttree
 share/tt2/docs/README
 share/tt2/docs/html/FAQ/FAQ.html
 share/tt2/docs/html/FAQ/index.html
@@ -123,7 +103,6 @@ share/tt2/docs/html/Modules/Template/Parser.html
 share/tt2/docs/html/Modules/Template/Plugin.html
 share/tt2/docs/html/Modules/Template/Plugin/Autoformat.html
 share/tt2/docs/html/Modules/Template/Plugin/CGI.html
-share/tt2/docs/html/Modules/Template/Plugin/DBI.html
 share/tt2/docs/html/Modules/Template/Plugin/Datafile.html
 share/tt2/docs/html/Modules/Template/Plugin/Date.html
 share/tt2/docs/html/Modules/Template/Plugin/Directory.html
@@ -131,22 +110,6 @@ share/tt2/docs/html/Modules/Template/Plugin/Dumper.html
 share/tt2/docs/html/Modules/Template/Plugin/File.html
 share/tt2/docs/html/Modules/Template/Plugin/Filter.html
 share/tt2/docs/html/Modules/Template/Plugin/Format.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Constants.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/area.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/bars.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/bars3d.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/lines.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/lines3d.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/linespoints.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/mixed.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/pie.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/pie3d.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/points.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Image.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Polygon.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Text.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Text/Align.html
-share/tt2/docs/html/Modules/Template/Plugin/GD/Text/Wrap.html
 share/tt2/docs/html/Modules/Template/Plugin/HTML.html
 share/tt2/docs/html/Modules/Template/Plugin/Image.html
 share/tt2/docs/html/Modules/Template/Plugin/Iterator.html
@@ -158,11 +121,7 @@ share/tt2/docs/html/Modules/Template/Plugin/Table.html
 share/tt2/docs/html/Modules/Template/Plugin/URL.html
 share/tt2/docs/html/Modules/Template/Plugin/View.html
 share/tt2/docs/html/Modules/Template/Plugin/Wrap.html
-share/tt2/docs/html/Modules/Template/Plugin/XML/DOM.html
-share/tt2/docs/html/Modules/Template/Plugin/XML/RSS.html
-share/tt2/docs/html/Modules/Template/Plugin/XML/Simple.html
 share/tt2/docs/html/Modules/Template/Plugin/XML/Style.html
-share/tt2/docs/html/Modules/Template/Plugin/XML/XPath.html
 share/tt2/docs/html/Modules/Template/Plugins.html
 share/tt2/docs/html/Modules/Template/Provider.html
 share/tt2/docs/html/Modules/Template/Service.html
@@ -170,6 +129,7 @@ share/tt2/docs/html/Modules/Template/Stash.html
 share/tt2/docs/html/Modules/Template/Stash/Context.html
 share/tt2/docs/html/Modules/Template/Stash/XS.html
 share/tt2/docs/html/Modules/Template/Test.html
+share/tt2/docs/html/Modules/Template/Toolkit.html
 share/tt2/docs/html/Modules/index.html
 share/tt2/docs/html/README
 share/tt2/docs/html/Release/Changes.html
@@ -229,7 +189,6 @@ share/tt2/docs/src/Modules/Template/Parser.html
 share/tt2/docs/src/Modules/Template/Plugin.html
 share/tt2/docs/src/Modules/Template/Plugin/Autoformat.html
 share/tt2/docs/src/Modules/Template/Plugin/CGI.html
-share/tt2/docs/src/Modules/Template/Plugin/DBI.html
 share/tt2/docs/src/Modules/Template/Plugin/Datafile.html
 share/tt2/docs/src/Modules/Template/Plugin/Date.html
 share/tt2/docs/src/Modules/Template/Plugin/Directory.html
@@ -237,22 +196,6 @@ share/tt2/docs/src/Modules/Template/Plugin/Dumper.html
 share/tt2/docs/src/Modules/Template/Plugin/File.html
 share/tt2/docs/src/Modules/Template/Plugin/Filter.html
 share/tt2/docs/src/Modules/Template/Plugin/Format.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Constants.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/area.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/bars.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/bars3d.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/lines.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/lines3d.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/linespoints.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/mixed.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/pie.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/pie3d.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/points.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Image.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Polygon.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Text.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Text/Align.html
-share/tt2/docs/src/Modules/Template/Plugin/GD/Text/Wrap.html
 share/tt2/docs/src/Modules/Template/Plugin/HTML.html
 share/tt2/docs/src/Modules/Template/Plugin/Image.html
 share/tt2/docs/src/Modules/Template/Plugin/Iterator.html
@@ -264,11 +207,7 @@ share/tt2/docs/src/Modules/Template/Plugin/Table.html
 share/tt2/docs/src/Modules/Template/Plugin/URL.html
 share/tt2/docs/src/Modules/Template/Plugin/View.html
 share/tt2/docs/src/Modules/Template/Plugin/Wrap.html
-share/tt2/docs/src/Modules/Template/Plugin/XML/DOM.html
-share/tt2/docs/src/Modules/Template/Plugin/XML/RSS.html
-share/tt2/docs/src/Modules/Template/Plugin/XML/Simple.html
 share/tt2/docs/src/Modules/Template/Plugin/XML/Style.html
-share/tt2/docs/src/Modules/Template/Plugin/XML/XPath.html
 share/tt2/docs/src/Modules/Template/Plugins.html
 share/tt2/docs/src/Modules/Template/Provider.html
 share/tt2/docs/src/Modules/Template/Service.html
@@ -276,6 +215,7 @@ share/tt2/docs/src/Modules/Template/Stash.html
 share/tt2/docs/src/Modules/Template/Stash/Context.html
 share/tt2/docs/src/Modules/Template/Stash/XS.html
 share/tt2/docs/src/Modules/Template/Test.html
+share/tt2/docs/src/Modules/Template/Toolkit.html
 share/tt2/docs/src/Modules/index.html
 share/tt2/docs/src/Release/Changes.html
 share/tt2/docs/src/Release/HACKING.html
@@ -1372,138 +1312,128 @@ share/tt2/templates/splash/tabset
 share/tt2/templates/splash/text
 share/tt2/templates/splash/ttdotorg
 share/tt2/templates/splash/ttpower
-@dirrm share/tt2/templates/splash
-@dirrm share/tt2/templates/ps
-@dirrm share/tt2/templates/pod/html
-@dirrm share/tt2/templates/pod
-@dirrm share/tt2/templates/html
-@dirrm share/tt2/templates
-@dirrm share/tt2/images/splash/white
-@dirrm share/tt2/images/splash/sky
-@dirrm share/tt2/images/splash/scarlet
-@dirrm share/tt2/images/splash/rose
-@dirrm share/tt2/images/splash/red75
-@dirrm share/tt2/images/splash/red50
-@dirrm share/tt2/images/splash/red25
-@dirrm share/tt2/images/splash/red
-@dirrm share/tt2/images/splash/purple
-@dirrm share/tt2/images/splash/orange
-@dirrm share/tt2/images/splash/navy
-@dirrm share/tt2/images/splash/mint
-@dirrm share/tt2/images/splash/mauve
-@dirrm share/tt2/images/splash/marine
-@dirrm share/tt2/images/splash/lilac
-@dirrm share/tt2/images/splash/leaf
-@dirrm share/tt2/images/splash/grey75
-@dirrm share/tt2/images/splash/grey50
-@dirrm share/tt2/images/splash/grey25
-@dirrm share/tt2/images/splash/green75
-@dirrm share/tt2/images/splash/green50
-@dirrm share/tt2/images/splash/green25
-@dirrm share/tt2/images/splash/green
-@dirrm share/tt2/images/splash/bud
-@dirrm share/tt2/images/splash/blue75
-@dirrm share/tt2/images/splash/blue50
-@dirrm share/tt2/images/splash/blue25
-@dirrm share/tt2/images/splash/blue
-@dirrm share/tt2/images/splash/blood
-@dirrm share/tt2/images/splash/black
-@dirrm share/tt2/images/splash/aqua
-@dirrm share/tt2/images/splash
-@dirrm share/tt2/images
-@dirrm share/tt2/examples/src/splash
-@dirrm share/tt2/examples/src/ps
-@dirrm share/tt2/examples/src/html
-@dirrm share/tt2/examples/src
-@dirrm share/tt2/examples/lib/splash/about
-@dirrm share/tt2/examples/lib/splash
-@dirrm share/tt2/examples/lib/examples/splash/text
-@dirrm share/tt2/examples/lib/examples/splash/tabset
-@dirrm share/tt2/examples/lib/examples/splash/tabsbox
-@dirrm share/tt2/examples/lib/examples/splash/tabbox
-@dirrm share/tt2/examples/lib/examples/splash/tab
-@dirrm share/tt2/examples/lib/examples/splash/pulldown
-@dirrm share/tt2/examples/lib/examples/splash/panel
-@dirrm share/tt2/examples/lib/examples/splash/menubar
-@dirrm share/tt2/examples/lib/examples/splash/menu
-@dirrm share/tt2/examples/lib/examples/splash/icon
-@dirrm share/tt2/examples/lib/examples/splash/hair
-@dirrm share/tt2/examples/lib/examples/splash/frame
-@dirrm share/tt2/examples/lib/examples/splash/dropbox
-@dirrm share/tt2/examples/lib/examples/splash/config
-@dirrm share/tt2/examples/lib/examples/splash/button
-@dirrm share/tt2/examples/lib/examples/splash/box
-@dirrm share/tt2/examples/lib/examples/splash/bar
-@dirrm share/tt2/examples/lib/examples/splash
-@dirrm share/tt2/examples/lib/examples/ps/marks
-@dirrm share/tt2/examples/lib/examples/ps
-@dirrm share/tt2/examples/lib/examples/html/tables
-@dirrm share/tt2/examples/lib/examples/html/rgb
-@dirrm share/tt2/examples/lib/examples/html/menus
-@dirrm share/tt2/examples/lib/examples/html/lists
-@dirrm share/tt2/examples/lib/examples/html/links
-@dirrm share/tt2/examples/lib/examples/html/headers
-@dirrm share/tt2/examples/lib/examples/html/bars
-@dirrm share/tt2/examples/lib/examples/html
-@dirrm share/tt2/examples/lib/examples
-@dirrm share/tt2/examples/lib/example
-@dirrm share/tt2/examples/lib
-@dirrm share/tt2/examples/html/splash
-@dirrm share/tt2/examples/html/ps
-@dirrm share/tt2/examples/html/html
-@dirrm share/tt2/examples/html
-@dirrm share/tt2/examples
-@dirrm share/tt2/docs/style/splash
-@dirrm share/tt2/docs/style/plain
-@dirrm share/tt2/docs/style
-@dirrm share/tt2/docs/src/Tutorial
-@dirrm share/tt2/docs/src/Tools
-@dirrm share/tt2/docs/src/Release
-@dirrm share/tt2/docs/src/Modules/Template/Stash
-@dirrm share/tt2/docs/src/Modules/Template/Plugin/XML
-@dirrm share/tt2/docs/src/Modules/Template/Plugin/GD/Text
-@dirrm share/tt2/docs/src/Modules/Template/Plugin/GD/Graph
-@dirrm share/tt2/docs/src/Modules/Template/Plugin/GD
-@dirrm share/tt2/docs/src/Modules/Template/Plugin
-@dirrm share/tt2/docs/src/Modules/Template/Namespace
-@dirrm share/tt2/docs/src/Modules/Template
-@dirrm share/tt2/docs/src/Modules
-@dirrm share/tt2/docs/src/Manual
-@dirrm share/tt2/docs/src/Library
-@dirrm share/tt2/docs/src/FAQ
-@dirrm share/tt2/docs/src
-@dirrm share/tt2/docs/lib/docset
-@dirrm share/tt2/docs/lib
-@dirrm share/tt2/docs/html/Tutorial
-@dirrm share/tt2/docs/html/Tools
-@dirrm share/tt2/docs/html/Release
-@dirrm share/tt2/docs/html/Modules/Template/Stash
-@dirrm share/tt2/docs/html/Modules/Template/Plugin/XML
-@dirrm share/tt2/docs/html/Modules/Template/Plugin/GD/Text
-@dirrm share/tt2/docs/html/Modules/Template/Plugin/GD/Graph
-@dirrm share/tt2/docs/html/Modules/Template/Plugin/GD
-@dirrm share/tt2/docs/html/Modules/Template/Plugin
-@dirrm share/tt2/docs/html/Modules/Template/Namespace
-@dirrm share/tt2/docs/html/Modules/Template
-@dirrm share/tt2/docs/html/Modules
-@dirrm share/tt2/docs/html/Manual
-@dirrm share/tt2/docs/html/Library
-@dirrm share/tt2/docs/html/FAQ
-@dirrm share/tt2/docs/html
-@dirrm share/tt2/docs
-@dirrm share/tt2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/XML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Text
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD/Graph
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin/GD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Namespace
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template/Library
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Template
+@dirrmtry share/tt2/templates/splash
+@dirrmtry share/tt2/templates/ps
+@dirrmtry share/tt2/templates/pod/html
+@dirrmtry share/tt2/templates/pod
+@dirrmtry share/tt2/templates/html
+@dirrmtry share/tt2/templates
+@dirrmtry share/tt2/images/splash/white
+@dirrmtry share/tt2/images/splash/sky
+@dirrmtry share/tt2/images/splash/scarlet
+@dirrmtry share/tt2/images/splash/rose
+@dirrmtry share/tt2/images/splash/red75
+@dirrmtry share/tt2/images/splash/red50
+@dirrmtry share/tt2/images/splash/red25
+@dirrmtry share/tt2/images/splash/red
+@dirrmtry share/tt2/images/splash/purple
+@dirrmtry share/tt2/images/splash/orange
+@dirrmtry share/tt2/images/splash/navy
+@dirrmtry share/tt2/images/splash/mint
+@dirrmtry share/tt2/images/splash/mauve
+@dirrmtry share/tt2/images/splash/marine
+@dirrmtry share/tt2/images/splash/lilac
+@dirrmtry share/tt2/images/splash/leaf
+@dirrmtry share/tt2/images/splash/grey75
+@dirrmtry share/tt2/images/splash/grey50
+@dirrmtry share/tt2/images/splash/grey25
+@dirrmtry share/tt2/images/splash/green75
+@dirrmtry share/tt2/images/splash/green50
+@dirrmtry share/tt2/images/splash/green25
+@dirrmtry share/tt2/images/splash/green
+@dirrmtry share/tt2/images/splash/bud
+@dirrmtry share/tt2/images/splash/blue75
+@dirrmtry share/tt2/images/splash/blue50
+@dirrmtry share/tt2/images/splash/blue25
+@dirrmtry share/tt2/images/splash/blue
+@dirrmtry share/tt2/images/splash/blood
+@dirrmtry share/tt2/images/splash/black
+@dirrmtry share/tt2/images/splash/aqua
+@dirrmtry share/tt2/images/splash
+@dirrmtry share/tt2/images
+@dirrmtry share/tt2/examples/src/splash
+@dirrmtry share/tt2/examples/src/ps
+@dirrmtry share/tt2/examples/src/html
+@dirrmtry share/tt2/examples/src
+@dirrmtry share/tt2/examples/lib/splash/about
+@dirrmtry share/tt2/examples/lib/splash
+@dirrmtry share/tt2/examples/lib/examples/splash/text
+@dirrmtry share/tt2/examples/lib/examples/splash/tabset
+@dirrmtry share/tt2/examples/lib/examples/splash/tabsbox
+@dirrmtry share/tt2/examples/lib/examples/splash/tabbox
+@dirrmtry share/tt2/examples/lib/examples/splash/tab
+@dirrmtry share/tt2/examples/lib/examples/splash/pulldown
+@dirrmtry share/tt2/examples/lib/examples/splash/panel
+@dirrmtry share/tt2/examples/lib/examples/splash/menubar
+@dirrmtry share/tt2/examples/lib/examples/splash/menu
+@dirrmtry share/tt2/examples/lib/examples/splash/icon
+@dirrmtry share/tt2/examples/lib/examples/splash/hair
+@dirrmtry share/tt2/examples/lib/examples/splash/frame
+@dirrmtry share/tt2/examples/lib/examples/splash/dropbox
+@dirrmtry share/tt2/examples/lib/examples/splash/config
+@dirrmtry share/tt2/examples/lib/examples/splash/button
+@dirrmtry share/tt2/examples/lib/examples/splash/box
+@dirrmtry share/tt2/examples/lib/examples/splash/bar
+@dirrmtry share/tt2/examples/lib/examples/splash
+@dirrmtry share/tt2/examples/lib/examples/ps/marks
+@dirrmtry share/tt2/examples/lib/examples/ps
+@dirrmtry share/tt2/examples/lib/examples/html/tables
+@dirrmtry share/tt2/examples/lib/examples/html/rgb
+@dirrmtry share/tt2/examples/lib/examples/html/menus
+@dirrmtry share/tt2/examples/lib/examples/html/lists
+@dirrmtry share/tt2/examples/lib/examples/html/links
+@dirrmtry share/tt2/examples/lib/examples/html/headers
+@dirrmtry share/tt2/examples/lib/examples/html/bars
+@dirrmtry share/tt2/examples/lib/examples/html
+@dirrmtry share/tt2/examples/lib/examples
+@dirrmtry share/tt2/examples/lib/example
+@dirrmtry share/tt2/examples/lib
+@dirrmtry share/tt2/examples/html/splash
+@dirrmtry share/tt2/examples/html/ps
+@dirrmtry share/tt2/examples/html/html
+@dirrmtry share/tt2/examples/html
+@dirrmtry share/tt2/examples
+@dirrmtry share/tt2/docs/style/splash
+@dirrmtry share/tt2/docs/style/plain
+@dirrmtry share/tt2/docs/style
+@dirrmtry share/tt2/docs/src/Tutorial
+@dirrmtry share/tt2/docs/src/Tools
+@dirrmtry share/tt2/docs/src/Release
+@dirrmtry share/tt2/docs/src/Modules/Template/Stash
+@dirrmtry share/tt2/docs/src/Modules/Template/Plugin/XML
+@dirrmtry share/tt2/docs/src/Modules/Template/Plugin
+@dirrmtry share/tt2/docs/src/Modules/Template/Namespace
+@dirrmtry share/tt2/docs/src/Modules/Template
+@dirrmtry share/tt2/docs/src/Modules
+@dirrmtry share/tt2/docs/src/Manual
+@dirrmtry share/tt2/docs/src/Library
+@dirrmtry share/tt2/docs/src/FAQ
+@dirrmtry share/tt2/docs/src
+@dirrmtry share/tt2/docs/lib/docset
+@dirrmtry share/tt2/docs/lib
+@dirrmtry share/tt2/docs/html/Tutorial
+@dirrmtry share/tt2/docs/html/Tools
+@dirrmtry share/tt2/docs/html/Release
+@dirrmtry share/tt2/docs/html/Modules/Template/Stash
+@dirrmtry share/tt2/docs/html/Modules/Template/Plugin/XML
+@dirrmtry share/tt2/docs/html/Modules/Template/Plugin
+@dirrmtry share/tt2/docs/html/Modules/Template/Namespace
+@dirrmtry share/tt2/docs/html/Modules/Template
+@dirrmtry share/tt2/docs/html/Modules
+@dirrmtry share/tt2/docs/html/Manual
+@dirrmtry share/tt2/docs/html/Library
+@dirrmtry share/tt2/docs/html/FAQ
+@dirrmtry share/tt2/docs/html
+@dirrmtry share/tt2/docs
+@dirrmtry share/tt2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tutorial
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Tools
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Stash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Namespace
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Manual
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Library
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template