diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index dca3d2cfb..60c0e946c 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,4 +1,7 @@
 6.8.0
+ - Renamed "Page" asset to "Page / Layout" asset for clarity.
+ - Switched Date::Manip to DateTime and  Time::HiRes to DateTime::HiRes for
+   better performance and more functionality. See gotchas for details.
 
 
 
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index fac3e5b11..26437a1aa 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -7,6 +7,17 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+6.8.0
+--------------------------------------------------------------------
+ * Before upgrading you must install the following new Perl modules:
+	DateTime
+	DateTime::HiRes
+	DateTime::Cron::Simple
+ 	POE
+	POE::Component::IKC::Server
+
+
+
 6.7.0
 --------------------------------------------------------------------
  * In order to upgrade to 6.7 you must first upgrade to 6.6.
diff --git a/lib/WebGUI/i18n/English/Asset_Layout.pm b/lib/WebGUI/i18n/English/Asset_Layout.pm
index 5ec753707..7f17ff303 100644
--- a/lib/WebGUI/i18n/English/Asset_Layout.pm
+++ b/lib/WebGUI/i18n/English/Asset_Layout.pm
@@ -2,50 +2,50 @@ package WebGUI::i18n::English::Asset_Layout;
 
 our $I18N = {
 	'assetName' => {
-		message => q|Page|,
+		message => q|Page / Layout|,
         	lastUpdated => 1128832065,
 		context=>q|The name of the layout asset.|
 	},
 
 	'layout add/edit title' => {
-		message => q|Page, Add/Edit|,
+		message => q|Page / Layout, Add/Edit|,
         	lastUpdated => 1106683494,
 	},
 
 	'layout add/edit body' => {
                 message => q|
-<p>Page Assets are used to display multiple Assets on the same time, much like
-Pages in version 5 of WebGUI.  The Page Asset consists of a template with
-multiple content areas, and Assets that are children of the Page can be assigned
+<p>Page / Layout Assets are used to display multiple Assets on the same time, much like
+Page / Layouts in version 5 of WebGUI.  The Page / Layout Asset consists of a template with
+multiple content areas, and Assets that are children of the Page / Layout can be assigned
 to be displayed in those areas.
 
-<p>Page Assets are Wobjects and Assets, and share the same properties of both.  Page
+<p>Page / Layout Assets are Wobjects and Assets, and share the same properties of both.  Page / Layout
 Assets also have these unique properties:</p>|,
-		context => 'Describing Page Add/Edit form specific fields',
+		context => 'Describing Page / Layout Add/Edit form specific fields',
 		lastUpdated => 1119410129,
 	},
 
         'template description' => {
-                message => q|Choose a template from the list to display the contents of the Page Asset and
+                message => q|Choose a template from the list to display the contents of the Page / Layout Asset and
 its children.
 <p/>|,
                 lastUpdated => 1119410080,
         },
 
         'assets to hide description' => {
-                message => q|This list contains one checkbox for each child Asset of the Page.  Select the
-checkbox for any Asset that you do not want displayed in the Page Asset.
+                message => q|This list contains one checkbox for each child Asset of the Page / Layout.  Select the
+checkbox for any Asset that you do not want displayed in the Page / Layout Asset.
 <p/>|,
                 lastUpdated => 1119410080,
         },
 
 	'layout template title' => {
-		message => q|Page Template|,
+		message => q|Page / Layout Template|,
         	lastUpdated => 1109987374,
 	},
 
 	'layout template body' => {
-                message => q|<p>The following variables are available in Page Templates:</p>
+                message => q|<p>The following variables are available in Page / Layout Templates:</p>
 
 <P><b>showAdmin</b><br/>
 A conditional showing if the current user has turned on Admin Mode and can edit this Asset.
diff --git a/sbin/preload.perl b/sbin/preload.perl
index bbb419683..77cfc1d94 100644
--- a/sbin/preload.perl
+++ b/sbin/preload.perl
@@ -44,8 +44,8 @@ use Net::SMTP ();
 use Log::Log4perl ();
 use Tie::IxHash ();
 use Tie::CPHash ();
-use Time::HiRes ();
-use Date::Manip ();
+use DateTime ();
+use DateTime::HiRes ();
 use Image::Magick ();
 use Storable;
 use XML::Simple ();
diff --git a/sbin/testEnvironment.pl b/sbin/testEnvironment.pl
index 797297735..dd5b89476 100644
--- a/sbin/testEnvironment.pl
+++ b/sbin/testEnvironment.pl
@@ -57,17 +57,19 @@ checkModule("Tie::IxHash",1.21);
 checkModule("Tie::CPHash",1.001);
 checkModule("XML::Simple",2.09);
 checkModule("SOAP::Lite",0.60);
-checkModule("Time::HiRes",1.38);
+checkModule("DateTime",0.2901);
+checkModule("DateTime::HiRes",0.01);
+checkModule("DateTime::Cron::Simple",0.2);
 checkModule("Image::Magick",5.47,1);
 checkModule("Log::Log4perl",0.51);
 checkModule("Net::LDAP",0.25);
-checkModule("Date::Manip",5.42);
 checkModule("HTML::Highlight",0.20);
 checkModule("HTML::TagFilter",0.07);
 checkModule("HTML::Template",2.7);
 checkModule("Parse::PlainConfig",1.1);
 checkModule("XML::RSSLite",0.11);
-checkModule("DBIx::FullTextSearch",0.73);
+checkModule("POE",0.3202);
+checkModule("POE::Component::IKC::Server",0.1801);
 
 ###################################
 # Checking WebGUI