diff --git a/lib/.configsnapshots/configsnapshot-2011-08-30 16-34-36.xml b/lib/.configsnapshots/configsnapshot-2011-08-30 16-34-36.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eab7b1fc697873e0ba14633a142314e6dc8f7de6
--- /dev/null
+++ b/lib/.configsnapshots/configsnapshot-2011-08-30 16-34-36.xml	
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<pearconfig version="1.0"><php_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/php</php_dir><ext_dir>/usr/local/lib/php/extensions/no-debug-non-zts-20090626/</ext_dir><cfg_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/cfg</cfg_dir><doc_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/docs</doc_dir><bin_dir>/usr/local/bin</bin_dir><data_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/data</data_dir><www_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/www</www_dir><test_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/tests</test_dir><src_dir>/Users/bbieber/Documents/workspace/UNL_Search/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/lib/.pear2registry b/lib/.pear2registry
index 3cb5fc1afd4ed5b78b75ab6583f9d7e7db690d19..7177c12ffef9f8d540ddd7c66967363b2f92e85a 100644
Binary files a/lib/.pear2registry and b/lib/.pear2registry differ
diff --git a/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.1.0-info.xml b/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.2.0-info.xml
similarity index 76%
rename from lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.1.0-info.xml
rename to lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.2.0-info.xml
index 9a43c1d502f58761de999eadbb5f083ef2885e25..11d674e47c3e8dcf6a308af3adf33d41a1b90d81 100644
--- a/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.1.0-info.xml
+++ b/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.2.0-info.xml
@@ -16,10 +16,10 @@
   <email>nhummel2@math.unl.edu</email>
   <active>yes</active>
  </lead>
- <date>2011-03-10</date>
- <time>14:06:30</time>
+ <date>2011-08-30</date>
+ <time>16:34:36</time>
  <version>
-  <release>1.1.0</release>
+  <release>1.2.0</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -28,218 +28,243 @@
  </stability>
  <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
  <notes>
-Feature Release!
-* Added the mobile template.
-* Fix support for version 2 templates.
-* Only set templatedependentspath if it has not been set.
+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:
+
+ * Meta lang fixes
+ * Remove IDM region from the secure template
+ * Mobile template now supports navigation and move to HTML5
  </notes>
  <contents>
   <dir name="/">
