diff --git a/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql
index d0a316217..f70e6bbfb 100644
--- a/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql
+++ b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql
@@ -13,7 +13,7 @@
 -- License along with this library; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 --
--- $Id: upd_table_ct_addresses.sql pboy $
+-- $Id: upd_table_cms_related_links.sql  $
 
 UPDATE cms_related_links
       SET link_list_name = 'NONE'
diff --git a/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/default/6.6.0-6.6.1/upd_table_ct_articles.sql b/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/default/6.6.0-6.6.1/upd_table_ct_articles.sql
index e6e408637..d6a2048b5 100644
--- a/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/default/6.6.0-6.6.1/upd_table_ct_articles.sql
+++ b/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/default/6.6.0-6.6.1/upd_table_ct_articles.sql
@@ -15,6 +15,10 @@
 --
 -- $Id: upd_table_ct_articles.sql pboy $
 
+-- This is NOT a regular update script. It re-creates a constraints
+-- which once got lost during one update, but never again until now.
+-- Use it only as needed
+--
 -- recreate constraint  on cms_articles which had to be deleted during
 -- update of cms_articles
 ALTER TABLE ct_articles
diff --git a/ccm-cms-types-article/src/ccm-cms-types-article.upgrade b/ccm-cms-types-article/src/ccm-cms-types-article.upgrade
index 6d033c355..01f071ab6 100644
--- a/ccm-cms-types-article/src/ccm-cms-types-article.upgrade
+++ b/ccm-cms-types-article/src/ccm-cms-types-article.upgrade
@@ -1,6 +1,9 @@
 <upgrade>
 
   <version from="6.6.0" to="6.6.1">
+    <!-- This is NOT a regular update script. It re-creates a constraints
+         which once got lost during one update, but never again until now.
+         Use it only as needed                                               -->
     <script sql="ccm-cms-types-article/upgrade/::database::-6.6.0-6.6.1.sql"/>
 <!--    (just for easy reference in copy'nd'past programming  :-)  )
     <script class="com.arsdigita.cms.upgrade.CreateGenericContentTypes"/>
diff --git a/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/default/6.6.0-6.6.1/upd_table_ct_events.sql b/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/default/6.6.0-6.6.1/upd_table_ct_events.sql
index 45eb9a45e..7d858af07 100644
--- a/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/default/6.6.0-6.6.1/upd_table_ct_events.sql
+++ b/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/default/6.6.0-6.6.1/upd_table_ct_events.sql
@@ -15,7 +15,11 @@
 --
 -- $Id: upd_table_ct_events.sql pboy $
 
--- recreate constraint  on cms_articles which had to be deleted during
+-- This is NOT a regular update script. It re-creates a constraints
+-- which once got lost during one update, but never again until now.
+-- Use it only as needed
+--
+-- recreate constraint  on ct_events which had to be deleted during one
 -- update of cms_articles
 ALTER TABLE ct_events
       ADD CONSTRAINT ct_events_item_id_f_v7kjv FOREIGN KEY (item_id)
diff --git a/ccm-cms-types-event/src/ccm-cms-types-event.upgrade b/ccm-cms-types-event/src/ccm-cms-types-event.upgrade
index 35eca0f0d..ea25d04ad 100644
--- a/ccm-cms-types-event/src/ccm-cms-types-event.upgrade
+++ b/ccm-cms-types-event/src/ccm-cms-types-event.upgrade
@@ -1,6 +1,9 @@
 <upgrade>
 
   <version from="6.6.0" to="6.6.1">
+    <!-- This is NOT a regular update script. It re-creates a constraints
+         which once got lost during one update, but never again until now.
+         Use it only as needed                                               -->
     <script sql="ccm-cms-types-event/upgrade/::database::-6.6.0-6.6.1.sql"/>
 <!--    (just for easy reference in copy'nd'past programming  :-)  )
     <script class="com.arsdigita.cms.upgrade.CreateGenericContentTypes"/>
diff --git a/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/default/6.6.0-6.6.1/upd_constraints.sql b/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/default/6.6.0-6.6.1/upd_constraints.sql
index be118f656..f4374e773 100644
--- a/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/default/6.6.0-6.6.1/upd_constraints.sql
+++ b/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/default/6.6.0-6.6.1/upd_constraints.sql
@@ -15,6 +15,10 @@
 --
 -- $Id: upd_constraints.sql pboy $
 
+-- This is NOT a regular update script. It re-creates a constraints
+-- which once got lost during one update, but never again until now.
+-- Use it only as needed
+--
 -- recreate constraint  on ct_news which had to be deleted during
 -- update of cms_articles
 ALTER TABLE ct_news
diff --git a/ccm-cms-types-newsitem/src/ccm-cms-types-newsitem.upgrade b/ccm-cms-types-newsitem/src/ccm-cms-types-newsitem.upgrade
index 1eede4cf7..1f7181ec4 100644
--- a/ccm-cms-types-newsitem/src/ccm-cms-types-newsitem.upgrade
+++ b/ccm-cms-types-newsitem/src/ccm-cms-types-newsitem.upgrade
@@ -1,6 +1,9 @@
 <upgrade>
 
   <version from="6.6.0" to="6.6.1">
+    <!-- This is NOT a regular update script. It re-creates a constraints
+         which once got lost during one update, but never again until now.
+         Use it only as needed                                               -->
     <script sql="ccm-cms-types-newsitem/upgrade/::database::-6.6.0-6.6.1.sql"/>
 <!--    (just for easy reference in copy'nd'past programming  :-)  )
     <script class="com.arsdigita.cms.upgrade.CreateGenericContentTypes"/>
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql
index 8f94e1724..f72b752ca 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql
@@ -18,8 +18,8 @@
 
 PROMPT Red Hat WAF 6.5.4 -> 6.5.5 Upgrade Script (Oracle)
 
