diff --git a/sites/all/themes/unl_wdn/lib/.configsnapshots/configsnapshot-2010-09-08 10-31-36.xml b/sites/all/themes/unl_wdn/lib/.configsnapshots/configsnapshot-2010-09-08 10-31-36.xml
deleted file mode 100644
index b2ef317fd0dbf29a8cc797361ef78d432ed323e2..0000000000000000000000000000000000000000
--- a/sites/all/themes/unl_wdn/lib/.configsnapshots/configsnapshot-2010-09-08 10-31-36.xml	
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<pearconfig version="1.0"><php_dir>/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/php</php_dir><ext_dir>/usr/local/lib/php/extensions/no-debug-non-zts-20090626/</ext_dir><cfg_dir>/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/cfg</cfg_dir><doc_dir>/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/docs</doc_dir><bin_dir>/usr/local/bin</bin_dir><data_dir>/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/data</data_dir><www_dir>/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/www</www_dir><test_dir>/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/tests</test_dir><src_dir>/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/src</src_dir><php_bin>/usr/local/bin/php</php_bin><php_ini>/usr/local/lib/php.ini</php_ini><php_prefix></php_prefix><php_suffix></php_suffix></pearconfig>
diff --git a/sites/all/themes/unl_wdn/lib/.pear2registry b/sites/all/themes/unl_wdn/lib/.pear2registry
index 98075e3383c983d8ba3d484da5ddcaf343216ba5..fe1fcf7de080445afbb3cbc01bd1366ba5e952d6 100644
Binary files a/sites/all/themes/unl_wdn/lib/.pear2registry and b/sites/all/themes/unl_wdn/lib/.pear2registry differ
diff --git a/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_DWT/0.7.1-info.xml b/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_DWT/0.7.2-info.xml
similarity index 63%
rename from sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_DWT/0.7.1-info.xml
rename to sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_DWT/0.7.2-info.xml
index 0920a9cefccc56161c4ce85a1ec35e5cda9eaec7..010c9c1acd9a6c8ef51b98ca3fc4696fd4e86299 100644
--- a/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_DWT/0.7.1-info.xml
+++ b/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_DWT/0.7.2-info.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.8.2" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.0     http://pear.php.net/dtd/package-2.0.xsd">
+<package xmlns="http://pear.php.net/dtd/package-2.1" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.1     http://pear.php.net/dtd/package-2.1.xsd" packagerversion="2.0.0">
  <name>UNL_DWT</name>
  <channel>pear.unl.edu</channel>
- <summary>This package generates php class files (objects) from Dreamweaver template files.</summary>
- <description>This package generates php class files (objects) from Dreamweaver template files.</description>
+ <summary>This package generates php class files (objects) from Dreamweaver template files.
+</summary>
+ <description>
+This package generates php class files (objects) from Dreamweaver template files.
+</description>
  <lead>
   <name>Brett Bieber</name>
   <user>saltybeagle</user>
   <email>brett.bieber@gmail.com</email>
   <active>yes</active>
  </lead>
- <date>2010-09-08</date>
- <time>10:31:36</time>
+ <date>2012-04-23</date>
+ <time>13:18:13</time>
  <version>
-  <release>0.7.1</release>
+  <release>0.7.2</release>
   <api>0.7.1</api>
  </version>
  <stability>
@@ -21,37 +24,21 @@
   <api>beta</api>
  </stability>
  <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD</license>
- <notes>
-Declare debug method correctly as static.
- </notes>
+ <notes>Scanner fix - do not replace newlines with spaces in scanned content</notes>
  <contents>
   <dir name="/">
-   <file baseinstalldir="/" md5sum="d1fe9ae1c22c92cda6d57b9847fda7b2" name="UNL/DWT/Scanner.php" role="php"/>
-   <file baseinstalldir="/" md5sum="be81db10741075600fc87ebbc4c4ca53" name="UNL/DWT/Region.php" role="php"/>
-   <file baseinstalldir="/" md5sum="aea406280cedf3a0e9b32ab7ee354b3f" name="UNL/DWT/Generator.php" role="php"/>
-   <file baseinstalldir="/" md5sum="8ccd77b7def177033c20128da938d1ff" name="UNL/DWT/createTemplates.php" role="php"/>
-   <file baseinstalldir="/" md5sum="c8b1f16f587798a1e37574477d2627bd" name="UNL/DWT.php" role="php">
-    <tasks:replace from="@PHP_BIN@" to="php_bin" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@DOC_DIR@" to="doc_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="b524ef4684be7dba47ed8c245577347a" name="docs/examples/Template_style1.tpl" role="doc"/>
-   <file baseinstalldir="/" md5sum="3f97c4a024dfed9210b14db5068ba7d0" name="docs/examples/Template_style1.php" role="doc"/>
-   <file baseinstalldir="/" md5sum="0d5a4f5ca86e9c2a3c0050f39acbb034" name="docs/examples/template_style1.dwt" role="doc"/>
-   <file baseinstalldir="/" md5sum="fbc254138e8456e983e18c0c02cc7d30" name="docs/examples/scanner_example.php" role="doc"/>
-   <file baseinstalldir="/" md5sum="5d389d72ffe3a15a5dd597cd791a6963" name="docs/examples/example_style1.php" role="doc">
-    <tasks:replace from="@PHP_BIN@" to="php_bin" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@DOC_DIR@" to="doc_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="783c64aafb491c789fc71a5bf80d1755" name="docs/examples/example.ini" role="doc">
-    <tasks:replace from="@PHP_BIN@" to="php_bin" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@DOC_DIR@" to="doc_dir" type="pear-config"/>
-   </file>
+   <file role="php" name="src/UNL/DWT/Scanner.php" md5sum="80ab5854ed8c2ab159c53cd5adc757b2"/>
+   <file role="php" name="src/UNL/DWT/Region.php" md5sum="be81db10741075600fc87ebbc4c4ca53"/>
+   <file role="php" name="src/UNL/DWT/Generator.php" md5sum="aea406280cedf3a0e9b32ab7ee354b3f"/>
+   <file role="php" name="src/UNL/DWT/createTemplates.php" md5sum="8ccd77b7def177033c20128da938d1ff"/>
+   <file role="php" name="src/UNL/DWT.php" md5sum="c8b1f16f587798a1e37574477d2627bd"/>
+   <file role="doc" name="docs/examples/Template_style1.tpl" md5sum="b524ef4684be7dba47ed8c245577347a"/>
+   <file role="doc" name="docs/examples/Template_style1.php" md5sum="3f97c4a024dfed9210b14db5068ba7d0"/>
+   <file role="doc" name="docs/examples/template_style1.dwt" md5sum="0d5a4f5ca86e9c2a3c0050f39acbb034"/>
+   <file role="doc" name="docs/examples/scanner_example.php" md5sum="e29437d89b8193aede3fc400ef1f363d"/>
+   <file role="doc" name="docs/examples/example_style1.php" md5sum="8fc92f34a5d56e8664ae669bb39ba763"/>
+   <file role="doc" name="docs/examples/example.test.ini" md5sum="28a080af44b5db3f28c73fa91cdabe99"/>
+   <file role="doc" name="docs/examples/example.ini" md5sum="783c64aafb491c789fc71a5bf80d1755"/>
   </dir>
  </contents>
  <dependencies>