-   <file name="UNL/Templates/Version3/Shared_column_right.php" role="php" md5sum="f9b3c237b7a6b8500ef0d18f4e1c9595">
+   <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 name="UNL/Templates/Version3/Shared_column_left.php" role="php" md5sum="c8e40b9ff760f0d6da578f6f52e85ab2">
+   <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 name="UNL/Templates/Version3/Secure.php" role="php" md5sum="e6bcc877d8fe24beb229aec454710e5e">
+   <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 name="UNL/Templates/Version3/Popup.php" role="php" md5sum="1d63a45e6f7e86585182a09ff8e33962">
+   <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 name="UNL/Templates/Version3/Mobile.php" role="php" md5sum="da29bd0de202f2fe27d593c1a35c4d65">
+   <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 name="UNL/Templates/Version3/Liquid.php" role="php" md5sum="5ae65bf4c045a5b9b65b726b52d6cd26">
+   <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 name="UNL/Templates/Version3/Fixed.php" role="php" md5sum="041aae52a187c4986e495a8643b43ae4">
+   <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 name="UNL/Templates/Version3/Document.php" role="php" md5sum="01035abd6b488663747399e74d0065bc">
+   <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 name="UNL/Templates/Version3/Debug.php" role="php" md5sum="05eb7e3f0639e79aeb2e4f5061a356f1">
+   <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 name="UNL/Templates/Version3/Absolute.php" role="php" md5sum="315f0d6be4459208f7733e6e29f99c91">
+   <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 name="UNL/Templates/Version3.php" role="php" md5sum="95edca2102f2160a7b53162ca94a8b99">
+   <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 name="UNL/Templates/Version2/Unlstandardtemplate.php" role="php" md5sum="48a0fd1e66226418db0c7c5202343881">
+   <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 name="UNL/Templates/Version2/Unlframework.php" role="php" md5sum="e902fc42cdcb7633fbe07f4d509a1b97">
+   <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 name="UNL/Templates/Version2/Unlaffiliate.php" role="php" md5sum="bdac0dc69918a491efcee2450d99738f">
+   <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 name="UNL/Templates/Version2/Secure.php" role="php" md5sum="f43c4b5320cf2def6d90c71f3e22c1fb">
+   <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 name="UNL/Templates/Version2/Popup.php" role="php" md5sum="0a1b634408248289e89649a49bd7759c">
+   <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 name="UNL/Templates/Version2/Liquid.php" role="php" md5sum="55c715aa91f18226f5be4c3f427b2dea">
+   <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 name="UNL/Templates/Version2/Fixed.php" role="php" md5sum="3fbccc1b6e7a0287577972b4c25a0d19">
+   <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 name="UNL/Templates/Version2/Document.php" role="php" md5sum="ef2068426bb8f73ac706b18a472df967">
+   <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 name="UNL/Templates/Version2.php" role="php" md5sum="4c1b93f62221e5229be657196f07f048">
+   <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 name="UNL/Templates/Version.php" role="php" md5sum="c7df0501ec102431d7be6a6cfd133b5b">
+   <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 name="UNL/Templates/Scanner.php" role="php" md5sum="82740c1fadfd1160bb9c67006947ab3b">
+   <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 name="UNL/Templates/CachingService/UNLCacheLite.php" role="php" md5sum="4fa04418d0aa08834b4795caeae5b8c8">
+   <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 name="UNL/Templates/CachingService/Null.php" role="php" md5sum="47991f0e5cffed6d138725a3294f4e6a">
+   <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 name="UNL/Templates/CachingService/CacheLite.php" role="php" md5sum="5b09b184e7d59a2520e99c0b5c66428a">
+   <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 name="UNL/Templates/CachingService.php" role="php" md5sum="07884c3a9bf75657e54782423a088eb4">
+   <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 name="UNL/Templates.php" role="php" md5sum="1b3de8279d951ccb05f8ad61903f6b03">
+   <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 name="tests/UNL_TemplatesTest.php" role="test" md5sum="12aa5989d1255dccc299a3dcdd6c6ba8">
+   <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 name="docs/examples/scanner.php" role="doc" md5sum="9a7ce82868ddb7afc2b291b0b0ec6bd1">
+   <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 name="docs/examples/example1.php" role="doc" md5sum="3a3851e70662c3e0bb3ffbc7e5765325">
+   <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 name="docs/examples/customization/customization_example.php" role="doc" md5sum="e9769bdf0cf9ec36430b3f70ec687037">
+   <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 name="docs/examples/customization/customization_example.html" role="doc" md5sum="26c8d867af8ffd4d8d60e348573f9c3d">
+   <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 name="docs/examples/customization/CustomClass.php" role="doc" md5sum="7e35aab85f95ad61fe43e50fbf1719a2">
+   <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 name="docs/examples/convert.php" role="doc" md5sum="a7114a3868d0ba54d4ff76b370ea3201">
+   <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 name="data/tpl_cache/Version3/Shared_column_right.tpl" role="data" md5sum="742720269e3488e0fa34f0ad53b2cb00">
+   <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 name="data/tpl_cache/Version3/Shared_column_left.tpl" role="data" md5sum="d33744a26d2f229c5b9172557733f35f">
+   <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 name="data/tpl_cache/Version3/Secure.tpl" role="data" md5sum="3d0a70139d0d736d7b5a1c9db203407f">
+   <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 name="data/tpl_cache/Version3/Popup.tpl" role="data" md5sum="806405f82ed8f12e584e44b6f8d42dc8">
+   <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 name="data/tpl_cache/Version3/Mobile.tpl" role="data" md5sum="c239f06b34ca3b6fc714aba416ef2475">
+   <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 name="data/tpl_cache/Version3/Liquid.tpl" role="data" md5sum="962756c965f0f2881e88c83a72fe0545">
+   <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 name="data/tpl_cache/Version3/Fixed.tpl" role="data" md5sum="d264bf1f5ae2655836aa69a8bcfbd4e6">
+   <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 name="data/tpl_cache/Version3/Document.tpl" role="data" md5sum="636db467eaccd481f1697e85b4f1d814">
+   <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 name="data/tpl_cache/Version3/Debug.tpl" role="data" md5sum="deae0c7ac5529cdc5713e11febd022f0">
+   <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 name="data/tpl_cache/Version3/Absolute.tpl" role="data" md5sum="8d735ef7de849049870801a47d7098e2">
+   <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 name="data/tpl_cache/Version2/Unlstandardtemplate.tpl" role="data" md5sum="2082f29e6219b9fdad0faffb2bf9a427">
+   <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 name="data/tpl_cache/Version2/Unlframework.tpl" role="data" md5sum="465cb4e7eef89560faf0c63065d8a9d3">
+   <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 name="data/tpl_cache/Version2/Unlaffiliate.tpl" role="data" md5sum="9f4650a475623a3cf293998c0e5b3233">
+   <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 name="data/tpl_cache/Version2/Secure.tpl" role="data" md5sum="962fecd9908d504e4749f7eb79dc4736">
+   <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 name="data/tpl_cache/Version2/Popup.tpl" role="data" md5sum="a70442037d218c0dc948638bca8e5e08">
+   <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 name="data/tpl_cache/Version2/Liquid.tpl" role="data" md5sum="1a936fdcd4d17383490bd5aef1219ce8">
+   <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 name="data/tpl_cache/Version2/Fixed.tpl" role="data" md5sum="df5ce334e93b844794699f3cc62d20b9">
+   <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 name="data/tpl_cache/Version2/Document.tpl" role="data" md5sum="61cc4ae92fac84a7d38131769c2298ba">
+   <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>
@@ -801,6 +826,33 @@ Feature Release!
 * Only set templatedependentspath if it has not been set.
    </notes>
    </release>