-@@ oracle-se/kernel/package-dnm_context.sql
+@@ ../oracle-se/kernel/package-dnm_context.sql
 @@ oracle-se/6.5.4-6.5.5/drop-triggers.sql
-@@ oracle-se/kernel/triggers-dnm_context.sql
+@@ ../oracle-se/kernel/triggers-dnm_context.sql
 @@ default/6.5.4-6.5.5/delete-object_1_granted_context-entries.sql
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql
index 951e12940..90be901cc 100644
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql
@@ -20,3 +20,4 @@
 PROMPT Red Hat Enterprise CORE 6.6.0 -> 6.6.1 Upgrade Script (Oracle)
 
 @@ default/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
+@@ default/6.6.0-6.6.1/recreate_users_index.sql
\ No newline at end of file
diff --git a/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java b/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java
index ff0f8ede2..f14f7c49c 100755
--- a/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java
+++ b/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java
@@ -77,10 +77,13 @@ public class PooledConnectionSource implements ConnectionSource {
     }
 
     /**
-     *  Tries to acquire preferred JDBC connection, if
+     * Tries to acquire preferred JDBC connection, if
      * it's available.  If not, grab the least recently used
      * connection.
+     * @param pref
+     * @return 
      */
+    @Override
     public synchronized Connection acquire(Connection pref) {
         if (pref == null) {
             return acquire();
@@ -97,6 +100,7 @@ public class PooledConnectionSource implements ConnectionSource {
         }
     }
 
+    @Override
     public synchronized Connection acquire() {
         while (true) {
             if (!m_available.isEmpty()) {
@@ -107,10 +111,12 @@ public class PooledConnectionSource implements ConnectionSource {
                  * in "idle in transaction" state. Such connections seam to 
                  * cause problems (memory etc.) with PostgreSQL.
                  */
-                try {
-                    conn.setAutoCommit(false);
-                } catch (SQLException ex) {
-                    s_log.warn("Failed to set autocommit to false");
+                if (DbHelper.getDatabase(conn) == DbHelper.DB_POSTGRES) {
+                    try {
+                        conn.setAutoCommit(false);
+                    } catch (SQLException ex) {
+                        s_log.warn("Failed to set autocommit to false");
+                    }
                 }
                 /**
                  * jensp end
@@ -126,10 +132,12 @@ public class PooledConnectionSource implements ConnectionSource {
                  * in "idle in transaction" state. Such connections seam to 
                  * cause problems (memory etc.) with PostgreSQL.
                  */
-                try {
-                    result.setAutoCommit(false);
-                } catch (SQLException ex) {
-                    s_log.warn("Failed to set autocommit to false");
+                if (DbHelper.getDatabase(result) == DbHelper.DB_POSTGRES) {
+                    try {
+                        result.setAutoCommit(false);
+                    } catch (SQLException ex) {
+                        s_log.warn("Failed to set autocommit to false");
+                    }
                 }
                 return result;
             } else {
@@ -193,6 +201,7 @@ public class PooledConnectionSource implements ConnectionSource {
         }
     }
 
+    @Override
     public synchronized void release(Connection conn) {
         if (!m_connections.contains(conn)) {
             throw new IllegalArgumentException("connection did come from this source: "
@@ -215,10 +224,13 @@ public class PooledConnectionSource implements ConnectionSource {
              * in "idle in transaction" state. Such connections seam to 
              * cause problems (memory etc.) with PostgreSQL.
              */
-            try {
-                conn.setAutoCommit(true);
-            } catch (SQLException ex) {
-                s_log.warn("Failed to set auto commit to true.");
+            
+            if (DbHelper.getDatabase(conn) == DbHelper.DB_POSTGRES) {
+                try {
+                    conn.setAutoCommit(true);
+                } catch (SQLException ex) {
+                    s_log.warn("Failed to set auto commit to true.");
+                }
             }
             /**
              * jensp end
@@ -264,6 +276,7 @@ public class PooledConnectionSource implements ConnectionSource {
     // the synchronized m_untested variable.
     private class Tester extends Thread {
 
+        @Override
         public void run() {
             List untested = new ArrayList();
             while (true) {
diff --git a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/content-types.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/content-types.sql
index dc2fb7173..8e931ca1d 100755
--- a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/content-types.sql
+++ b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/content-types.sql
@@ -16,7 +16,8 @@ update content_types
 -- Now remove the link contnet type
 
 update cms_items set type_id = null
-  where cms_items.type_id = (select content_types.type_id from content_types where object_type = 'com.arsdigita.cms.contenttypes.Link');
+  where cms_items.type_id = (select content_types.type_id from content_types 
+                             where object_type = 'com.arsdigita.cms.contenttypes.Link');
 
 -- Remove the kit steps
 delete from acs_objects where object_id in (
diff --git a/ccm-ldn-aplaws/web/WEB-INF/bin/upgrade-1.0.4-r5-to-2.3.x.sh b/ccm-ldn-aplaws/web/WEB-INF/bin/upgrade-1.0.4-r5-to-2.3.x.sh
new file mode 100644
index 000000000..d8fd4c12a
--- /dev/null
+++ b/ccm-ldn-aplaws/web/WEB-INF/bin/upgrade-1.0.4-r5-to-2.3.x.sh
@@ -0,0 +1,402 @@
+#/bin/bash
+# This is helper script for the upgrade of the intranet installation
+# APLAWS+ at the London Bourough of Camden from 1.0.4-r5 to 2.2.x
+# The script requrires Bash version 4 or newer. Before running this script
+# set the CCM_BIN_DIR variable to the correct value (the bin dir of your
+# CCM/APLAWS+ installation)
+
+CCM_BIN_DIR=/srv/lbc-intranet/webapps/ROOT/WEB-INF/bin
+
+# Declare names for the upgrades. This also defines the order in which the 
+# upgrades are executed.
+UPGRADES=('core-6.5.2-6.5.3'
+          'core-6.5.3-6.5.4'
+          'core-6.5.4-6.5.5'
+          'core-6.5.5-6.5.6'
+          'core-6.6.0-6.6.1'
+          'core-6.6.1-6.6.2'
+          'core-6.6.2-6.6.3'
+          'atoz-6.5.0-6.6.0'
+          'atoz-6.6.0-6.6.1'
+          'cms-6.5.0-6.5.1'
+          'cms-6.5.2-6.5.3'
+          'cms-6.5.3-6.5.4'
+          'cms-6.6.6-6.6.7'
+          'forum-6.6.1-6.6.2'
+          'search-6.6.0-6.6.1'
+          'terms-6.5.0-6.5.1'
+          'terms-6.5.1-6.5.2'
+          'terms-6.6.0-6.6.1'
+          'terms-6.6.1-6.6.2'
+          'portalworkspace-6.6.0-6.6.1'          
+          'rssfeed-6.6.0-6.6.1'
+          'shortcuts-6.6.0-6.6.1'
+          'subsite-6.6.0-6.6.1'
+          'themedirector-6.6.0-6.6.1'
+          'themedirector-6.6.1-6.6.2'
+          'core-6.6.5-6.6.6'
+          'cms-6.6.9-6.6.10'
+          'decisiontree-1.0.3-6.6.0'
+          'xmlfeed-6.6.0-6.6.1'
+          'atoz-6.6.1-6.6.2'
+          'atoz-6.6.2-6.6.3'
+          'atoz-siteproxy-6.6.1-6.6.2'
+          'ldn-atoz-6.6.1-6.6.2'
+          'ldn-aplaws-0.0.0-6.6.1'
+          'lbc-aplaws-1.0.4-6.6.1'
+          'retention-1.0.4-6.6.0'
+          'search-6.6.1-6.6.2'
+          'rssfeed-6.6.1-6.6.2'
+          'shortcuts-6.6.1-6.6.2'
+          'subsite-6.6.1-6.6.2'
+          'terms-6.6.2-6.6.3'
+          'themedirector-6.6.2-6.6.3'
+          'navigation-6.6.2-6.6.3'
+          'cms-6.6.0-6.6.1'
+          'cms-6.6.1-6.6.2'
+          'cms-6.6.3-6.6.4' 
+          'relatedlink-6.6.0-6.6.1' 
+          'cms-6.6.4-6.6.5'
+          'cms-6.6.5-6.6.6'
+          'cms-6.6.7-6.6.8'
+          'cms-6.6.8-6.6.9'
+          'portalworkspace-6.5.0-6.5.1'
+          'portalworkspace-6.5.1-6.5.2'
+          'portalworkspace-6.5.2-6.5.3'
+          'portalworkspace-6.6.1-6.6.2'
+          'navigation-6.6.1-6.6.2'
+          'navigation-6.6.0-6.6.1'
+          'forum-6.6.0-6.6.1'
+          'forum-6.5.0-6.5.1'
+          'forum-6.5.1-6.5.2'
+          'core-6.6.3-6.6.4' 
+          'core-6.6.4-6.6.5' 
+          'mpa-6.6.0-6.6.1',   # Warum ist hier ein Komma ?
+          'cms-6.6.10-6.6.11')
+
+# Define the packages to upgrade for each upgrade. The package name is given
+# without version, exactly as the first parameter for the ccm upgrade command.
+declare -A PACKAGES
+PACKAGES=( [atoz-6.5.0-6.6.0]=ccm-atoz
+           [atoz-6.6.0-6.6.1]=ccm-atoz
+           [atoz-6.6.1-6.6.2]=ccm-atoz
+           [atoz-6.6.2-6.6.3]=ccm-atoz
+           [atoz-siteproxy-6.6.1-6.6.2]=ccm-atoz-siteproxy
+           [cms-6.5.0-6.5.1]=ccm-cms
+           [cms-6.5.2-6.5.3]=ccm-cms
+           [cms-6.5.3-6.5.4]=ccm-cms
+           [cms-6.6.0-6.6.1]=ccm-cms
+           [cms-6.6.1-6.6.2]=ccm-cms
+           [cms-6.6.3-6.6.4]=ccm-cms
+           [cms-6.6.4-6.6.5]=ccm-cms
+           [cms-6.6.5-6.6.6]=ccm-cms
+           [cms-6.6.6-6.6.7]=ccm-cms
+           [cms-6.6.7-6.6.8]=ccm-cms
+           [cms-6.6.8-6.6.9]=ccm-cms
+           [cms-6.6.9-6.6.10]=ccm-cms
+           [cms-6.6.10-6.6.11]=ccm-cms
+           [relatedlink-6.6.0-6.6.1]=ccm-cms-assets-relatedlink
+           [article-6.6.0-6.6.1]=ccm-cms-types-article
+           [decisiontree-1.0.3-6.6.0]=ccm-cms-types-decisiontree
+           [event-6.6.0-6.6.1]=ccm-cms-types-event
+           [mpa-6.6.0-6.6.1]=ccm-cms-types-mparticle
+           [newsitem-6.6.0-6.6.1]=ccm-cms-types-newsitem
+           [xmlfeed-6.6.0-6.6.1]=ccm-cms-types-xmlfeed
+           [core-6.5.2-6.5.3]=ccm-core
+           [core-6.5.3-6.5.4]=ccm-core
+           [core-6.5.4-6.5.5]=ccm-core
+           [core-6.5.5-6.5.6]=ccm-core
+           [core-6.6.0-6.6.1]=ccm-core
+           [core-6.6.1-6.6.2]=ccm-core
+           [core-6.6.2-6.6.3]=ccm-core
+           [core-6.6.3-6.6.4]=ccm-core
+           [core-6.6.4-6.6.5]=ccm-core
+           [core-6.6.5-6.6.6]=ccm-core 
+           [forum-6.5.0-6.5.1]=ccm-forum
+           [forum-6.5.1-6.5.2]=ccm-forum
+           [forum-6.6.0-6.6.1]=ccm-forum
+           [forum-6.6.1-6.6.2]=ccm-forum
+           [lbc-aplaws-1.0.4-6.6.1]=ccm-lbc-aplaws
+           [ldn-aplaws-0.0.0-6.6.1]=ccm-ldn-aplaws
+           [ldn-atoz-6.6.1-6.6.2]=ccm-ldn-atoz
+           [retention-1.0.4-6.6.0]=ccm-lbc-retention
+           [search-6.6.0-6.6.1]=ccm-ldn-search
+           [search-6.6.1-6.6.2]=ccm-ldn-search
+           [navigation-6.5.0-6.5.1]=ccm-navigation
+           [navigation-6.6.0-6.6.1]=ccm-navigation
+           [navigation-6.6.1-6.6.2]=ccm-navigation
+           [navigation-6.6.2-6.6.3]=ccm-navigation
+           [portalworkspace-6.5.0-6.5.1]=ccm-portalworkspace
+           [portalworkspace-6.5.1-6.5.2]=ccm-portalworkspace
+           [portalworkspace-6.5.2-6.5.3]=ccm-portalworkspace
+           [portalworkspace-6.6.0-6.6.1]=ccm-portalworkspace
+           [portalworkspace-6.6.1-6.6.2]=ccm-portalworkspace
+           [rssfeed-6.6.0-6.6.1]=ccm-rssfeed
+           [rssfeed-6.6.1-6.6.2]=ccm-rssfeed
+           [shortcuts-6.6.0-6.6.1]=ccm-shortcuts
+           [shortcuts-6.6.1-6.6.2]=ccm-shortcuts
+           [subsite-6.6.0-6.6.1]=ccm-subsite
+           [subsite-6.6.1-6.6.2]=ccm-subsite
+           [terms-6.5.0-6.5.1]=ccm-ldn-terms
+           [terms-6.5.1-6.5.2]=ccm-ldn-terms
+           [terms-6.6.0-6.6.1]=ccm-ldn-terms
+           [terms-6.6.1-6.6.2]=ccm-ldn-terms
+           [terms-6.6.2-6.6.3]=ccm-ldn-terms
+           [themedirector-6.6.0-6.6.1]=ccm-themedirector
+           [themedirector-6.6.1-6.6.2]=ccm-themedirector
+           [themedirector-6.6.2-6.6.3]=ccm-themedirector )
+
+# Define the from versions for each upgrade
+declare -A VERSION_FROM
+VERSION_FROM=( [atoz-6.5.0-6.6.0]=6.5.0
+               [atoz-6.6.0-6.6.1]=6.6.0
+               [atoz-6.6.1-6.6.2]=6.6.1
+               [atoz-6.6.2-6.6.3]=6.6.2
+               [atoz-siteproxy-6.6.1-6.6.2]=6.6.1
+               [cms-6.5.0-6.5.1]=6.5.0
+               [cms-6.5.2-6.5.3]=6.5.2
+               [cms-6.5.3-6.5.4]=6.5.3
+               [cms-6.6.0-6.6.1]=6.6.0
+               [cms-6.6.1-6.6.2]=6.6.1
+               [cms-6.6.3-6.6.4]=6.6.3
+               [cms-6.6.4-6.6.5]=6.6.4
+               [cms-6.6.5-6.6.6]=6.6.5
+               [cms-6.6.6-6.6.7]=6.6.6
+               [cms-6.6.7-6.6.8]=6.6.7
+               [cms-6.6.8-6.6.9]=6.6.8
+               [cms-6.6.9-6.6.10]=6.6.9
+               [cms-6.6.10-6.6.11]=6.6.10
+               [relatedlink-6.6.0-6.6.1]=6.6.0
+               [article-6.6.0-6.6.1]=6.6.0
+               [decisiontree-1.0.3-6.6.0]=1.0.3
+               [event-6.6.0-6.6.1]=6.6.0
+               [mpa-6.6.0-6.6.1]=6.6.0
+               [newsitem-6.6.0-6.6.1]=6.6.0
+               [xmlfeed-6.6.0-6.6.1]=6.6.0
+               [core-6.5.2-6.5.3]=6.5.2
+               [core-6.5.3-6.5.4]=6.5.3
+               [core-6.5.4-6.5.5]=6.5.4
+               [core-6.5.5-6.5.6]=6.5.5
+               [core-6.6.0-6.6.1]=6.6.0
+               [core-6.6.1-6.6.2]=6.6.1
+               [core-6.6.2-6.6.3]=6.6.2
+               [core-6.6.3-6.6.4]=6.6.3
+               [core-6.6.4-6.6.5]=6.6.4
+               [core-6.6.5-6.6.6]=6.6.5
+               [forum-6.5.0-6.5.1]=6.5.0
+               [forum-6.5.1-6.5.2]=6.5.1
+               [forum-6.6.0-6.6.1]=6.6.0
+               [forum-6.6.1-6.6.2]=6.6.1
+               [lbc-aplaws-1.0.4-6.6.1]=1.0.4
+               [ldn-aplaws-0.0.0-6.6.1]=0.0.0
+               [ldn-atoz-6.6.1-6.6.2]=6.6.1
+               [retention-1.0.4-6.6.0]=1.0.4
+               [search-6.6.0-6.6.1]=6.6.0
+               [search-6.6.1-6.6.2]=6.6.1
+               [navigation-6.5.0-6.5.1]=6.5.0
+               [navigation-6.6.0-6.6.1]=6.6.0
+               [navigation-6.6.1-6.6.2]=6.6.1
+               [navigation-6.6.2-6.6.3]=6.6.2
+               [portalworkspace-6.5.0-6.5.1]=6.5.0
+               [portalworkspace-6.5.1-6.5.2]=6.5.1
+               [portalworkspace-6.5.2-6.5.3]=6.5.2
+               [portalworkspace-6.6.0-6.6.1]=6.6.0
+               [portalworkspace-6.6.1-6.6.2]=6.6.1
+               [rssfeed-6.6.0-6.6.1]=6.6.0
+               [rssfeed-6.6.1-6.6.2]=6.6.1
+               [shortcuts-6.6.0-6.6.1]=6.6.0
+               [shortcuts-6.6.1-6.6.2]=6.6.1
+               [subsite-6.6.0-6.6.1]=6.6.0
+               [subsite-6.6.1-6.6.2]=6.6.1
+               [terms-6.5.0-6.5.1]=6.5.0
+               [terms-6.5.1-6.5.2]=6.5.1
+               [terms-6.6.0-6.6.1]=6.6.0
+               [terms-6.6.1-6.6.2]=6.6.1
+               [terms-6.6.2-6.6.3]=6.6.2
+               [themedirector-6.6.0-6.6.1]=6.6.0
+               [themedirector-6.6.1-6.6.2]=6.6.1
+               [themedirector-6.6.2-6.6.3]=6.6.2 )
+
+# Define the the target versions for each upgrade
+declare -A VERSION_TO
+VERSION_TO=( [atoz-6.5.0-6.6.0]=6.6.0
+             [atoz-6.6.0-6.6.1]=6.6.1
+             [atoz-6.6.1-6.6.2]=6.6.2
+             [atoz-6.6.2-6.6.3]=6.6.3
+             [atoz-siteproxy-6.6.1-6.6.2]=6.6.2
+             [cms-6.5.0-6.5.1]=6.5.1
+             [cms-6.5.2-6.5.3]=6.5.3
+             [cms-6.5.3-6.5.4]=6.5.4
+             [cms-6.6.0-6.6.1]=6.6.1
+             [cms-6.6.1-6.6.2]=6.6.2
+             [cms-6.6.3-6.6.4]=6.6.4
+             [cms-6.6.4-6.6.5]=6.6.5
+             [cms-6.6.5-6.6.6]=6.6.6
+             [cms-6.6.6-6.6.7]=6.6.7
+             [cms-6.6.7-6.6.8]=6.6.8
+             [cms-6.6.8-6.6.9]=6.6.9
+             [cms-6.6.9-6.6.10]=6.6.10
+             [cms-6.6.10-6.6.11]=6.6.11
+             [relatedlink-6.6.0-6.6.1]=6.6.1
+             [article-6.6.0-6.6.1]=6.6.1
+             [decisiontree-1.0.3-6.6.0]=6.6.0
+             [event-6.6.0-6.6.1]=6.6.1
+             [mpa-6.6.0-6.6.1]=6.6.1
+             [newsitem-6.6.0-6.6.1]=6.6.1
+             [xmlfeed-6.6.0-6.6.1]=6.6.1
+             [core-6.5.2-6.5.3]=6.5.3
+             [core-6.5.3-6.5.4]=6.5.4
+             [core-6.5.4-6.5.5]=6.5.5
+             [core-6.5.5-6.5.6]=6.5.6
+             [core-6.6.0-6.6.1]=6.6.1
+             [core-6.6.1-6.6.2]=6.6.2
+             [core-6.6.2-6.6.3]=6.6.3
+             [core-6.6.3-6.6.4]=6.6.4
+             [core-6.6.4-6.6.5]=6.6.5
+             [core-6.6.5-6.6.6]=6.6.6
+             [forum-6.5.0-6.5.1]=6.5.1
+             [forum-6.5.1-6.5.2]=6.5.2
+             [forum-6.6.0-6.6.1]=6.6.1
+             [forum-6.6.1-6.6.2]=6.6.2
+             [lbc-aplaws-1.0.4-6.6.1]=6.6.1
+             [ldn-aplaws-0.0.0-6.6.1]=6.6.1
+             [ldn-atoz-6.6.1-6.6.2]=6.6.2
+             [retention-1.0.4-6.6.0]=6.6.0
+             [search-6.6.0-6.6.1]=6.6.1
+             [search-6.6.1-6.6.2]=6.6.2
+             [navigation-6.5.0-6.5.1]=6.5.1
+             [navigation-6.6.0-6.6.1]=6.6.1
+             [navigation-6.6.1-6.6.2]=6.6.2
+             [navigation-6.6.2-6.6.3]=6.6.3
+             [portalworkspace-6.5.0-6.5.1]=6.5.1
+             [portalworkspace-6.5.1-6.5.2]=6.5.2
+             [portalworkspace-6.5.2-6.5.3]=6.5.3
+             [portalworkspace-6.6.0-6.6.1]=6.6.1
+             [portalworkspace-6.6.1-6.6.2]=6.6.2
+             [rssfeed-6.6.0-6.6.1]=6.6.1
+             [rssfeed-6.6.1-6.6.2]=6.6.2
+             [shortcuts-6.6.0-6.6.1]=6.6.1
+             [shortcuts-6.6.1-6.6.2]=6.6.2
+             [subsite-6.6.0-6.6.1]=6.6.1
+             [subsite-6.6.1-6.6.2]=6.6.2
+             [terms-6.5.0-6.5.1]=6.5.1
+             [terms-6.5.1-6.5.2]=6.5.2
+             [terms-6.6.0-6.6.1]=6.6.1
+             [terms-6.6.1-6.6.2]=6.6.2
+             [terms-6.6.2-6.6.3]=6.6.3
+             [themedirector-6.6.0-6.6.1]=6.6.1
+             [themedirector-6.6.1-6.6.2]=6.6.2
+             [themedirector-6.6.2-6.6.3]=6.6.3 )
+
+# Define the current versions for each package. This is used by this script
+# to check if a module is installed. (The script checks if the JAR file exists).
+declare -A CURRENT_VERSION
+CURRENT_VERSION=( [atoz-6.5.0-6.6.0]=6.6.3
+                  [atoz-6.6.0-6.6.1]=6.6.3
+                  [atoz-6.6.1-6.6.2]=6.6.3
+                  [atoz-6.6.2-6.6.3]=6.6.3
+                  [atoz-siteproxy-6.6.1-6.6.2]=6.6.2
+                  [cms-6.5.0-6.5.1]=6.6.11
+                  [cms-6.5.2-6.5.3]=6.6.11
+                  [cms-6.5.3-6.5.4]=6.6.11
+                  [cms-6.6.0-6.6.1]=6.6.11
+                  [cms-6.6.1-6.6.2]=6.6.11
+                  [cms-6.6.3-6.6.4]=6.6.11
+                  [cms-6.6.4-6.6.5]=6.6.11
+                  [cms-6.6.5-6.6.6]=6.6.11
+                  [cms-6.6.6-6.6.7]=6.6.11
+                  [cms-6.6.7-6.6.8]=6.6.11
+                  [cms-6.6.8-6.6.9]=6.6.11
+                  [cms-6.6.9-6.6.10]=6.6.11
+                  [cms-6.6.10-6.6.11]=6.6.11
+                  [relatedlink-6.6.0-6.6.1]=6.6.1
+                  [article-6.6.0-6.6.1]=6.6.1
+                  [decisiontree-1.0.3-6.6.0]=6.6.0
+                  [event-6.6.0-6.6.1]=6.6.1
+                  [mpa-6.6.0-6.6.1]=6.6.1
+                  [newsitem-6.6.0-6.6.1]=6.6.1
+                  [xmlfeed-6.6.0-6.6.1]=6.6.1
+                  [core-6.5.2-6.5.3]=6.6.6
+                  [core-6.5.3-6.5.4]=6.6.6
+                  [core-6.5.4-6.5.5]=6.6.6
+                  [core-6.5.5-6.5.6]=6.6.6
+                  [core-6.6.0-6.6.1]=6.6.6
+                  [core-6.6.1-6.6.2]=6.6.6
+                  [core-6.6.2-6.6.3]=6.6.6
+                  [core-6.6.3-6.6.4]=6.6.6
+                  [core-6.6.4-6.6.5]=6.6.6
+                  [core-6.6.5-6.6.6]=6.6.6
+                  [forum-6.5.0-6.5.1]=6.6.2
+                  [forum-6.5.1-6.5.2]=6.6.2
+                  [forum-6.6.0-6.6.1]=6.6.2
+                  [forum-6.6.1-6.6.2]=6.6.2
+                  [lbc-aplaws-1.0.4-6.6.1]=6.6.1
+                  [ldn-aplaws-0.0.0-6.6.1]=6.6.1
+                  [ldn-atoz-6.6.1-6.6.2]=6.6.2
+                  [search-6.6.0-6.6.1]=6.6.2
+                  [search-6.6.1-6.6.2]=6.6.2
+                  [navigation-6.5.0-6.5.1]=6.6.3
+                  [navigation-6.6.0-6.6.1]=6.6.3
+                  [navigation-6.6.1-6.6.2]=6.6.3
+                  [navigation-6.6.2-6.6.3]=6.6.3
+                  [portalworkspace-6.5.0-6.5.1]=6.6.3
+                  [portalworkspace-6.5.1-6.5.2]=6.6.3
+                  [portalworkspace-6.5.2-6.5.3]=6.6.3
+                  [portalworkspace-6.6.0-6.6.1]=6.6.3
+                  [portalworkspace-6.6.1-6.6.2]=6.6.3
+                  [rssfeed-6.6.0-6.6.1]=6.6.2
+                  [rssfeed-6.6.1-6.6.2]=6.6.2
+                  [shortcuts-6.6.0-6.6.1]=6.6.2
+                  [shortcuts-6.6.1-6.6.2]=6.6.2
+                  [subsite-6.6.0-6.6.1]=6.6.2
+                  [subsite-6.6.1-6.6.2]=6.6.2
+                  [terms-6.5.0-6.5.1]=6.6.3
+                  [terms-6.5.1-6.5.2]=6.6.3
+                  [terms-6.6.0-6.6.1]=6.6.3
+                  [terms-6.6.1-6.6.2]=6.6.3
+                  [terms-6.6.2-6.6.3]=6.6.3
+                  [themedirector-6.6.0-6.6.1]=6.6.3
+                  [themedirector-6.6.1-6.6.2]=6.6.3
+                  [themedirector-6.6.2-6.6.3]=6.6.3
+                  [retention-1.0.4-6.6.0]=6.6.0 )
+
+NUMBER_OF_UPGRADES=${#UPGRADES[@]}
+COUNTER=1;
+
+# Change to the WEB-INF/bin/ directory.
+pushd $CCM_BIN_DIR
+
+# Perform the upgrades
+for UPGRADE in ${UPGRADES[@]}
+do
+    echo "Processing upgrade $UPGRADE (${COUNTER}/${NUMBER_OF_UPGRADES})..."
+    echo "Current package: ${PACKAGES[$UPGRADE]}"
+    echo "Version from   : ${VERSION_FROM[$UPGRADE]}"
+    echo "Version to     : ${VERSION_TO[$UPGRADE]}"
+    echo "Current version: ${CURRENT_VERSION[$UPGRADE]}"
+    # Check if the JAR of the module is present
+	if [ -f	"../lib/${PACKAGES[$UPGRADE]}-${CURRENT_VERSION[$UPGRADE]}.jar" ]; then
+		echo "Upgrading ${PACKAGES[$UPGRADE]} from version ${VERSION_FROM[$UPGRADE]} to version ${VERSION_TO[$UPGRADE]}..."
+		bash ccm upgrade ${PACKAGES[$UPGRADE]} --from-version=${VERSION_FROM[$UPGRADE]} --to-version=${VERSION_TO[$UPGRADE]}
+		
+		# Check the return value from ccm upgrade. If the upgrade failed, 
+		# exit the script.
+        if [ $? -eq 0 ]; then
+        	echo -e "Upgrade ${UPGRADE} finished successfully.\n\n"
+	    else
+	    	echo "Upgrade ${UPGRADE} failed. Aborting."
+	    	exit 1
+	    fi
+    else
+        # JAR was not found, skip upgrade
+		echo "${PACKAGES[$UPGRADE]}-${CURRENT_VERSION[$UPGRADE]}.jar not found. Skiping upgrade."
+		exit 1
+	fi
+	
+	let "COUNTER++"
+	
+done
+
+# Change back to start directory.
+popd
+
diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql b/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql
index 8b590a028..80384f3cf 100644
--- a/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql
@@ -37,12 +37,12 @@ update init_requirements
 
 ALTER TABLE init_requirements
   ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
-      REFERENCES inits (class_name) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION;
+      REFERENCES inits (class_name) MATCH SIMPLE ;
+      -- ON UPDATE NO ACTION ON DELETE NO ACTION; REDUNDANT,is DEFAULT
 ALTER TABLE init_requirements
   ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
-      REFERENCES inits (class_name) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION;
+      REFERENCES inits (class_name) MATCH SIMPLE;
+      -- ON UPDATE NO ACTION ON DELETE NO ACTION; REDUNDANT, is DEFAULT
 
 
 update application_types
diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
index c132cca51..8dbf85273 100644
--- a/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
@@ -36,7 +36,7 @@ alter table portlet_navigation_directory
     rename to portlet_navigation_tree;
 
 
-alter table only portlet_navigation_tree
+alter table portlet_navigation_tree
     add constraint port_naviga_tre_por_id_p_ivbko PRIMARY KEY (portlet_id);
 
 alter table portlet_navigation_tree
diff --git a/ccm-portalworkspace/sql/ccm-portalworkspace/oracle-se/insert-page-layouts.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/oracle-se/insert-page-layouts.sql
index 28e5e258f..c9dc29cd8 100755
--- a/ccm-portalworkspace/sql/ccm-portalworkspace/oracle-se/insert-page-layouts.sql
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/oracle-se/insert-page-layouts.sql
@@ -5,7 +5,7 @@ insert into pw_workspace_page_layouts (layout_id, title, description, format)
   values (acs_object_id_seq.nextval, '2 Column', 'Two columns, equal size', '50%,50%');
 
 insert into pw_workspace_page_layouts (layout_id, title, description, format)
-  values (acs_object_id_seq.nextval, '3 Column', 'Three columns, equal size', '30%,40%,30%');
+  values (acs_object_id_seq.nextval, '3 Column', 'Three columns, equal size', '33.33%,33.33%,33.33%');
 
 insert into pw_workspace_page_layouts (layout_id, title, description, format)
   values (acs_object_id_seq.nextval, '4 Column', 'Four columns, equal size', '25%,25%,25%,25%');
diff --git a/ccm-portalworkspace/src/ccm-portalworkspace.upgrade b/ccm-portalworkspace/src/ccm-portalworkspace.upgrade
index 87729314c..7cb5395bf 100755
--- a/ccm-portalworkspace/src/ccm-portalworkspace.upgrade
+++ b/ccm-portalworkspace/src/ccm-portalworkspace.upgrade
@@ -27,8 +27,4 @@
     <!--  Refactored Legacy Free     --> 
     <script sql="ccm-portalworkspace/upgrade/::database::-6.6.1-6.6.2.sql"/>
   </version>
-  <!-- <version from="6.6.2" to="6.6.3"> -->
-    <!--  Removed separate theme modifications     --> 
-    <!-- <script sql="ccm-portalworkspace/upgrade/::database::-6.6.1-6.6.2.sql"/>
-  </version> -->
 </upgrade>
diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java
index 3c9416b70..81ed0b3c1 100755
--- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java
@@ -60,12 +60,12 @@ public class Loader extends PackageLoader {
      */
     private static final Logger s_log = Logger.getLogger(Loader.class);
 
-    private StringParameter m_url = new StringParameter(
+    private final StringParameter m_url = new StringParameter(
         "com.arsdigita.portalworkspace.default_url",
         Parameter.REQUIRED,
         "/portal/");
 
-    private StringParameter m_title = new StringParameter(
+    private final StringParameter m_title = new StringParameter(
         "com.arsdigita.portalworkspace.default_title",
         Parameter.REQUIRED,
         "Portal Homepage");
@@ -92,10 +92,12 @@ public class Loader extends PackageLoader {
      *
      * @param ctx
      */
+    @Override
     public void run(final ScriptContext ctx) {
 
         new KernelExcursion() {
 
+            @Override
             public void excurse() {
                 setEffectiveParty(Kernel.getSystemParty());
 
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 4a79975e3..1717597ee 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -9,7 +9,7 @@
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
                  version="2.3.0" 
-                 release="devel-SNAPSHOT-r2915" 
+                 release="devel-SNAPSHOT-r3010" 
                   webxml="sci-web.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="libreccm" 
diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
index 577843c34..220962827 100644
--- a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
+++ b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
@@ -35,7 +35,7 @@ update init_requirements
    set required_init=replace(required_init,'london.shortcuts', 'shortcuts')
  where required_init  like  '%london.shortcuts%' ;
 
-ALTER TABLE ONLY init_requirements
+ALTER TABLE init_requirements
   ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
       REFERENCES inits (class_name) MATCH SIMPLE
       ON UPDATE NO ACTION ON DELETE NO ACTION;
diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.1-6.6.2/set_singleton.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.1-6.6.2/set_singleton.sql
index 7c915b9cd..08d72b9cb 100644
--- a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.1-6.6.2/set_singleton.sql
+++ b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.1-6.6.2/set_singleton.sql
@@ -17,4 +17,6 @@
 --
 -- $Id$
 
-UPDATE application_types SET singleton_p = true WHERE object_type = 'com.arsdigita.shortcuts.Shortcuts';
\ No newline at end of file
+UPDATE application_types 
+       SET singleton_p = true 
+       WHERE object_type = 'com.arsdigita.shortcuts.Shortcuts';
\ No newline at end of file
diff --git a/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql b/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
index 36a629564..3dc454dee 100644
--- a/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
+++ b/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
@@ -35,7 +35,7 @@ update init_requirements
    set required_init=replace(required_init,'london.subsite', 'subsite')
  where required_init  like  '%london.subsite%' ;
 
-ALTER TABLE ONLY init_requirements
+ALTER TABLE init_requirements
   ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
       REFERENCES inits (class_name) MATCH SIMPLE
       ON UPDATE NO ACTION ON DELETE NO ACTION;
diff --git a/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.1-6.6.2/set_singleton.sql b/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.1-6.6.2/set_singleton.sql
index 3b7a90fd0..bed260a52 100644
--- a/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.1-6.6.2/set_singleton.sql
+++ b/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.1-6.6.2/set_singleton.sql
@@ -17,4 +17,5 @@
 --
 -- $Id$
 
-UPDATE application_types SET singleton_p = true WHERE object_type = 'com.arsdigita.subsite.Subsite';
\ No newline at end of file
+UPDATE application_types SET singleton_p = true 
+                         WHERE object_type = 'com.arsdigita.subsite.Subsite';
\ No newline at end of file
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
index db5f1799e..6882ae975 100644
--- a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
@@ -32,12 +32,12 @@ update init_requirements
 
 ALTER TABLE init_requirements
   ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
-      REFERENCES inits (class_name) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION;
+      REFERENCES inits (class_name) MATCH SIMPLE;
+      -- ON UPDATE NO ACTION ON DELETE NO ACTION; Redundant, is DEFAULT
 ALTER TABLE init_requirements
   ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
-      REFERENCES inits (class_name) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION;
+      REFERENCES inits (class_name) MATCH SIMPLE;
+      -- ON UPDATE NO ACTION ON DELETE NO ACTION; Redundant, is DEFAULT
 
 
 update application_types
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_theme_app_table.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_theme_app_table.sql
index b86c02fa9..c905b8831 100644
--- a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_theme_app_table.sql
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_theme_app_table.sql
@@ -27,10 +27,10 @@ ALTER TABLE theme_director
 
 ALTER TABLE theme_director
   ADD CONSTRAINT them_direc_applicat_id_f_rbcnx FOREIGN KEY (application_id)
-      REFERENCES applications (application_id) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION;
+      REFERENCES applications (application_id) MATCH SIMPLE ;
+      -- ON UPDATE NO ACTION ON DELETE NO ACTION; Redundant, IS DEFAULT
 
 ALTER TABLE theme_director
   ADD CONSTRAINT them_direc_defa_the_id_f_9ph37 FOREIGN KEY (default_theme_id)
-      REFERENCES theme_themes (theme_id) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE NO ACTION;
+      REFERENCES theme_themes (theme_id) MATCH SIMPLE ;
+      -- ON UPDATE NO ACTION ON DELETE NO ACTION; REDUNDANT, is default
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.2-6.6.3/set_singleton.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.2-6.6.3/set_singleton.sql
index c69cb99d4..a4fd11fc6 100644
--- a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.2-6.6.3/set_singleton.sql
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.2-6.6.3/set_singleton.sql
@@ -17,4 +17,5 @@
 --
 -- $Id$
 
-UPDATE application_types SET singleton_p = true WHERE object_type = 'com.arsdigita.themedirector.ThemeDirector';
\ No newline at end of file
+UPDATE application_types SET singleton_p = true 
+       WHERE object_type = 'com.arsdigita.themedirector.ThemeDirector';
\ No newline at end of file