@@ -134,7 +121,7 @@ Remove editable region tags for locked regions.
     <date>2006-08-15</date>
     <license uri="http://www.php.net/license">PHP License</license>
     <notes>
-* Fix Bug #16: Locked regions arent detected correctly.
+* Fix Bug #16: Locked regions aren't detected correctly.
 				 * Fix Bug #1: Include path modified incorrectly.
    </notes>
    </release>
diff --git a/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.2.0-info.xml b/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.3.0RC2-info.xml
similarity index 55%
rename from sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.2.0-info.xml
rename to sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.3.0RC2-info.xml
index f5495720ca4b3de9c1ab8f726ad65dadc7f6802f..99a7b359d6c85c93b6dc938c5c1b788eeabc2044 100644
--- a/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.2.0-info.xml
+++ b/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.3.0RC2-info.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.1" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.0     http://pear.php.net/dtd/package-2.0.xsd">
+<package xmlns="http://pear.php.net/dtd/package-2.1" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.1     http://pear.php.net/dtd/package-2.1.xsd" packagerversion="2.0.0">
  <name>UNL_Templates</name>
  <channel>pear.unl.edu</channel>
- <summary>The UNL HTML Templates as a PEAR Package.</summary>
- <description>This package allows you to render UNL Template styled pages using PHP Objects.</description>
+ <summary>The UNL HTML Templates as a PEAR Package.
+</summary>
+ <description>
+This package allows you to render UNL Template styled pages using PHP Objects.
+</description>
  <lead>
   <name>Brett Bieber</name>
   <user>saltybeagle</user>
@@ -16,258 +19,92 @@
   <email>nhummel2@math.unl.edu</email>
   <active>yes</active>
  </lead>
- <date>2011-08-31</date>
- <time>11:02:54</time>
+ <date>2012-04-23</date>
+ <time>13:18:13</time>
  <version>
-  <release>1.2.0</release>
+  <release>1.3.0RC2</release>
   <api>1.0.0</api>
  </version>
  <stability>
-  <release>stable</release>
+  <release>beta</release>
   <api>stable</api>
  </stability>
  <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
- <notes>
-Update .tpl cache so template files are in sync with latest wdntemplates.
-Allow underscores within Version3 template include files.
-
-New templates!
-
- * Fixed_html5
- * Unlaffiliate
-
-Template updates:
+ <notes>New features:
 
- * Meta lang fixes
- * Remove IDM region from the secure template
- * Mobile template now supports navigation and move to HTML5
- </notes>
+ - Add support for version 3.1 of the UNL Templates</notes>
  <contents>
   <dir name="/">
