Index: src/webapp/integration-demos/bspace/html/section-info-inner.html
===================================================================
--- src/webapp/integration-demos/bspace/html/section-info-inner.html	(revision 9725)
+++ src/webapp/integration-demos/bspace/html/section-info-inner.html	(working copy)
@@ -3,19 +3,24 @@
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         <title>bSpace : Astronomy 7A : Section Info</title>
-        <link href="../css/tool_base.css" type="text/css" rel="stylesheet" media="all" />
-        <link href="../css/tool.css" type="text/css" rel="stylesheet" media="all" />
-        <link href="../../../lib/jquery/plugins/tooltip/css/jquery.tooltip.css" type="text/css" rel="stylesheet" media="all" />
-        <link href="../css/sections.css" type="text/css" rel="stylesheet" media="all" />
-        <script type="text/javascript" language="JavaScript" src="../../../lib/jquery/core/js/jquery.js"></script>
-        <script type="text/javascript" language="JavaScript" src="../js/headscripts.js"></script>
-        <script type="text/javascript" language="JavaScript" src="../js/sections.js"></script>
-        <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.core.js"></script>
+        
+        <link type="text/css" rel="stylesheet" media="all" href="../../../lib/jquery/plugins/tooltip/css/jquery.tooltip.css" />
+        
+        <link type="text/css" rel="stylesheet" media="all" href="../css/tool_base.css" />
+        <link type="text/css" rel="stylesheet" media="all" href="../css/tool.css" />
+        <link type="text/css" rel="stylesheet" media="all" href="../css/sections.css" />
+        
+        <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
         <script type="text/javascript" src="../../../framework/core/js/jquery.keyboard-a11y.js"></script>
         <script type="text/javascript" src="../../../lib/jquery/plugins/tooltip/js/jquery.tooltip.js"></script>
         <script type="text/javascript" src="../../../framework/core/js/Fluid.js"></script>
         <script type="text/javascript" src="../../../components/inlineEdit/js/InlineEdit.js"></script>
         <script type="text/javascript" src="../../../components/undo/js/Undo.js"></script>
