Index: trunk/config/configs/democal.options.xml
===================================================================
--- trunk/config/configs/democal.options.xml (revision 1675)
+++ trunk/config/configs/democal.options.xml (revision 1678)
@@ -166,5 +166,5 @@
 
           <!-- Default value for 24 hour mode -->
-          <hour24>false</hour24>
+          <hour24>true</hour24>
 
           <!-- Default value for minute increments -->
@@ -279,5 +279,5 @@
                           User CalDAV server UserCalDAV
              ================================================================== -->
-        <UserCalDAV classname="org.bedework.calfacade.configs.CalDAVConfig">
+        <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
           <!-- Comment out or delete for no real time server to server service
                Currently under development and may present a security risk in
@@ -287,10 +287,10 @@
           <!-- Comment out or delete for no freebusy url service -->
           <fburlServiceURI>/fbsvc</fburlServiceURI>
-        </UserCalDAV>
+        </Usercaldav>
 
         <!-- ==================================================================
                           Public (unauthenticated) CalDAV server PublicCalDAV
              ================================================================== -->
-        <PublicCalDAV classname="org.bedework.calfacade.configs.CalDAVConfig">
+        <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
           <!-- Comment out or delete for no real time server to server service
                Currently under development and may present a security risk in
@@ -300,5 +300,5 @@
           <!-- Comment out or delete for no freebusy url service -->
           <fburlServiceURI>/fbsvc</fburlServiceURI>
-        </PublicCalDAV>
+        </Pubcaldav>
 
         <!-- ==================================================================
Index: trunk/deployment/webconfig/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webconfig/webapp/resources/default/default/default.xsl (revision 1675)
+++ trunk/deployment/webconfig/webapp/resources/default/default/default.xsl (revision 1678)
@@ -7,12 +7,12 @@
   <!-- ==================================================================== -->
   <xsl:output method="xhtml" indent="yes" media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" standalone="yes" omit-xml-declaration="yes"/>
-  <xsl:variable name="appRoot" select="/bedeworkconfig/appRoot"/>
-  <xsl:variable name="urlPrefix" select="/bedeworkconfig/urlPrefix"/>
+  <xsl:variable name="appRoot" select="/bedework/appRoot"/>
+  <xsl:variable name="urlPrefix" select="/bedework/urlPrefix"/>
 
   <xsl:variable name="firstView">welcome</xsl:variable>
-  <xsl:variable name="lastView" select="/bedeworkconfig/propertyGroups/form/propertyGroup[position()=last()]/@name"/>
+  <xsl:variable name="lastView" select="/bedework/propertyGroups/form/propertyGroup[position()=last()]/@name"/>
   <xsl:variable name="currentView">
     <xsl:choose>
-      <xsl:when test="/bedeworkconfig/appvar/key='setView'"><xsl:value-of select="/bedeworkconfig/appvar[key='setView']/value"/></xsl:when>
+      <xsl:when test="/bedework/appvar/key='setView'"><xsl:value-of select="/bedework/appvar[key='setView']/value"/></xsl:when>
       <xsl:otherwise><xsl:value-of select="$firstView"/></xsl:otherwise>
     </xsl:choose>
@@ -21,5 +21,5 @@
     <xsl:choose>
       <xsl:when test="$currentView = $firstView">0</xsl:when>
-      <xsl:otherwise><xsl:for-each select="/bedeworkconfig/propertyGroups/form/propertyGroup[@name=$currentView]"><xsl:number/></xsl:for-each></xsl:otherwise>
+      <xsl:otherwise><xsl:for-each select="/bedework/propertyGroups/form/propertyGroup[@name=$currentView]"><xsl:number/></xsl:for-each></xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
@@ -27,5 +27,5 @@
     <xsl:choose>
       <xsl:when test="$currentView = $firstView">$currentView</xsl:when>