-   <file baseinstalldir="/" md5sum="40eeca840e02c9e5b2b2b7846bd73397" name="UNL/Templates/Version3/Unlaffiliate.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="f9b3c237b7a6b8500ef0d18f4e1c9595" name="UNL/Templates/Version3/Shared_column_right.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="c8e40b9ff760f0d6da578f6f52e85ab2" name="UNL/Templates/Version3/Shared_column_left.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="7586ee8d6db673dbef56fe491a0ac517" name="UNL/Templates/Version3/Secure.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="1d63a45e6f7e86585182a09ff8e33962" name="UNL/Templates/Version3/Popup.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="88ed3fab2afd3f989c53db231ea99715" name="UNL/Templates/Version3/Mobile.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="5ae65bf4c045a5b9b65b726b52d6cd26" name="UNL/Templates/Version3/Liquid.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="183165807ee292fa17a03314c5455a6b" name="UNL/Templates/Version3/Fixed_html5.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="041aae52a187c4986e495a8643b43ae4" name="UNL/Templates/Version3/Fixed.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="01035abd6b488663747399e74d0065bc" name="UNL/Templates/Version3/Document.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="05eb7e3f0639e79aeb2e4f5061a356f1" name="UNL/Templates/Version3/Debug.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="315f0d6be4459208f7733e6e29f99c91" name="UNL/Templates/Version3/Absolute.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="ac6b2ddcaa8204679eb0c8fd86cd7ed1" name="UNL/Templates/Version3.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="48a0fd1e66226418db0c7c5202343881" name="UNL/Templates/Version2/Unlstandardtemplate.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="e902fc42cdcb7633fbe07f4d509a1b97" name="UNL/Templates/Version2/Unlframework.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="bdac0dc69918a491efcee2450d99738f" name="UNL/Templates/Version2/Unlaffiliate.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="f43c4b5320cf2def6d90c71f3e22c1fb" name="UNL/Templates/Version2/Secure.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="0a1b634408248289e89649a49bd7759c" name="UNL/Templates/Version2/Popup.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="55c715aa91f18226f5be4c3f427b2dea" name="UNL/Templates/Version2/Liquid.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="3fbccc1b6e7a0287577972b4c25a0d19" name="UNL/Templates/Version2/Fixed.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="ef2068426bb8f73ac706b18a472df967" name="UNL/Templates/Version2/Document.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="4c1b93f62221e5229be657196f07f048" name="UNL/Templates/Version2.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="c7df0501ec102431d7be6a6cfd133b5b" name="UNL/Templates/Version.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="82740c1fadfd1160bb9c67006947ab3b" name="UNL/Templates/Scanner.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="4fa04418d0aa08834b4795caeae5b8c8" name="UNL/Templates/CachingService/UNLCacheLite.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="47991f0e5cffed6d138725a3294f4e6a" name="UNL/Templates/CachingService/Null.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="5b09b184e7d59a2520e99c0b5c66428a" name="UNL/Templates/CachingService/CacheLite.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="07884c3a9bf75657e54782423a088eb4" name="UNL/Templates/CachingService.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="2c228caecb506e35cf3259cabbcec9c1" name="UNL/Templates.php" role="php">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="12aa5989d1255dccc299a3dcdd6c6ba8" name="tests/UNL_TemplatesTest.php" role="test">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="9a7ce82868ddb7afc2b291b0b0ec6bd1" name="docs/examples/scanner.php" role="doc">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="445545ee84172f82ed09219931fa288e" name="docs/examples/example1.php" role="doc">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="e9769bdf0cf9ec36430b3f70ec687037" name="docs/examples/customization/customization_example.php" role="doc">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="26c8d867af8ffd4d8d60e348573f9c3d" name="docs/examples/customization/customization_example.html" role="doc">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="7e35aab85f95ad61fe43e50fbf1719a2" name="docs/examples/customization/CustomClass.php" role="doc">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="a7114a3868d0ba54d4ff76b370ea3201" name="docs/examples/convert.php" role="doc">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="6644923a681f49bfd425f5768d01e4a3" name="data/tpl_cache/Version3/Unlaffiliate.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="84cc265b12115d9c2733a6d03f5a4d85" name="data/tpl_cache/Version3/Shared_column_right.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="6003b105b79241b8e001d0f375265747" name="data/tpl_cache/Version3/Shared_column_left.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="6a5f82b61c2c2191494af9fe1384bdca" name="data/tpl_cache/Version3/Secure.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="1f3b340e18024423748839343369443d" name="data/tpl_cache/Version3/Popup.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="aa53260716fc4f1d2fc31d149416b7e0" name="data/tpl_cache/Version3/Mobile.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="4b576a99e001b22d3c77b01f72789546" name="data/tpl_cache/Version3/Liquid.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="9cedaa7c695c654e0f16fa534e35ec32" name="data/tpl_cache/Version3/Fixed_html5.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="783216b7dc343283a21ba3f8a8e5396b" name="data/tpl_cache/Version3/Fixed.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="8a7ecbc31b2a4d85bad056f7c0d06039" name="data/tpl_cache/Version3/Document.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="fe52677e48d48d798d70e9cad4b5c0ed" name="data/tpl_cache/Version3/Debug.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="b3cf17273448a34ac869d4369663e819" name="data/tpl_cache/Version3/Absolute.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="2082f29e6219b9fdad0faffb2bf9a427" name="data/tpl_cache/Version2/Unlstandardtemplate.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="465cb4e7eef89560faf0c63065d8a9d3" name="data/tpl_cache/Version2/Unlframework.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="9f4650a475623a3cf293998c0e5b3233" name="data/tpl_cache/Version2/Unlaffiliate.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="962fecd9908d504e4749f7eb79dc4736" name="data/tpl_cache/Version2/Secure.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="a70442037d218c0dc948638bca8e5e08" name="data/tpl_cache/Version2/Popup.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="1a936fdcd4d17383490bd5aef1219ce8" name="data/tpl_cache/Version2/Liquid.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="df5ce334e93b844794699f3cc62d20b9" name="data/tpl_cache/Version2/Fixed.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
-   <file baseinstalldir="/" md5sum="61cc4ae92fac84a7d38131769c2298ba" name="data/tpl_cache/Version2/Document.tpl" role="data">
-    <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
-    <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
-   </file>
+   <file role="test" name="test/pear.unl.edu/UNL_Templates/UNL_TemplatesTest.php" md5sum="12aa5989d1255dccc299a3dcdd6c6ba8"/>
+   <file role="php" name="php/UNL/Templates/Version3x1/Unlaffiliate_local.php" md5sum="9f3867901ad594901d11ffff07b36843"/>
+   <file role="php" name="php/UNL/Templates/Version3x1/Unlaffiliate_debug.php" md5sum="4e006ca79895e0f9676d0ac792d2376a"/>
+   <file role="php" name="php/UNL/Templates/Version3x1/Unlaffiliate.php" md5sum="d04b37bd1e8da510610b9ad66de26487"/>
+   <file role="php" name="php/UNL/Templates/Version3x1/Local.php" md5sum="bab0b09eabc5d2fe041c4379dfa0634c"/>
+   <file role="php" name="php/UNL/Templates/Version3x1/Fixed.php" md5sum="8800d08ea41dcd31b7f444924d0e96c6"/>
+   <file role="php" name="php/UNL/Templates/Version3x1/Debug.php" md5sum="53764519ccbb2cda9d35f77843d85a61"/>
+   <file role="php" name="php/UNL/Templates/Version3x1.php" md5sum="3db6efc4892a2b68869a27941673bb5a"/>
+   <file role="php" name="php/UNL/Templates/Version3/Unlaffiliate.php" md5sum="40eeca840e02c9e5b2b2b7846bd73397"/>
+   <file role="php" name="php/UNL/Templates/Version3/Shared_column_right.php" md5sum="f9b3c237b7a6b8500ef0d18f4e1c9595"/>
+   <file role="php" name="php/UNL/Templates/Version3/Shared_column_left.php" md5sum="c8e40b9ff760f0d6da578f6f52e85ab2"/>
+   <file role="php" name="php/UNL/Templates/Version3/Secure.php" md5sum="7586ee8d6db673dbef56fe491a0ac517"/>
+   <file role="php" name="php/UNL/Templates/Version3/Popup.php" md5sum="1d63a45e6f7e86585182a09ff8e33962"/>
+   <file role="php" name="php/UNL/Templates/Version3/Mobile.php" md5sum="88ed3fab2afd3f989c53db231ea99715"/>
+   <file role="php" name="php/UNL/Templates/Version3/Liquid.php" md5sum="5ae65bf4c045a5b9b65b726b52d6cd26"/>
+   <file role="php" name="php/UNL/Templates/Version3/Fixed_html5.php" md5sum="183165807ee292fa17a03314c5455a6b"/>
+   <file role="php" name="php/UNL/Templates/Version3/Fixed.php" md5sum="041aae52a187c4986e495a8643b43ae4"/>
+   <file role="php" name="php/UNL/Templates/Version3/Document.php" md5sum="01035abd6b488663747399e74d0065bc"/>
+   <file role="php" name="php/UNL/Templates/Version3/Debug.php" md5sum="05eb7e3f0639e79aeb2e4f5061a356f1"/>
+   <file role="php" name="php/UNL/Templates/Version3/Absolute.php" md5sum="315f0d6be4459208f7733e6e29f99c91"/>
+   <file role="php" name="php/UNL/Templates/Version3.php" md5sum="7edb40844a43918f467f6cf881424aaf"/>
+   <file role="php" name="php/UNL/Templates/Version2/Unlstandardtemplate.php" md5sum="48a0fd1e66226418db0c7c5202343881"/>
+   <file role="php" name="php/UNL/Templates/Version2/Unlframework.php" md5sum="e902fc42cdcb7633fbe07f4d509a1b97"/>
+   <file role="php" name="php/UNL/Templates/Version2/Unlaffiliate.php" md5sum="bdac0dc69918a491efcee2450d99738f"/>
+   <file role="php" name="php/UNL/Templates/Version2/Secure.php" md5sum="f43c4b5320cf2def6d90c71f3e22c1fb"/>
+   <file role="php" name="php/UNL/Templates/Version2/Popup.php" md5sum="0a1b634408248289e89649a49bd7759c"/>
+   <file role="php" name="php/UNL/Templates/Version2/Liquid.php" md5sum="55c715aa91f18226f5be4c3f427b2dea"/>
+   <file role="php" name="php/UNL/Templates/Version2/Fixed.php" md5sum="3fbccc1b6e7a0287577972b4c25a0d19"/>
+   <file role="php" name="php/UNL/Templates/Version2/Document.php" md5sum="ef2068426bb8f73ac706b18a472df967"/>
+   <file role="php" name="php/UNL/Templates/Version2.php" md5sum="8472e8942eb062eb06568386c237f9c1"/>
+   <file role="php" name="php/UNL/Templates/Version.php" md5sum="c7df0501ec102431d7be6a6cfd133b5b"/>
+   <file role="php" name="php/UNL/Templates/Scanner.php" md5sum="82740c1fadfd1160bb9c67006947ab3b"/>
+   <file role="php" name="php/UNL/Templates/CachingService/UNLCacheLite.php" md5sum="4fa04418d0aa08834b4795caeae5b8c8"/>
+   <file role="php" name="php/UNL/Templates/CachingService/Null.php" md5sum="47991f0e5cffed6d138725a3294f4e6a"/>
+   <file role="php" name="php/UNL/Templates/CachingService/CacheLite.php" md5sum="5b09b184e7d59a2520e99c0b5c66428a"/>
+   <file role="php" name="php/UNL/Templates/CachingService.php" md5sum="07884c3a9bf75657e54782423a088eb4"/>
+   <file role="php" name="php/UNL/Templates.php" md5sum="1f39ddc40f5a2b2ba0f68ca3367de923"/>
+   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/scanner.php" md5sum="2b116cf09b8d73c439718217d83a32c2"/>
+   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/example1.php" md5sum="c3de6bfef1cee16be4135f310e5e601d"/>
+   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/customization/customization_example.php" md5sum="e9769bdf0cf9ec36430b3f70ec687037"/>
+   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/customization/customization_example.html" md5sum="26c8d867af8ffd4d8d60e348573f9c3d"/>
+   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/customization/CustomClass.php" md5sum="43bc783b2215f9668800ce2e80ad457b"/>
+   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/convert.php" md5sum="a7114a3868d0ba54d4ff76b370ea3201"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_local.tpl" md5sum="8801aaa43aaca9d820728f665ed6e64d"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_debug.tpl" md5sum="6c2891e91facb216e7f4c13d5be3c339"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate.tpl" md5sum="26907bf294eba52039c49cbde60b2693"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Local.tpl" md5sum="278f3cefa48d8aca1b6f316909ed3a50"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Fixed.tpl" md5sum="1e00218790ec2552d5b02e7a1e83c1fd"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Debug.tpl" md5sum="8074ddde1770dd571bd8c21917cf3607"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Unlaffiliate.tpl" md5sum="6644923a681f49bfd425f5768d01e4a3"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_right.tpl" md5sum="84cc265b12115d9c2733a6d03f5a4d85"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_left.tpl" md5sum="6003b105b79241b8e001d0f375265747"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Secure.tpl" md5sum="6a5f82b61c2c2191494af9fe1384bdca"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Popup.tpl" md5sum="1f3b340e18024423748839343369443d"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Mobile.tpl" md5sum="aa53260716fc4f1d2fc31d149416b7e0"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Liquid.tpl" md5sum="4b576a99e001b22d3c77b01f72789546"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed_html5.tpl" md5sum="9cedaa7c695c654e0f16fa534e35ec32"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed.tpl" md5sum="783216b7dc343283a21ba3f8a8e5396b"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Document.tpl" md5sum="8a7ecbc31b2a4d85bad056f7c0d06039"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Debug.tpl" md5sum="fe52677e48d48d798d70e9cad4b5c0ed"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Absolute.tpl" md5sum="b3cf17273448a34ac869d4369663e819"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlstandardtemplate.tpl" md5sum="2082f29e6219b9fdad0faffb2bf9a427"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlframework.tpl" md5sum="465cb4e7eef89560faf0c63065d8a9d3"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlaffiliate.tpl" md5sum="9f4650a475623a3cf293998c0e5b3233"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Secure.tpl" md5sum="962fecd9908d504e4749f7eb79dc4736"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Popup.tpl" md5sum="a70442037d218c0dc948638bca8e5e08"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Liquid.tpl" md5sum="1a936fdcd4d17383490bd5aef1219ce8"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Fixed.tpl" md5sum="df5ce334e93b844794699f3cc62d20b9"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Document.tpl" md5sum="61cc4ae92fac84a7d38131769c2298ba"/>
+   <file role="data" name="data/pear.unl.edu/UNL_Templates/cssUNLTemplates.ini" md5sum="a56a41abc8a324ef7029dd8b485204bf"/>
   </dir>
  </contents>
  <dependencies>