+   <release>
+    <version>
+     <release>1.2.0</release>
+     <api>1.0.0</api>
+    </version>
+    <stability>
+     <release>stable</release>
+     <api>stable</api>
+    </stability>
+    <date>2011-08-17</date>
+    <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:
+
+ * Meta lang fixes
+ * Remove IDM region from the secure template
+ * Mobile template now supports navigation and move to HTML5
+   </notes>
+   </release>
   </changelog>
  </phprelease>
 </package>
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl
index 3b2d538889d8a5e04b2e91a2201a6dabc2425539..cd8ac123bc8a06cba0c40c92fde17b1862a01911 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/absolute.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/absolute.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!--
     Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: absolute.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+    $Id: absolute.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
 -->
 <link rel="stylesheet" type="text/css" media="screen" href="http://www.unl.edu/wdn/templates_3.0/css/all.css" />
 <link rel="stylesheet" type="text/css" media="print" href="http://www.unl.edu/wdn/templates_3.0/css/print.css" />
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl
index 29b65bd1bf5520f1e397f169f3209fdf91b491ee..d7d4bf586ef2537891c31f55e51740beb45ea296 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!--
     Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: debug.dwt 728 2009-09-08 16:53:28Z bbieber2 $
+    $Id: debug.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
 -->
 <link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/debug.css" />
 <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl
index 7c0daa28c45aceeca0c65b7129ad8d04735ad5ad..ddddea7f83c591b0334c3b26350ec8e29a7a2734 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/document.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/document.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!--
     Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: document.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+    $Id: document.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
 -->
 <link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
 <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl
index bc1710dd8d9f5d75bd4ae1acdea1536809660946..6b2aff63fe372c0862e4767d20145f4b432447ba 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!--
     Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: fixed.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+    $Id: fixed.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
 -->
 <link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
 <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed_html5.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed_html5.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..fd316a6e4f1f77bd3085fa440794820e381766d7