+        
+        <script type="text/javascript" src="../js/headscripts.js"></script>
+        <script type="text/javascript" src="../js/sections.js"></script>
+        
         <script type="text/javascript">
             jQuery(document).ready(function(){
 
Index: src/webapp/integration-demos/bspace/html/section-info.html
===================================================================
--- src/webapp/integration-demos/bspace/html/section-info.html	(revision 9725)
+++ src/webapp/integration-demos/bspace/html/section-info.html	(working copy)
@@ -3,9 +3,12 @@
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         <title>bSpace : Astronomy 7A : Section Info</title>
-        <link href="../css/portal.css" type="text/css" rel="stylesheet" media="all" />
-        <link href="../css/portalstyles.css" type="text/css" rel="stylesheet" media="all" />
+        
+        <link type="text/css" rel="stylesheet" media="all" href="../css/portal.css" />
+        <link type="text/css" rel="stylesheet" media="all" href="../css/portalstyles.css" />
+        
         <script type="text/javascript" language="JavaScript" src="../../../lib/jquery/core/js/jquery.js"></script>
+        
         <script type="text/javascript" language="JavaScript" src="../js/headscripts.js"></script>
         <script type="text/javascript" language="JavaScript" src="../js/portalscripts.js"></script>
     </head>
Index: src/webapp/integration-demos/sakai/html/inline-edit-announcements.html
===================================================================
--- src/webapp/integration-demos/sakai/html/inline-edit-announcements.html	(revision 9725)
+++ src/webapp/integration-demos/sakai/html/inline-edit-announcements.html	(working copy)
@@ -2,19 +2,20 @@
 <html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link href="../css/announcements.css" type="text/css" rel="stylesheet" media="all" />
-      <link rel="stylesheet" type="text/css" href="../../../lib/jquery/plugins/tooltip/css/jquery.tooltip.css" />
-      <link rel="stylesheet" type="text/css" href="../../../components/inlineEdit/css/InlineEdit.css" />
-
     <title>Demonstration: Fluid Inline Edit in Sakai Announcements</title>
     
-      <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
-      <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.core.js"></script>
-      <script type="text/javascript" src="../../../framework/core/js/jquery.keyboard-a11y.js"></script>
-      <script type="text/javascript" src="../../../framework/core/js/Fluid.js"></script>
-      <script type="text/javascript" src="../../../components/inlineEdit/js/InlineEdit.js"></script>
-      <script type="text/javascript" src="../../../components/undo/js/Undo.js"></script>
-      <script type="text/javascript" src="../../../lib/jquery/plugins/tooltip/js/jquery.tooltip.js"></script>    
+    <link rel="stylesheet" type="text/css" href="../css/announcements.css" />
+    <link rel="stylesheet" type="text/css" href="../../../lib/jquery/plugins/tooltip/css/jquery.tooltip.css" />
+    <link rel="stylesheet" type="text/css" href="../../../components/inlineEdit/css/InlineEdit.css" />
+    
+    
+    <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
+    <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
+    <script type="text/javascript" src="../../../framework/core/js/jquery.keyboard-a11y.js"></script>
+    <script type="text/javascript" src="../../../framework/core/js/Fluid.js"></script>
+    <script type="text/javascript" src="../../../components/inlineEdit/js/InlineEdit.js"></script>
+    <script type="text/javascript" src="../../../components/undo/js/Undo.js"></script>
+    <script type="text/javascript" src="../../../lib/jquery/plugins/tooltip/js/jquery.tooltip.js"></script>    
     
     <!-- 
     <script type="text/javascript" src="../../../tests/utils/DebugFocus.js"></script>
Index: src/webapp/integration-demos/sakai/html/pager-site-setting.html
===================================================================
--- src/webapp/integration-demos/sakai/html/pager-site-setting.html	(revision 9725)
+++ src/webapp/integration-demos/sakai/html/pager-site-setting.html	(working copy)
@@ -18,7 +18,7 @@
 
         
         <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
-        <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.core.js"></script>
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
         <script type="text/javascript" src="../../../lib/jquery/plugins/bgiframe/js/jquery.bgiframe.js"></script>
         <script type="text/javascript" src="../../../lib/jquery/plugins/tooltip/js/jquery.tooltip.js"></script>
         <script type="text/javascript" src="../../../lib/jquery/plugins/delegate/js/jquery.delegate.js"></script>
Index: src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
===================================================================
--- src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html	(revision 9725)
+++ src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html	(working copy)
@@ -27,11 +27,14 @@
 		<link rel="stylesheet" type="text/css" href="../css/sakai.components.ui-options.css" />
         
         <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
-        <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.core.js"></script> 
-        <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.draggable.js"></script> 
-        <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.dialog.js"></script> 
-        <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.slider.js"></script>
-        <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.accordion.js"></script>
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.widget.js"></script>
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.mouse.js"></script>
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.draggable.js"></script>
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.position.js"></script> 
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.dialog.js"></script> 
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.slider.js"></script>
+        <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.accordion.js"></script>
         <script type="text/javascript" src="../../../lib/jquery/plugins/delegate/js/jquery.delegate.js"></script>
 
         <script type="text/javascript" src="../../../lib/json/js/json2.js"></script>
Index: src/webapp/integration-demos/uportal/html/portal.html
===================================================================
--- src/webapp/integration-demos/uportal/html/portal.html	(revision 9725)
+++ src/webapp/integration-demos/uportal/html/portal.html	(working copy)
@@ -5,8 +5,9 @@
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
     <meta content="uPortal by JA-SIG: The academic open source portal built for higher education by higher education" name="description" />
     <meta content="portal, uPortal, academic, higher education, open source, enterprise, JA-SIG, JASIG" name="keywords" />
+    
     <link rel="stylesheet" href="../css/portal.css" type="text/css" />
-
+    
     <!-- Required stylesheets for using a Fluid skin -->
     <link rel="stylesheet" href="../../../framework/fss/css/fss-layout.css" type="text/css" />
     <link rel="stylesheet" href="../../../framework/fss/css/fss-text.css" type="text/css" />
@@ -16,8 +17,10 @@
 
     <!--  Required javascript modules for the Reorderer which can be replaced with the build generated file Fluid-all.js -->
     <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
-    <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.core.js"></script>
-    <script type="text/javascript" src="../../../lib/jquery/ui/js/ui.draggable.js"></script>
+    <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
+    <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.widget.js"></script>
+    <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.mouse.js"></script>
+    <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.draggable.js"></script>
     <script type="text/javascript" src="../../../framework/core/js/jquery.keyboard-a11y.js"></script>
     <script type="text/javascript" src="../../../framework/core/js/Fluid.js"></script>
     <script type="text/javascript" src="../../../framework/core/js/FluidDOMUtilities.js"></script>