@@ -276,7 +113,7 @@ Template updates:
     <min>5.0.0</min>
    </php>
    <pearinstaller>
-    <min>1.4.3</min>
+    <min>2.0.0a1</min>
    </pearinstaller>
    <package>
     <name>UNL_DWT</name>
diff --git a/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/cssUNLTemplates.ini b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/cssUNLTemplates.ini
new file mode 100644
index 0000000000000000000000000000000000000000..b2223e4ce489bd1e63b0da5ccc208bae6363e6f1
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/cssUNLTemplates.ini
@@ -0,0 +1,9 @@
+;php /usr/local/php5/lib/php/UNL/DWT/createTemplates.php cssUNLTemplates.ini
+[UNL_DWT]
+dwt_location    = /Users/bbieber/Documents/workspace/wdntemplates/Templates/
+class_location  = /Users/bbieber/Documents/workspace/UNL_Templates/src/UNL/Templates/Version3x1
+tpl_location    = /Users/bbieber/Documents/workspace/UNL_Templates/data/tpl_cache/Version3x1
+class_prefix    = UNL_Templates_Version3x1_
+generator_exclude_regex = "/^(asp|php)/i"
+extends         = UNL_Templates
+extends_location	= "UNL/Templates.php"
\ No newline at end of file
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Document.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Document.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Document.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Document.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Fixed.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Fixed.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Fixed.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Fixed.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Liquid.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Liquid.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Liquid.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Liquid.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Popup.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Popup.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Popup.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Popup.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Secure.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Secure.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Secure.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Secure.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Unlaffiliate.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlaffiliate.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Unlaffiliate.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlaffiliate.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Unlframework.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlframework.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Unlframework.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlframework.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Unlstandardtemplate.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlstandardtemplate.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version2/Unlstandardtemplate.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlstandardtemplate.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Absolute.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Absolute.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Debug.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Debug.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Document.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Document.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed_html5.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed_html5.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed_html5.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed_html5.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Liquid.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Liquid.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Mobile.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Mobile.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Popup.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Popup.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Secure.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Secure.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_left.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_left.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_right.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_right.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Unlaffiliate.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Unlaffiliate.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Unlaffiliate.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Unlaffiliate.tpl
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Debug.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Debug.tpl
similarity index 84%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Debug.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Debug.tpl
index 871278c03d8d1715d723bb98ffab4988a12f6439..5427bfa87ed24b06434c2c0b983ae783d824cfff 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Debug.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Debug.tpl
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile)|!(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
+<!--[if IEMobile 7 ]><html class="ie iem7"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 7 ]><html class="ie ie7" lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
 <head>
 <!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
 <!--
@@ -19,7 +19,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id$
+    $Id: debug.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
 -->
 <!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles_debug.html" -->
 <!-- InstanceBeginEditable name="doctitle" -->