--- /dev/null
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed_html5.tpl
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="en"><!-- InstanceBegin template="/Templates/fixed_html5.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<!--#include virtual="/wdn/templates_3.0/includes/metanfavico_html5.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: fixed_html5.dwt 1918 2011-07-07 15:59:13Z bbieber2 $
+-->
+<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
+<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
+<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
+<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics_html5.html" -->
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>UNL | Department | New Page</title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="head" -->
+<!-- Place optional header elements here -->
+<!-- InstanceEndEditable -->
+</head>
+<body class="html5 fixed">
+<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
+<div id="wdn_wrapper">
+    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
+        <h1>University of Nebraska&ndash;Lincoln</h1>
+        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
+    </div>
+    <div id="wdn_navigation_bar">
+        <div id="breadcrumbs">
+            <!-- WDN: see glossary item 'breadcrumbs' -->
+            
+<!-- InstanceBeginEditable name="breadcrumbs" -->
+            <ul>
+                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
+                <li>Department</li>
+            </ul>
+            
+<!-- InstanceEndEditable -->
+</div>
+        <div id="wdn_navigation_wrapper">
+            <div id="navigation">
+<!-- InstanceBeginEditable name="navlinks" -->
+                <!--#include virtual="../sharedcode/navigation.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+        </div>
+    </div>
+    <div id="wdn_content_wrapper">
+        <div id="titlegraphic">
+<!-- InstanceBeginEditable name="titlegraphic" -->
+            <h1>Department</h1>
+            
+<!-- InstanceEndEditable -->
+</div>
+        <div id="pagetitle">
+<!-- InstanceBeginEditable name="pagetitle" -->
+ 
+<!-- InstanceEndEditable -->
+</div>
+        <div id="maincontent">
+            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
+            
+<!-- InstanceBeginEditable name="maincontentarea" -->
+            <p>Place your content here.<br />
+                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
+                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
+            
+<!-- InstanceEndEditable -->
+            <div class="clear"></div>
+            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
+            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
+        </div>
+        <div id="footer">
+            <div id="footer_floater"></div>
+            <div class="footer_col">
+                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
+            </div>
+            <div class="footer_col">
+<!-- InstanceBeginEditable name="leftcollinks" -->
+                <!--#include virtual="../sharedcode/relatedLinks.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col">
+<!-- InstanceBeginEditable name="contactinfo" -->
+                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col">
+                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
+            </div>
+            
+<!-- InstanceBeginEditable name="optionalfooter" -->
+ 
+<!-- InstanceEndEditable -->
+            <div id="wdn_copyright">
+<!-- InstanceBeginEditable name="footercontent" -->
+                <!--#include virtual="../sharedcode/footer.html" -->
+                
+<!-- InstanceEndEditable -->
+                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
+                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
+        </div>
+    </div>
+    <div id="wdn_wrapper_footer"> </div>
+</div>
+</body>
+</html>
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl
index 0b127201ab663f6689d4a22f2518b9dc51e8cd78..903f7678d86317bb2718459896d20f9552b0c429 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/liquid.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/liquid.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!--
     Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: liquid.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+    $Id: liquid.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
 -->
 <link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
 <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl
index e50a5df430b0009f679f04acf6b5fa57e6c693d9..38c61a852be894ab7da21d4a66884d4798cce439 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl
@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<!-- InstanceBegin template="/Templates/mobile.dwt" codeOutsideHTMLIsLocked="false" -->
+<!DOCTYPE html>
+<html lang="en"><!-- InstanceBegin template="/Templates/mobile.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
+<!--#include virtual="/wdn/templates_3.0/includes/metanfavico_html5.html" -->
 <!--
     Membership and regular participation in the UNL Web Developer Network
     is required to use the UNL templates. Visit the WDN site at 
@@ -14,54 +14,106 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: mobile.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+    $Id: mobile.dwt 756 2009-09-15 02:31:02Z bbieber2 $
 -->
+<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width" />
 <link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/mobile.css" />
 <script type="text/javascript" src="/wdn/templates_3.0/scripts/mobile.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
+<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics_html5.html" -->
 <!-- InstanceBeginEditable name="doctitle" -->
 <title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" -->
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="head" -->
 <!-- Place optional header elements here -->
 <!-- InstanceEndEditable -->
 </head>
-<body class="mobile">
+<body class="html5 mobile">
 <p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
 <div id="wdn_wrapper">
     <div id="header"> <a href="http://m.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
         <h1>University of Nebraska&ndash;Lincoln</h1>