-      <xsl:otherwise><xsl:value-of select="/bedeworkconfig/propertyGroups/form/propertyGroup[position()=number($currentViewPos)-1]/@name"/></xsl:otherwise>
+      <xsl:otherwise><xsl:value-of select="/bedework/propertyGroups/form/propertyGroup[position()=number($currentViewPos)-1]/@name"/></xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
@@ -33,5 +33,5 @@
     <xsl:choose>
       <xsl:when test="$currentView = $lastView">$currentView</xsl:when>
-      <xsl:otherwise><xsl:value-of select="/bedeworkconfig/propertyGroups/form/propertyGroup[position()=number($currentViewPos)+1]/@name"/></xsl:otherwise>
+      <xsl:otherwise><xsl:value-of select="/bedework/propertyGroups/form/propertyGroup[position()=number($currentViewPos)+1]/@name"/></xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
@@ -78,17 +78,17 @@
             </div>
           </div>
-          <xsl:if test="/bedeworkconfig/message">
+          <xsl:if test="/bedework/message">
             <div id="messages">
-              <xsl:apply-templates select="/bedeworkconfig/message"/>
+              <xsl:apply-templates select="/bedework/message"/>
             </div>
           </xsl:if>
-          <xsl:if test="/bedeworkconfig/error">
+          <xsl:if test="/bedework/error">
             <div id="errors">
-              <xsl:apply-templates select="/bedeworkconfig/error"/>
+              <xsl:apply-templates select="/bedework/error"/>
             </div>
           </xsl:if>
           <div id="content">
             <xsl:choose>
-              <xsl:when test="/bedeworkconfig/page='main'">
+              <xsl:when test="/bedework/page='main'">
                 <form action="save.do" method="POST" enctype="multipart/form-data" name="propsForm">
                   <div id="buttonMenuTop">
@@ -118,5 +118,5 @@
                   <select name="setappvar" onchange="submit()">
                     <option value="setView(welcome)">welcome</option>
-                    <xsl:for-each select="/bedeworkconfig/propertyGroups/form/propertyGroup">
+                    <xsl:for-each select="/bedework/propertyGroups/form/propertyGroup">
                       <xsl:variable name="groupName" select="@name"/>
                       <xsl:choose>
@@ -137,5 +137,5 @@
                   advanced:
                   <xsl:choose>
-                    <xsl:when test="/bedeworkconfig/propertyGroups/form/propertyGroup[@name='modules']/property[@name='advanced']/fieldValue='true'">
+                    <xsl:when test="/bedework/propertyGroups/form/propertyGroup[@name='modules']/property[@name='advanced']/fieldValue='true'">
                       <input type="radio" name="modules.advanced" value="true" checked="checked" onclick="submit()"/> yes
                       <input type="radio" name="modules.advanced" value="false" onclick="submit()"/> no
@@ -175,5 +175,5 @@
                     </xsl:when>
                     <xsl:otherwise>
-                      <xsl:apply-templates select="/bedeworkconfig/propertyGroups/form/propertyGroup[@name=$currentView]"/>
+                      <xsl:apply-templates select="/bedework/propertyGroups/form/propertyGroup[@name=$currentView]"/>
                     </xsl:otherwise>
                   </xsl:choose>
@@ -185,5 +185,5 @@
                 </form>
               </xsl:when>
-              <xsl:when test="/bedeworkconfig/page='save'">
+              <xsl:when test="/bedework/page='save'">
                 <form action="save.do" method="POST" enctype="multipart/form-data" name="downloadForm">
                   <input type="hidden" name="contentType" value="text/text"/>
@@ -198,5 +198,5 @@
                 <h1>Your Configured Properties File:</h1>
                 <div id="propFile">
-                  <xsl:for-each select="/bedeworkconfig/propertyGroups/propertyGroup">
+                  <xsl:for-each select="/bedework/propertyGroups/propertyGroup">
                     #<br/>
                     # <xsl:value-of select="@name"/><br/>
@@ -415,10 +415,10 @@
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="id"/>
+        <p><xsl:value-of select="id"/>
         <xsl:if test="param"> =
           <xsl:for-each select="param">
             <xsl:value-of select="."/>
           </xsl:for-each>
-        </xsl:if>
+        </xsl:if></p>
       </xsl:otherwise>
     </xsl:choose>