@@ -32,7 +32,7 @@
 <!-- InstanceEndEditable -->
 <!-- TemplateParam name="class" type="text" value="fixed debug" -->
 </head>
-<body class="@@(_document['class'])@@">
+<body class="@@(_document['class'])@@" data-version="3.1">
     <nav class="skipnav">
         <a class="skipnav" href="#maincontent">Skip Navigation</a>
     </nav>
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Fixed.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Fixed.tpl
similarity index 84%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Fixed.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Fixed.tpl
index ef285bf13e67c9d8f0721961c661501efdf8bdc6..2ab5dd2792ca321bfcfa2413ea1150aea1e48f61 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Fixed.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Fixed.tpl
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile)|!(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
+<!--[if IEMobile 7 ]><html class="ie iem7"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 7 ]><html class="ie ie7" lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
 <head>
 <!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
 <!--
@@ -19,7 +19,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id$
+    $Id: fixed.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
 -->
 <!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles.html" -->
 <!-- InstanceBeginEditable name="doctitle" -->
@@ -32,7 +32,7 @@
 <!-- InstanceEndEditable -->
 <!-- TemplateParam name="class" type="text" value="fixed" -->
 </head>
-<body class="@@(_document['class'])@@">
+<body class="@@(_document['class'])@@" data-version="3.1">
     <nav class="skipnav">
         <a class="skipnav" href="#maincontent">Skip Navigation</a>
     </nav>
diff --git a/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Local.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Local.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..2bd3f2525ae9b07ff75b113cf2f9207c5321a7a6
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Local.tpl
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<!--[if IEMobile 7 ]><html class="ie iem7"><!-- InstanceBegin template="/Templates/local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><!-- InstanceBegin template="/Templates/local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 7 ]><html class="ie ie7" lang="en"><!-- InstanceBegin template="/Templates/local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"><!-- InstanceBegin template="/Templates/local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><!-- InstanceBegin template="/Templates/local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/local.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
+<head>
+<!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
+<!--
+    Membership and regular participation in the UNL Web Developer Network
+    is required to use the UNL templates. Visit the WDN site at 
+    http://wdn.unl.edu/. Click the WDN Registry link to log in and
+    register your unl.edu site.
+    All UNL template code is the property of the UNL Web Developer Network.
+    The code seen in a source code view is not, and may not be used as, a 
+    template. You may not use this code, a reverse-engineered version of 
+    this code, or its associated visual presentation in whole or in part to
+    create a derivative work.
+    This message may not be removed from any pages based on the UNL site template.
+    
+    $Id: local.dwt | d3b0e517ecafe3e1f81c45ddafa7a316adcc45dd | Fri Mar 9 11:41:56 2012 -0600 | Kevin Abel  $
+-->
+<!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles_local.html" -->
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>
+<!-- InstanceEndEditable -->
+
+<!-- InstanceBeginEditable name="head" -->
+<!-- Place optional header elements here -->
+
+<!-- InstanceEndEditable -->
+<!-- TemplateParam name="class" type="text" value="fixed" -->
+</head>
+<body class="@@(_document['class'])@@" data-version="3.1">
+    <nav class="skipnav">
+        <a class="skipnav" href="#maincontent">Skip Navigation</a>
+    </nav>
+    <div id="wdn_wrapper">
+        <header id="header" role="banner">
+            <a id="logo" href="http://www.unl.edu/" title="UNL website">UNL</a>
+            <span id="wdn_institution_title">University of Nebraska&ndash;Lincoln</span>
+            <span id="wdn_site_title">
+<!-- InstanceBeginEditable name="titlegraphic" -->
+The Title of My Site
+<!-- InstanceEndEditable -->
+</span>
+            <!--#include virtual="/wdn/templates_3.1/includes/idm.html" -->
+            <!--#include virtual="/wdn/templates_3.1/includes/wdnTools.html" -->
+        </header>
+        <div id="wdn_navigation_bar">
+            <nav id="breadcrumbs">
+                <!-- WDN: see glossary item 'breadcrumbs' -->
+                <h3 class="wdn_list_descriptor hidden">Breadcrumbs</h3>
+                
+<!-- InstanceBeginEditable name="breadcrumbs" -->
+                <ul>
+                    <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
+                    <li class="selected"><a href="#" title="Site Title">Site Title</a></li>
+                    <li>Page Title</li>
+                </ul>
+                
+<!-- InstanceEndEditable -->
+            </nav>
+            <div id="wdn_navigation_wrapper">
+                <nav id="navigation" role="navigation">
+                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
+                    
+<!-- InstanceBeginEditable name="navlinks" -->
+                    <!--#include virtual="../sharedcode/navigation.html" -->
+                    
+<!-- InstanceEndEditable -->
+                </nav>
+            </div>
+        </div>
+        <div id="wdn_content_wrapper">
+            <div id="pagetitle">
+                
+<!-- InstanceBeginEditable name="pagetitle" -->
+                <h1>This is your page title. It's now an &lt;h1&gt;, baby!</h1>
+                
+<!-- InstanceEndEditable -->
+            </div>
+            <div id="maincontent" role="main">
+                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
+                
+<!-- InstanceBeginEditable name="maincontentarea" -->
+                <h2>This is a blank page</h2>
+                <p>Impress your audience with awesome content!</p> 
+                
+<!-- InstanceEndEditable -->
+                <div class="clear"></div>
+                <!--#include virtual="/wdn/templates_3.1/includes/noscript.html" -->
+                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
+            </div>
+        </div>
+        <footer id="footer">
+            <div id="footer_floater"></div>
+            <div class="footer_col" id="wdn_footer_feedback">
+                <!--#include virtual="/wdn/templates_3.1/includes/feedback.html" -->
+            </div>
+            <div class="footer_col" id="wdn_footer_related">
+                
+<!-- InstanceBeginEditable name="leftcollinks" -->
+                <!--#include virtual="../sharedcode/relatedLinks.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col" id="wdn_footer_contact">
+                
+<!-- InstanceBeginEditable name="contactinfo" -->
+                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col" id="wdn_footer_share">
+                <!--#include virtual="/wdn/templates_3.1/includes/socialmediashare.html" -->
+            </div>
+            
+<!-- InstanceBeginEditable name="optionalfooter" -->
+            
+<!-- InstanceEndEditable -->
+            <div id="wdn_copyright">
+                <div>
+                    
+<!-- InstanceBeginEditable name="footercontent" -->
+                    <!--#include virtual="../sharedcode/footer.html" -->
+                    
+<!-- InstanceEndEditable -->
+                    <!--#include virtual="/wdn/templates_3.1/includes/wdn.html" -->
+                </div>
+                <!--#include virtual="/wdn/templates_3.1/includes/logos.html" -->
+            </div>
+        </footer>
+    </div>
+</body>
+</html>
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Unlaffiliate.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate.tpl
similarity index 84%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Unlaffiliate.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate.tpl
index a9c20a169d50817cb29f4cbf8588fbf71fba50a8..e17a0b841a4eb7180ca46dd17999816a71ada354 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Unlaffiliate.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate.tpl
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile)|!(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
+<!--[if IEMobile 7 ]><html class="ie iem7"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 7 ]><html class="ie ie7" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
 <head>
 <!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
 <!--