+        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools_html5.html" -->
+    </div>
+    <div id="wdn_navigation_bar">
+        <div id="breadcrumbs">
+            <!-- WDN: see glossary item 'breadcrumbs' -->
+            
+<!-- InstanceBeginEditable name="breadcrumbs" -->
+            <ul>
+                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
+                <li>Department</li>
+            </ul>
+            
+<!-- InstanceEndEditable -->
+</div>
+        <div id="wdn_navigation_wrapper">
+            <div id="navigation">
+<!-- InstanceBeginEditable name="navlinks" -->
+                <!--#include virtual="../sharedcode/navigation.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+        </div>
     </div>
     <div id="wdn_content_wrapper">
-        <div id="titlegraphic"><!-- InstanceBeginEditable name="titlegraphic" -->
+        <div id="titlegraphic">
+<!-- InstanceBeginEditable name="titlegraphic" -->
             <h1>Department</h1>
-            <!-- InstanceEndEditable --></div>
-        <div id="pagetitle"><!-- InstanceBeginEditable name="pagetitle" --> <!-- InstanceEndEditable --></div>
+            
+<!-- InstanceEndEditable -->
+</div>
+        <div id="pagetitle">
+<!-- InstanceBeginEditable name="pagetitle" -->
+ 
+<!-- InstanceEndEditable -->
+</div>
         <div id="maincontent">
             <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            <!-- InstanceBeginEditable name="maincontentarea" -->
+            
+<!-- InstanceBeginEditable name="maincontentarea" -->
             <p>Place your content here.<br />
                 Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
                 <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            <!-- InstanceEndEditable -->
+            
+<!-- InstanceEndEditable -->
             <div class="clear"></div>
             <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
             <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
         </div>
         <div id="footer">
             <div id="footer_floater"></div>
-            <div id="wdn_copyright"><!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="sharedcode/footer.html" -->
-                <!-- InstanceEndEditable -->
-                <ul>
-                    <li><a href="http://validator.unl.edu/check/referer">W3C</a></li>
-                    <li><a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a></li>
-                </ul>
+            <div class="footer_col">
+                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
+            </div>
+            <div class="footer_col">
+<!-- InstanceBeginEditable name="leftcollinks" -->
+                <!--#include virtual="../sharedcode/relatedLinks.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col">
+<!-- InstanceBeginEditable name="contactinfo" -->
+                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col">
+                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
+            </div>
+            
+<!-- InstanceBeginEditable name="optionalfooter" -->
+ 
+<!-- InstanceEndEditable -->
+            <div id="wdn_copyright">
+<!-- InstanceBeginEditable name="footercontent" -->
+                <!--#include virtual="../sharedcode/footer.html" -->
+                
+<!-- InstanceEndEditable -->
                 <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                <a href="http://m.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
+                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
         </div>
     </div>
     <div id="wdn_wrapper_footer"> </div>
 </div>
 </body>
-<!-- InstanceEnd --></html>
+</html>
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl
index 6c7b137061015af561977e990fd93b8ae22b2b96..c1ce640ae2ef55c47ea29a7d31102da1928ced8b 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/popup.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/popup.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!--
     Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: popup.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+    $Id: popup.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
 -->
 <link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
 <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
@@ -65,12 +65,8 @@
                 <!--#include virtual="../sharedcode/footer.html" -->
                 
 <!-- InstanceEndEditable -->
-                <ul>
-                    <li><a href="http://validator.unl.edu/check/referer">W3C</a></li>
-                    <li><a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a></li>
-                </ul>
                 <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
+                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
         </div>
     </div>
     <div id="wdn_wrapper_footer"> </div>
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl
index e16e1afdafd32569d0e7f921fced7527ff8b1446..7d30b122432d272988eddc5e399df842bcb157fa 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/secure.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/secure.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!--
     Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: secure.dwt 562 2009-07-28 19:58:23Z bbieber2 $
+    $Id: secure.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
 -->
 <link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/debug.css" />
 <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
@@ -32,11 +32,6 @@
 <div id="wdn_wrapper">
     <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
         <h1>University of Nebraska&ndash;Lincoln</h1>