@@ -19,7 +19,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id$
+    $Id: unlaffiliate.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
 -->
 <!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles.html" -->
 <!-- InstanceBeginEditable name="doctitle" -->
@@ -33,7 +33,7 @@
 <!-- InstanceEndEditable -->
 <!-- TemplateParam name="class" type="text" value="fixed" -->
 </head>
-<body class="@@(_document['class'])@@">
+<body class="@@(_document['class'])@@" data-version="3.1">
     <nav class="skipnav">
         <a class="skipnav" href="#maincontent">Skip Navigation</a>
     </nav>
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Unlaffiliate_debug.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_debug.tpl
similarity index 84%
rename from sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Unlaffiliate_debug.tpl
rename to sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_debug.tpl
index 1d5f34097d8303ee76afaf0c2f0cd6f003684874..e09fc843aa01c2fa4c3b5aa9fb6fbca4d8a130c1 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3x1/Unlaffiliate_debug.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_debug.tpl
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile)|!(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_debug.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
+<!--[if IEMobile 7 ]><html class="ie iem7"><!-- InstanceBegin template="/Templates/unlaffiliate_debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 7 ]><html class="ie ie7" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_debug.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_debug.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
 <head>
 <!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
 <!--
@@ -19,7 +19,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id$
+    $Id: unlaffiliate_debug.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
 -->
 <!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles_debug.html" -->
 <!-- InstanceBeginEditable name="doctitle" -->
@@ -33,7 +33,7 @@
 <!-- InstanceEndEditable -->
 <!-- TemplateParam name="class" type="text" value="fixed debug" -->
 </head>
-<body class="@@(_document['class'])@@">
+<body class="@@(_document['class'])@@" data-version="3.1">
     <nav class="skipnav">
         <a class="skipnav" href="#maincontent">Skip Navigation</a>
     </nav>
diff --git a/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_local.tpl b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_local.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..865cee1f2020efac54b8aa65417fed32337f24da
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_local.tpl
@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<!--[if IEMobile 7 ]><html class="ie iem7"><!-- InstanceBegin template="/Templates/unlaffiliate_local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 7 ]><html class="ie ie7" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_local.dwt" codeOutsideHTMLIsLocked="false" --><![endif]-->
+<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_local.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
+<head>
+<!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
+<!--
+    Membership and regular participation in the UNL Web Developer Network
+    is required to use the UNL templates. Visit the WDN site at 
+    http://wdn.unl.edu/. Click the WDN Registry link to log in and
+    register your unl.edu site.
+    All UNL template code is the property of the UNL Web Developer Network.
+    The code seen in a source code view is not, and may not be used as, a 
+    template. You may not use this code, a reverse-engineered version of 
+    this code, or its associated visual presentation in whole or in part to
+    create a derivative work.
+    This message may not be removed from any pages based on the UNL site template.
+    
+    $Id: unlaffiliate_local.dwt | d3b0e517ecafe3e1f81c45ddafa7a316adcc45dd | Fri Mar 9 11:41:56 2012 -0600 | Kevin Abel  $
+-->
+<!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles_local.html" -->
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>
+<!-- InstanceEndEditable -->
+
+<!-- InstanceBeginEditable name="head" -->
+<!-- Place optional header elements here -->
+<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
+<link href="../sharedcode/affiliate_imgs/favicon.ico" rel="shortcut icon" />
+<!-- InstanceEndEditable -->
+<!-- TemplateParam name="class" type="text" value="fixed" -->
+</head>
+<body class="@@(_document['class'])@@" data-version="3.1">
+    <nav class="skipnav">
+        <a class="skipnav" href="#maincontent">Skip Navigation</a>
+    </nav>
+    <div id="wdn_wrapper">
+        <header id="header" role="banner">
+            <!-- InstanceBeginEditable name="sitebranding_logo" -->
+            <a id="logo" href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Through the Eyes of the Child Initiative</a>
+            
+<!-- InstanceEndEditable -->
+            <span id="wdn_institution_title"><!-- InstanceBeginEditable name="sitebranding_affiliate" --><a href="http://www.unl.edu" title="University of Nebraska&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;Lincoln</a>
+<!-- InstanceEndEditable -->
+</span>            
+    		<span id="wdn_site_title">
+<!-- InstanceBeginEditable name="titlegraphic" -->
+Throught the Eyes of a Child Initiative<span>A Nebraska Supreme Court Initiative</span>
+<!-- InstanceEndEditable -->
+</span>
+    		<!--#include virtual="/wdn/templates_3.1/includes/idm.html" -->
+            <!--#include virtual="/wdn/templates_3.1/includes/wdnTools.html" -->
+        </header>
+        <div id="wdn_navigation_bar">
+            <nav id="breadcrumbs">
+                <!-- WDN: see glossary item 'breadcrumbs' -->
+                <h3 class="wdn_list_descriptor hidden">Breadcrumbs</h3>
+                
+<!-- InstanceBeginEditable name="breadcrumbs" -->
+                <ul>
+                    <li><a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Home</a></li>
+                </ul>
+                
+<!-- InstanceEndEditable -->
+            </nav>
+            <div id="wdn_navigation_wrapper">
+                <nav id="navigation" role="navigation">
+                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
+                    
+<!-- InstanceBeginEditable name="navlinks" -->
+                    <!--#include virtual="../sharedcode/navigation.html" -->
+                    
+<!-- InstanceEndEditable -->
+                </nav>
+            </div>
+        </div>
+        <div id="wdn_content_wrapper">
+            <div id="pagetitle">
+                
+<!-- InstanceBeginEditable name="pagetitle" -->
+                <h1>This is your page title. It's now an &lt;h1&gt;, baby!</h1>
+                
+<!-- InstanceEndEditable -->
+            </div>
+            <div id="maincontent" role="main">
+                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
+                
+<!-- InstanceBeginEditable name="maincontentarea" -->
+                <h2>This is a blank page</h2>
+                <p>Impress your audience with awesome content!</p> 
+                
+<!-- InstanceEndEditable -->
+                <div class="clear"></div>
+                <!--#include virtual="/wdn/templates_3.1/includes/noscript.html" -->
+                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
+            </div>
+        </div>
+        <footer id="footer">
+            <div id="footer_floater"></div>
+            <div class="footer_col" id="wdn_footer_feedback">
+                <!--#include virtual="/wdn/templates_3.1/includes/feedback.html" -->
+            </div>
+            <div class="footer_col" id="wdn_footer_related">
+                
+<!-- InstanceBeginEditable name="leftcollinks" -->
+                <!--#include virtual="../sharedcode/relatedLinks.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col" id="wdn_footer_contact">
+                
+<!-- InstanceBeginEditable name="contactinfo" -->
+                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col" id="wdn_footer_share">
+                <!--#include virtual="/wdn/templates_3.1/includes/socialmediashare.html" -->
+            </div>
+            
+<!-- InstanceBeginEditable name="optionalfooter" -->
+            
+<!-- InstanceEndEditable -->
+            <div id="wdn_copyright">
+                <div>
+                    
+<!-- InstanceBeginEditable name="footercontent" -->
+                    <!--#include virtual="../sharedcode/footer.html" -->
+                    
+<!-- InstanceEndEditable -->
+                    <!--#include virtual="/wdn/templates_3.1/includes/wdn.html" -->
+                </div>
+                <!--#include virtual="/wdn/templates_3.1/includes/logos.html" -->
+            </div>
+        </footer>
+    </div>
+</body>
+</html>
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/example.ini b/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/example.ini
deleted file mode 100644
index 49dc453b73499fd29ba466001edbb3e127a41f49..0000000000000000000000000000000000000000
--- a/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/example.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[UNL_DWT]
-dwt_location    = /Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/
-class_location  = /Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/
-tpl_location	= /Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/
-class_prefix    = UNL_DWT_
\ No newline at end of file
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/.cvsignore b/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/.cvsignore
deleted file mode 100644
index e12d58d8e593d0ebb2262cd60075be070006133c..0000000000000000000000000000000000000000
--- a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-_notes
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/Template_style1.php b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.php
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/Template_style1.php
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.php
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/Template_style1.tpl b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.tpl
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/Template_style1.tpl
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.tpl
diff --git a/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/example.ini b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/example.ini
new file mode 100644
index 0000000000000000000000000000000000000000..edf2b239e2d2d653bf45049ecc277572de2266f5
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/example.ini
@@ -0,0 +1,5 @@
+[UNL_DWT]
+dwt_location    = @DOC_DIR@/UNL_DWT/docs/examples/
+class_location  = @DOC_DIR@/UNL_DWT/docs/examples/
+tpl_location	= @DOC_DIR@/UNL_DWT/docs/examples/
+class_prefix    = UNL_DWT_
\ No newline at end of file
diff --git a/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/example.test.ini b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/example.test.ini
new file mode 100644
index 0000000000000000000000000000000000000000..6f24a0b77b8e13197c9649c42aa2139a647de3fc
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/example.test.ini
@@ -0,0 +1,5 @@
+[UNL_DWT]
+dwt_location    = ./
+class_location  = ./
+tpl_location	= ./
+class_prefix    = UNL_DWT_
\ No newline at end of file
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/example_style1.php b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/example_style1.php
similarity index 61%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/example_style1.php
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/example_style1.php
index 7db151f741115f33eeb7e9a6e12639c310684688..632c8afa2e6f26b57c5a32c9e5c5c228860e2972 100644
--- a/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/example_style1.php
+++ b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/example_style1.php
@@ -1,16 +1,18 @@
 <?php
 /**
- * This example uses the DWT object generated by: '/usr/local/bin/php /Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/php/UNL/DWT/createTemplates.php /Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/example.ini'
+ * This example uses the DWT object generated by: '@PHP_BIN@ @PHP_DIR@/UNL/DWT/createTemplates.php @DOC_DIR@/UNL_DWT/docs/examples/example.ini'
  * 
  */
 ini_set('display_errors',true);
 error_reporting(E_ALL|E_STRICT);
 
+set_include_path(dirname(__DIR__).'/../src');
+
 require_once 'UNL/DWT.php';
-if ('/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/data' == '@'.'DATA_DIR@') {
+if ('@DATA_DIR@' == '@'.'DATA_DIR@') {
     $configfile = 'example.test.ini';
 } else {
-    $configfile = '/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/example.ini';
+    $configfile = '@DOC_DIR@/UNL_DWT/docs/examples/example.ini';
 }
 $config = parse_ini_file($configfile, true);
 foreach($config as $class=>$values) {
@@ -23,6 +25,6 @@ $page->content = "<p>This example demonstrates the usefulness of the DWT object
 $page->content .= "<p>Included with the DWT package is a Dreamweaver template with 4 editable regions [template_style1.dwt]. This page is rendered using the DWT class created from that template.</p>";
 $page->content .= "<p>To create classes for your Templates, create a .ini file with the location of your Dreamweaver templates (dwt's) and then run the createTemplates.php script to generate objects for each of your template files.</p>";
 $page->content .= "<p>Here is the ini file used to create the Template_style1:<pre><code>".file_get_contents($configfile)."</code></pre></p>";
-$page->content .= "<p>And the command used to create the template classes:<pre><code>/usr/local/bin/php /Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/php/UNL/DWT/createTemplates.php /Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/example.ini</code></pre></p>";
+$page->content .= "<p>And the command used to create the template classes:<pre><code>@PHP_BIN@ @PHP_DIR@/UNL/DWT/createTemplates.php @DOC_DIR@/UNL_DWT/docs/examples/example.ini</code></pre></p>";
 $page->footer  = "<a href='mailto:brett.bieber@gmail.com'>Brett Bieber</a>";
 echo $page->toHtml();
\ No newline at end of file
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/scanner_example.php b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/scanner_example.php
similarity index 81%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/scanner_example.php
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/scanner_example.php
index c0ba19014a1b6cbe7ff14b1b150e2fa916c00504..52d9629a66e5a7c0988f73631b5920833e8e833f 100644
--- a/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/scanner_example.php
+++ b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/scanner_example.php
@@ -1,4 +1,7 @@
 <?php
+
+set_include_path(dirname(__DIR__).'/../src');
+
 require_once 'UNL/DWT/Scanner.php';
 
 $file = file_get_contents(dirname(__FILE__).'/'.'template_style1.dwt');
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/template_style1.dwt b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/template_style1.dwt
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_DWT/docs/examples/template_style1.dwt
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_DWT/examples/template_style1.dwt
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/convert.php b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/convert.php
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/convert.php
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/convert.php
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/customization/CustomClass.php b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/CustomClass.php
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/customization/CustomClass.php
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/CustomClass.php
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/customization/customization_example.html b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.html
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/customization/customization_example.html
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.html
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/customization/customization_example.php b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.php
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/customization/customization_example.php
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.php
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/example1.php b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/example1.php
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/example1.php
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/example1.php
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/scanner.php b/sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/scanner.php
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/scanner.php
rename to sites/all/themes/unl_wdn/lib/docs/pear.unl.edu/UNL_Templates/examples/scanner.php
diff --git a/sites/all/themes/unl_wdn/lib/downloads/UNL_Cache_Lite-0.1.0.tgz b/sites/all/themes/unl_wdn/lib/downloads/UNL_Cache_Lite-0.1.0.tgz
deleted file mode 100644
index 3d4d5c397f49876f7d3a324277c39fe57d0e2061..0000000000000000000000000000000000000000
Binary files a/sites/all/themes/unl_wdn/lib/downloads/UNL_Cache_Lite-0.1.0.tgz and /dev/null differ
diff --git a/sites/all/themes/unl_wdn/lib/downloads/UNL_DWT-0.7.1.tgz b/sites/all/themes/unl_wdn/lib/downloads/UNL_DWT-0.7.1.tgz
deleted file mode 100644
index 573413bc464c0418d8f78a7cde905362bb555050..0000000000000000000000000000000000000000
Binary files a/sites/all/themes/unl_wdn/lib/downloads/UNL_DWT-0.7.1.tgz and /dev/null differ
diff --git a/sites/all/themes/unl_wdn/lib/downloads/UNL_Templates-1.0.0.tgz b/sites/all/themes/unl_wdn/lib/downloads/UNL_Templates-1.0.0.tgz
deleted file mode 100644
index 43286fa89affe6eb40466b453183688edea6d24f..0000000000000000000000000000000000000000
Binary files a/sites/all/themes/unl_wdn/lib/downloads/UNL_Templates-1.0.0.tgz and /dev/null differ
diff --git a/sites/all/themes/unl_wdn/lib/downloads/UNL_Templates-1.2.0.tgz b/sites/all/themes/unl_wdn/lib/downloads/UNL_Templates-1.2.0.tgz
deleted file mode 100644
index f8765662990f550d9727cc4fc810072caa48e352..0000000000000000000000000000000000000000
Binary files a/sites/all/themes/unl_wdn/lib/downloads/UNL_Templates-1.2.0.tgz and /dev/null differ
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/DWT/Scanner.php b/sites/all/themes/unl_wdn/lib/php/UNL/DWT/Scanner.php
index 67b60600d126cd315f200ea85871d4521e996105..4ee274753d5e6d9a395087afb7fcaee612eda768 100644
--- a/sites/all/themes/unl_wdn/lib/php/UNL/DWT/Scanner.php
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/DWT/Scanner.php
@@ -82,7 +82,7 @@ class UNL_DWT_Scanner
             } else {
                 if ($newRegion===true) {
                     // Add the value of this region.
-                    $region->value .= trim($fileregion)." ";
+                    $region->value .= trim($fileregion).PHP_EOL;
                 }
             }
         }
@@ -135,4 +135,4 @@ class UNL_DWT_Scanner
     
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates.php
index f55d9ee402eab13bf32f8fd9c6c25b968e14b55a..2f0015cd027c6fc42310f59b44c4f28d1fa53e0a 100644
--- a/sites/all/themes/unl_wdn/lib/php/UNL/Templates.php
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates.php
@@ -353,10 +353,9 @@ class UNL_Templates extends UNL_DWT
 
     static public function getDataDir()
     {
-
-        if (file_exists(dirname(__FILE__).'/../../data/UNL_Templates/data')) {
-            // relative package installation layout
-            return dirname(__FILE__).'/../../data/UNL_Templates/data';
+        if (file_exists(dirname(__FILE__).'/../../data/pear.unl.edu/UNL_Templates')) {
+            // new pear2 package & pyrus installation layout
+            return dirname(__FILE__).'/../../data/pear.unl.edu/UNL_Templates';
         }
 
         if (file_exists(dirname(__FILE__).'/../../data/tpl_cache')) {
@@ -364,11 +363,6 @@ class UNL_Templates extends UNL_DWT
             return realpath(dirname(__FILE__).'/../../data');
         }
 
-        if (file_exists(dirname(__FILE__).'/../../data/pear.unl.edu/UNL_Templates/data')) {
-            // new pear2 package & pyrus installation layout
-            return dirname(__FILE__).'/../../data/pear.unl.edu/UNL_Templates/data';
-        }
-
         if ('@DATA_DIR@' != '@DATA_DIR'.'@') {
             // pear/pyrus installation
             return '@DATA_DIR@/UNL_Templates/data/';
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3x1/Local.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3x1/Local.php
new file mode 100644
index 0000000000000000000000000000000000000000..d120aff26038fc094efbd5764560d23b25feb8c4
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3x1/Local.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Template Definition for local.dwt
+ */
+require_once 'UNL/Templates.php';
+
+class UNL_Templates_Version3x1_Local extends UNL_Templates 
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__template = 'Local.tpl';                       // template name
+    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>";                       // string()  
+    public $head = "<!-- Place optional header elements here -->";                           // string()  
+    public $titlegraphic = "The Title of My Site";                   // string()  
+    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li class=\"selected\"><a href=\"#\" title=\"Site Title\">Site Title</a></li> <li>Page Title</li> </ul>";                    // string()  
+    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
+    public $pagetitle = "<h1>This is your page title. It\'s now an &lt;h1&gt;, baby!</h1>";                      // string()  
+    public $maincontentarea = "<h2>This is a blank page</h2> <p>Impress your audience with awesome content!</p>";                // string()  
+    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
+    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
+    public $optionalfooter = "";                 // string()  
+    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3x1_Local',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3x1/Unlaffiliate_local.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3x1/Unlaffiliate_local.php
new file mode 100644
index 0000000000000000000000000000000000000000..ddb0a55ff96084348875a403034abfbfc8b77582
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3x1/Unlaffiliate_local.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Template Definition for unlaffiliate_local.dwt
+ */
+require_once 'UNL/Templates.php';
+
+class UNL_Templates_Version3x1_Unlaffiliate_local extends UNL_Templates 
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__template = 'Unlaffiliate_local.tpl';          // template name
+    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>";                       // string()  
+    public $head = "<!-- Place optional header elements here --> <link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../sharedcode/affiliate.css\" /> <link href=\"../sharedcode/affiliate_imgs/favicon.ico\" rel=\"shortcut icon\" />";                           // string()  
+    public $titlegraphic = "Throught the Eyes of a Child Initiative<span>A Nebraska Supreme Court Initiative</span>";                   // string()  
+    public $breadcrumbs = "<ul> <li><a href=\"http://www.throughtheeyes.org/\" title=\"Through the Eyes of the Child Initiative\">Home</a></li> </ul>";                    // string()  
+    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
+    public $pagetitle = "<h1>This is your page title. It\'s now an &lt;h1&gt;, baby!</h1>";                      // string()  
+    public $maincontentarea = "<h2>This is a blank page</h2> <p>Impress your audience with awesome content!</p>";                // string()  
+    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
+    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
+    public $optionalfooter = "";                 // string()  
+    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3x1_Unlaffiliate_local',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}
diff --git a/sites/all/themes/unl_wdn/lib/tests/UNL_Templates/tests/UNL_TemplatesTest.php b/sites/all/themes/unl_wdn/lib/tests/pear.unl.edu/UNL_Templates/UNL_TemplatesTest.php
similarity index 100%
rename from sites/all/themes/unl_wdn/lib/tests/UNL_Templates/tests/UNL_TemplatesTest.php
rename to sites/all/themes/unl_wdn/lib/tests/pear.unl.edu/UNL_Templates/UNL_TemplatesTest.php