-        <div id="wdn_identity_management"> 
-<!-- InstanceBeginEditable name="identitymanagement" -->
-<a href="https://login.unl.edu/cas/logout">Logout</a>
-<!-- InstanceEndEditable -->
- </div>
     </div>
     <div id="wdn_navigation_bar">
         <div id="breadcrumbs">
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl
index 378c147c60c86a5629f18c02a602d15938bef14e..c87ba9f1bac6ba746bc0506ed0402d5557838865 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/shared_column_left.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/shared_column_left.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!--
     Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: shared_column_left.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+    $Id: shared_column_left.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
 -->
 <link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
 <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl
index 9e07cc6196302edf1f1a65d809f05af9d70ac241..ed15b31f80eea62c3e70d0ba91147340221b4e72 100644
--- a/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/shared_column_right.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/shared_column_right.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!--
     Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
     create a derivative work.
     This message may not be removed from any pages based on the UNL site template.
     
-    $Id: shared_column_right.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+    $Id: shared_column_right.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
 -->
 <link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
 <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/lib/data/UNL_Templates/data/tpl_cache/Version3/Unlaffiliate.tpl b/lib/data/UNL_Templates/data/tpl_cache/Version3/Unlaffiliate.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..dd91819adbceb4f1ce75d6980cd858a9d21d982e
--- /dev/null
+++ b/lib/data/UNL_Templates/data/tpl_cache/Version3/Unlaffiliate.tpl
@@ -0,0 +1,127 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<!--
+    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.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
+-->
+<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
+<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
+<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
+<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
+<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
+<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>UNL | Department | New Page</title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="head" -->
+<!-- Place optional header elements here -->
+<!-- InstanceEndEditable -->
+</head>
+<body class="fixed">
+<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
+<div id="wdn_wrapper">
+    <div id="header"> 	
+		
+<!-- InstanceBeginEditable name="sitebranding" -->
+		<div id="affiliate_note"><a href="http://www.unl.edu" title="University of Nebraska&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;Lincoln</a></div>
+		<a href="/" title="Through the Eyes of the Child Initiative"><img src="../sharedcode/affiliate_imgs/affiliate_logo.png" alt="Through the Eyes of the Child Initiative" id="logo" /></a>
+    	<h1>Through the Eyes of the Child Initiative</h1>
+		<div id='tag_line'>A Nebraska Supreme Court Initiative</div>
+		
+<!-- InstanceEndEditable -->
+		<!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
+    </div>
+    <div id="wdn_navigation_bar">
+        <div id="breadcrumbs">
+            <!-- WDN: see glossary item 'breadcrumbs' -->
+            
+<!-- InstanceBeginEditable name="breadcrumbs" -->
+            <ul>
+                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
+                <li>Department</li>
+            </ul>
+            
+<!-- InstanceEndEditable -->
+</div>
+        <div id="wdn_navigation_wrapper">
+            <div id="navigation">
+<!-- InstanceBeginEditable name="navlinks" -->
+                <!--#include virtual="../sharedcode/navigation.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+        </div>
+    </div>
+    <div id="wdn_content_wrapper">
+        <div id="titlegraphic">
+<!-- InstanceBeginEditable name="titlegraphic" -->
+            <h1>Department</h1>
+            
+<!-- InstanceEndEditable -->
+</div>
+        <div id="pagetitle">
+<!-- InstanceBeginEditable name="pagetitle" -->
+ 
+<!-- InstanceEndEditable -->
+</div>
+        <div id="maincontent">
+            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
+            
+<!-- InstanceBeginEditable name="maincontentarea" -->
+            <p>Place your content here.<br />
+                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
+                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
+            
+<!-- InstanceEndEditable -->
+            <div class="clear"></div>
+            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
+            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
+        </div>
+        <div id="footer">
+            <div id="footer_floater"></div>
+            <div class="footer_col">
+                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
+            </div>
+            <div class="footer_col">
+<!-- InstanceBeginEditable name="leftcollinks" -->
+                <!--#include virtual="../sharedcode/relatedLinks.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col">
+<!-- InstanceBeginEditable name="contactinfo" -->
+                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
+                
+<!-- InstanceEndEditable -->
+</div>
+            <div class="footer_col">
+                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
+            </div>
+            
+<!-- InstanceBeginEditable name="optionalfooter" -->
+ 
+<!-- InstanceEndEditable -->
+            <div id="wdn_copyright">
+<!-- InstanceBeginEditable name="footercontent" -->
+                <!--#include virtual="../sharedcode/footer.html" -->
+                
+<!-- InstanceEndEditable -->
+                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
+                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
+        </div>
+    </div>
+    <div id="wdn_wrapper_footer"> </div>
+</div>
+</body>
+</html>
diff --git a/lib/docs/UNL_Templates/docs/examples/example1.php b/lib/docs/UNL_Templates/docs/examples/example1.php
index cc5245dc39bc33cdbe4095446e1edd03b55eae32..c0bf90b2ba65b2a0755c1e9339c2555e8b6e161e 100644
--- a/lib/docs/UNL_Templates/docs/examples/example1.php
+++ b/lib/docs/UNL_Templates/docs/examples/example1.php
@@ -7,7 +7,7 @@
  */
 ini_set('display_errors', true);
 error_reporting(E_ALL);
-set_include_path(realpath(dirname(__FILE__).'/../../').PATH_SEPARATOR.realpath(dirname(__FILE__).'/../../lib/php'));
+set_include_path(realpath(dirname(__FILE__).'/../../').PATH_SEPARATOR.realpath(dirname(__FILE__).'/../../../../php'));
 require_once 'UNL/Templates.php';
 UNL_Templates::$options['version'] = 3;
 
diff --git a/lib/php/UNL/Templates.php b/lib/php/UNL/Templates.php
index add971fd8d4c3d663f68ebeda572e0da11521ff8..2117bd9cbcca33be572bc0ef1967ae5d279b3d86 100644
--- a/lib/php/UNL/Templates.php
+++ b/lib/php/UNL/Templates.php
@@ -128,7 +128,7 @@ class UNL_Templates extends UNL_DWT
     function getCache()
     {
         $cache = self::getCachingService();
-        $cache_key = self::$options['version'].$this->__template;
+        $cache_key = self::$options['version'].self::$options['templatedependentspath'].$this->__template;
         // Test if there is a valid cache for this template
         if ($data = $cache->get($cache_key)) {
             // Content is in $data
@@ -350,17 +350,27 @@ class UNL_Templates extends UNL_DWT
 
     static public function getDataDir()
     {
-        if ('/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/data' != '@DATA_DIR'.'@') {
-            // pear/pyrus installation
-            return '/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/data/UNL_Templates/data/';
+
+        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/tpl_cache')) {
             // svn checkout
             return realpath(dirname(__FILE__).'/../data');
         }
 
-        // new pear2 package & pyrus installation layout
-        return dirname(__FILE__).'/../../data/UNL_Templates/pear.unl.edu/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 ('/Users/bbieber/Documents/workspace/UNL_Search/lib/data' != '@DATA_DIR'.'@') {
+            // pear/pyrus installation
+            return '/Users/bbieber/Documents/workspace/UNL_Search/lib/data/UNL_Templates/data/';
+        }
+
+        throw new Exception('Cannot determine data directory!');
     }
 }
diff --git a/lib/php/UNL/Templates/Version3.php b/lib/php/UNL/Templates/Version3.php
index 8dd1e100720f5943a17e6e5f7fa2e8483318cdb4..e6a710764fce34a8a28f566581bf85c5e0cf5d0d 100644
--- a/lib/php/UNL/Templates/Version3.php
+++ b/lib/php/UNL/Templates/Version3.php
@@ -59,7 +59,7 @@ class UNL_Templates_Version3 implements UNL_Templates_Version
         UNL_Templates::debug('Now making template include replacements.',
                      'makeIncludeReplacements', 3);
         $includes = array();
-        preg_match_all('<!--#include virtual="(/wdn/templates_3.0/[A-Za-z0-9\.\/]+)" -->',
+        preg_match_all('<!--#include virtual="(/wdn/templates_3.0/[A-Za-z0-9\.\/_]+)" -->',
                         $html, $includes);
         UNL_Templates::debug(print_r($includes, true), 'makeIncludeReplacements', 3);
         foreach ($includes[1] as $include) {
diff --git a/lib/php/UNL/Templates/Version3/Fixed_html5.php b/lib/php/UNL/Templates/Version3/Fixed_html5.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e359fa6f5688543dd632245b82de3939860c462
--- /dev/null
+++ b/lib/php/UNL/Templates/Version3/Fixed_html5.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Template Definition for fixed_html5.dwt
+ */
+require_once 'UNL/Templates.php';
+
+class UNL_Templates_Version3_Fixed_html5 extends UNL_Templates 
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__template = 'Fixed_html5.tpl';                 // template name
+    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
+    public $head = "<!-- Place optional header elements here -->";                           // string()  
+    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
+    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
+    public $titlegraphic = "<h1>Department</h1>";                   // string()  
+    public $pagetitle = "";                      // string()  
+    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </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_Version3_Fixed_html5',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}
diff --git a/lib/php/UNL/Templates/Version3/Mobile.php b/lib/php/UNL/Templates/Version3/Mobile.php
index cc17d8acf1a8ecde63b76ad87df53d5e06027903..ce3a0f1e72978c1d12dd099f138ec5b9d7c59009 100644
--- a/lib/php/UNL/Templates/Version3/Mobile.php
+++ b/lib/php/UNL/Templates/Version3/Mobile.php
@@ -17,12 +17,17 @@ class UNL_Templates_Version3_Mobile extends UNL_Templates
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
-    public $__template = 'Mobile.tpl';                       // template name
+    public $__template = 'Mobile.tpl';                      // template name
     public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
     public $head = "<!-- Place optional header elements here -->";                           // string()  
+    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
+    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
     public $titlegraphic = "<h1>Department</h1>";                   // string()  
     public $pagetitle = "";                      // string()  
     public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </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 */
diff --git a/lib/php/UNL/Templates/Version3/Secure.php b/lib/php/UNL/Templates/Version3/Secure.php
index 21a45250fd5f1a83c58f58e40b33278e7f8abaa8..03d4f90baa59eca9fe9ee265ff2b2e82e8f79f03 100644
--- a/lib/php/UNL/Templates/Version3/Secure.php
+++ b/lib/php/UNL/Templates/Version3/Secure.php
@@ -32,7 +32,6 @@ class UNL_Templates_Version3_Secure extends UNL_Templates
     public $__template = 'Secure.tpl';                      // template name
     public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
     public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $identitymanagement = "<a href=\"https://login.unl.edu/cas/logout\">Logout</a>";             // string()  
     public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
     public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
     public $titlegraphic = "<h1>Department</h1>";                   // string()  
diff --git a/lib/php/UNL/Templates/Version3/Unlaffiliate.php b/lib/php/UNL/Templates/Version3/Unlaffiliate.php
new file mode 100644
index 0000000000000000000000000000000000000000..c36dfc3516eedf64131da4c6da0aca5f9d97a610
--- /dev/null
+++ b/lib/php/UNL/Templates/Version3/Unlaffiliate.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Template Definition for unlaffiliate.dwt
+ */
+require_once 'UNL/Templates.php';
+
+class UNL_Templates_Version3_Unlaffiliate extends UNL_Templates 
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__template = 'Unlaffiliate.tpl';                // template name
+    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
+    public $head = "<!-- Place optional header elements here -->";                           // string()  
+    public $sitebranding = "<div id=\"affiliate_note\"><a href=\"http://www.unl.edu\" title=\"University of Nebraska&ndash;Lincoln\">An affiliate of the University of Nebraska&ndash;Lincoln</a></div> <a href=\"/\" title=\"Through the Eyes of the Child Initiative\"><img src=\"../sharedcode/affiliate_imgs/affiliate_logo.png\" alt=\"Through the Eyes of the Child Initiative\" id=\"logo\" /></a> <h1>Through the Eyes of the Child Initiative</h1> <div id=\'tag_line\'>A Nebraska Supreme Court Initiative</div>";                   // string()  
+    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
+    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
+    public $titlegraphic = "<h1>Department</h1>";                   // string()  
+    public $pagetitle = "";                      // string()  
+    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </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_Version3_Unlaffiliate',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}