diff --git a/AppKit/Themes/Aristo/Info.plist b/AppKit/Themes/Aristo/Info.plist
index 917dad3f7..644df8f94 100644
--- a/AppKit/Themes/Aristo/Info.plist
+++ b/AppKit/Themes/Aristo/Info.plist
@@ -7,7 +7,7 @@
 	<key>CPBundleName</key>
 	<string>Aristo</string>
 	<key>BKLearnMoreURL</key>
-	<string>http://cappuccino.org/aristo</string>
+	<string>http://cappuccino-project.org/aristo</string>
 	<key>BKLearnMoreButtonTitle</key>
 	<string>Aristo Home Page</string>
 	<key>CPPrincipalClass</key>
diff --git a/AppKit/Themes/Aristo/index-debug.html b/AppKit/Themes/Aristo/index-debug.html
index 90e9a5ce7..70a07e70c 100644
--- a/AppKit/Themes/Aristo/index-debug.html
+++ b/AppKit/Themes/Aristo/index-debug.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -46,12 +46,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading Aristo...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/AppKit/Themes/Aristo/index.html b/AppKit/Themes/Aristo/index.html
index 7be70d855..918cb3df3 100644
--- a/AppKit/Themes/Aristo/index.html
+++ b/AppKit/Themes/Aristo/index.html
@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -45,12 +45,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading Aristo...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Jakefile b/Jakefile
index 754b336cb..4dcff0811 100644
--- a/Jakefile
+++ b/Jakefile
@@ -263,7 +263,7 @@ task ("demos", function()
     rm_rf(demosDir);
     FILE.mkdirs(demosDir);
 
-    OS.system("curl -L http://github.com/280north/cappuccino-demos/zipball/master > " + zipQuoted);
+    OS.system("curl -L http://github.com/cappuccino/cappuccino-demos/zipball/master > " + zipQuoted);
     OS.system("(cd " + demosQuoted + " && unzip " + zipQuoted + " -d demos)");
 
     require("objective-j");
diff --git a/README.markdown b/README.markdown
index d50f07ee2..21d320ac0 100644
--- a/README.markdown
+++ b/README.markdown
@@ -13,7 +13,7 @@ with the complexities of traditional web technologies like HTML, CSS, or even
 the DOM. The unpleasantries of building complex cross browser applications are
 abstracted away for you.
 
-For more information, see <http://cappuccino.org>.
+For more information, see <http://cappuccino-project.org>.
 
 System Requirements
 -------------------
@@ -33,7 +33,7 @@ Getting Started
 ---------------
 To get started, download and install the current release version of Cappuccino:
 
-    $ curl https://raw.github.com/cappuccino/cappuccino/v0.9.6-RC2/bootstrap.sh >/tmp/cappuccino_bootstrap.sh && bash /tmp/cappuccino_bootstrap.sh
+    $ curl https://raw.github.com/cappuccino/cappuccino/v0.9.6/bootstrap.sh >/tmp/cappuccino_bootstrap.sh && bash /tmp/cappuccino_bootstrap.sh
 
 If you'd just like to get started using Cappuccino for your web apps, you are done.
 
@@ -65,8 +65,8 @@ Getting Help
 ------------
 If you need help with Cappuccino, you can get help from the following sources:
 
-  - [FAQ](http://cappuccino.org/discuss/faq.php)
-  - [Documentation](http://cappuccino.org/learn/)
+  - [FAQ](http://cappuccino-project.org/support/faq.html)
+  - [Documentation](http://cappuccino-project.org/learn/)
   - [Wiki](http://github.com/cappuccino/cappuccino/wikis)
   - Mailing Lists:
     - [Objective-J](http://groups.google.com/group/objectivej)
diff --git a/Tests/AppKit/WithAndWithoutBindingsIntegration/01_WithoutBindings/WithoutBindingsTest.j b/Tests/AppKit/WithAndWithoutBindingsIntegration/01_WithoutBindings/WithoutBindingsTest.j
index ecc2edaf3..fa86fa585 100644
--- a/Tests/AppKit/WithAndWithoutBindingsIntegration/01_WithoutBindings/WithoutBindingsTest.j
+++ b/Tests/AppKit/WithAndWithoutBindingsIntegration/01_WithoutBindings/WithoutBindingsTest.j
@@ -75,9 +75,9 @@
     [theDocument.selectedBookmarkTitleField performClick:self];
     [self assert:@"Another Title" equals:[theDocument.collection[1] title]];
 
-    [theDocument.selectedBookmarkURLField setStringValue:@"http://www.cappuccino.org"];
+    [theDocument.selectedBookmarkURLField setStringValue:@"http://www.cappuccino-project.org"];
     [theDocument.selectedBookmarkURLField performClick:self];
-    [self assert:[CPURL URLWithString:@"http://www.cappuccino.org"] equals:[theDocument.collection[1] URL]];
+    [self assert:[CPURL URLWithString:@"http://www.cappuccino-project.org"] equals:[theDocument.collection[1] URL]];
 
     // Verify the first entry remains.
     [theDocument.tableView selectRowIndexes:[CPIndexSet indexSetWithIndex:0] byExtendingSelection:NO]
@@ -87,7 +87,7 @@
     // Remove it.
     [theDocument removeSelectedBookmarks:self];
     [self assert:@"Another Title" equals:[theDocument.selectedBookmarkTitleField stringValue]];
-    [self assert:@"http://www.cappuccino.org" equals:[theDocument.selectedBookmarkURLField stringValue]];
+    [self assert:@"http://www.cappuccino-project.org" equals:[theDocument.selectedBookmarkURLField stringValue]];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/WithBindingsTest.j b/Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/WithBindingsTest.j
index 78db62e59..c1131ca81 100644
--- a/Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/WithBindingsTest.j
+++ b/Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/WithBindingsTest.j
@@ -75,9 +75,9 @@
     [theDocument.selectedBookmarkTitleField performClick:self];
     [self assert:@"Another Title" equals:[theDocument.collection[1] title]];
 
-    [theDocument.selectedBookmarkURLField setStringValue:@"http://www.cappuccino.org"];
+    [theDocument.selectedBookmarkURLField setStringValue:@"http://www.cappuccino-project.org"];
     [theDocument.selectedBookmarkURLField performClick:self];
-    [self assert:[CPURL URLWithString:@"http://www.cappuccino.org"] equals:[theDocument.collection[1] URL]];
+    [self assert:[CPURL URLWithString:@"http://www.cappuccino-project.org"] equals:[theDocument.collection[1] URL]];
 
     // Verify the first entry remains.
     [theDocument.tableView selectRowIndexes:[CPIndexSet indexSetWithIndex:0] byExtendingSelection:NO]
@@ -87,7 +87,7 @@
     // Remove it.
     [theDocument.removeButton performClick:self];
     [self assert:@"Another Title" equals:[theDocument.selectedBookmarkTitleField stringValue]];
-    [self assert:@"http://www.cappuccino.org" equals:[theDocument.selectedBookmarkURLField stringValue]];
+    [self assert:@"http://www.cappuccino-project.org" equals:[theDocument.selectedBookmarkURLField stringValue]];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/Tests/Foundation/CPURLTest.j b/Tests/Foundation/CPURLTest.j
index 250265917..db606fab0 100644
--- a/Tests/Foundation/CPURLTest.j
+++ b/Tests/Foundation/CPURLTest.j
@@ -3,7 +3,7 @@
 var exampleProtocol = "http",
     exampleUser = "foo",
     examplePassword = "bar",
-    exampleHost = "cappuccino.org",
+    exampleHost = "cappuccino-project.org",
     examplePort = 80,
     exampleAuthority = exampleUser + ":" + examplePassword + "@" + exampleHost + ":" + examplePort,
     examplePathBase = "/contribute/",
@@ -128,10 +128,10 @@ var exampleProtocol = "http",
 
 - (void)testIsEqual
 {
-    var url = [CPURL URLWithString:@"http://www.cappuccino.org"],
-        url2 = [CPURL URLWithString:@"http://www.cappuccino.org"],
-        url3 = [CPURL URLWithString:@"http://www.cappuccino.org/index.html"],
-        url4 = [CPURL URLWithString:@"http://www.cappuccino.org//index.html"];
+    var url = [CPURL URLWithString:@"http://www.cappuccino-project.org"],
+        url2 = [CPURL URLWithString:@"http://www.cappuccino-project.org"],
+        url3 = [CPURL URLWithString:@"http://www.cappuccino-project.org/index.html"],
+        url4 = [CPURL URLWithString:@"http://www.cappuccino-project.org//index.html"];
 
     [self assert:url equals:url];
     [self assert:url equals:url2];
@@ -142,9 +142,9 @@ var exampleProtocol = "http",
 
 - (void)testIsEqualToURL
 {
-    var url = [CPURL URLWithString:@"http://www.cappuccino.org"],
-        url2 = [CPURL URLWithString:@"http://www.cappuccino.org"],
-        url3 = [CPURL URLWithString:@"http://www.cappuccino.org/index.html"];
+    var url = [CPURL URLWithString:@"http://www.cappuccino-project.org"],
+        url2 = [CPURL URLWithString:@"http://www.cappuccino-project.org"],
+        url3 = [CPURL URLWithString:@"http://www.cappuccino-project.org/index.html"];
 
     [self assertTrue:[url isEqualToURL:url]];
     [self assertTrue:[url isEqualToURL:url2]];
diff --git a/Tests/Foundation/CPUserDefaultsTest.j b/Tests/Foundation/CPUserDefaultsTest.j
index cb3a218b4..552e95888 100644
--- a/Tests/Foundation/CPUserDefaultsTest.j
+++ b/Tests/Foundation/CPUserDefaultsTest.j
@@ -102,13 +102,13 @@ CPUserDefaultsTestKey2 = @"KEY2";
 
 - (void)testURL
 {
-    [target setURL:[CPURL URLWithString:@"http://cappuccino.org"] forKey:CPUserDefaultsTestKey1];
+    [target setURL:[CPURL URLWithString:@"http://cappuccino-project.org"] forKey:CPUserDefaultsTestKey1];
     [self assert:[[target URLForKey:CPUserDefaultsTestKey1] class] equals:CPURL];
-    [self assert:[[target URLForKey:CPUserDefaultsTestKey1] absoluteString] equals:@"http://cappuccino.org"];
+    [self assert:[[target URLForKey:CPUserDefaultsTestKey1] absoluteString] equals:@"http://cappuccino-project.org"];
 
-    [target setURL:@"http://cappuccino.org" forKey:CPUserDefaultsTestKey1];
+    [target setURL:@"http://cappuccino-project.org" forKey:CPUserDefaultsTestKey1];
     [self assert:[[target URLForKey:CPUserDefaultsTestKey1] class] equals:CPURL];
-    [self assert:[[target URLForKey:CPUserDefaultsTestKey1] absoluteString] equals:@"http://cappuccino.org"];
+    [self assert:[[target URLForKey:CPUserDefaultsTestKey1] absoluteString] equals:@"http://cappuccino-project.org"];
 
     [target removeObjectForKey:CPUserDefaultsTestKey1];
     [self assert:[target URLForKey:CPUserDefaultsTestKey1] equals:nil];
@@ -152,4 +152,4 @@ CPUserDefaultsTestKey2 = @"KEY2";
    lastObservedCPUserDefaultsTestKey1 = [target objectForKey:CPUserDefaultsTestKey1];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/Tests/Manual/ArrayController1/index-debug.html b/Tests/Manual/ArrayController1/index-debug.html
index bc45b828e..e385197ea 100644
--- a/Tests/Manual/ArrayController1/index-debug.html
+++ b/Tests/Manual/ArrayController1/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/ArrayController1/index.html b/Tests/Manual/ArrayController1/index.html
index a08656e12..07bc29469 100644
--- a/Tests/Manual/ArrayController1/index.html
+++ b/Tests/Manual/ArrayController1/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html b/Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html
index 1c5f0943a..dd0fc0edb 100644
--- a/Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html
+++ b/Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/ArrayControllerRemovingFirstTest/index.html b/Tests/Manual/ArrayControllerRemovingFirstTest/index.html
index 707d86be9..5ec794679 100644
--- a/Tests/Manual/ArrayControllerRemovingFirstTest/index.html
+++ b/Tests/Manual/ArrayControllerRemovingFirstTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/AttachedSheet/index-debug.html b/Tests/Manual/AttachedSheet/index-debug.html
index 4daefda17..ee9eaa75c 100644
--- a/Tests/Manual/AttachedSheet/index-debug.html
+++ b/Tests/Manual/AttachedSheet/index-debug.html
@@ -19,19 +19,19 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
        <script type = "text/javascript">
             objj_msgSend_reset();
-            
+
             // DEBUG OPTIONS:
-            
+
             // Uncomment to enable printing of backtraces on exceptions:
             objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to enable runtime type checking:
             objj_msgSend_decorate(objj_typecheck_decorator);
-            
+
             // Uncomment (along with both above) to print backtraces on type check errors:
             objj_typecheck_prints_backtrace = true;
         </script>
@@ -60,12 +60,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading Attached Sheet...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/AttachedSheet/index.html b/Tests/Manual/AttachedSheet/index.html
index d44a75d39..ac6428852 100644
--- a/Tests/Manual/AttachedSheet/index.html
+++ b/Tests/Manual/AttachedSheet/index.html
@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -45,12 +45,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading <i>Attached Sheet</i> …</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/AttachedSheet2/index-debug.html b/Tests/Manual/AttachedSheet2/index-debug.html
index cf044b9ce..f50088110 100644
--- a/Tests/Manual/AttachedSheet2/index-debug.html
+++ b/Tests/Manual/AttachedSheet2/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/AttachedSheet2/index.html b/Tests/Manual/AttachedSheet2/index.html
index 20935b1b0..7ff29a77b 100644
--- a/Tests/Manual/AttachedSheet2/index.html
+++ b/Tests/Manual/AttachedSheet2/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/Bindings/index-debug.html b/Tests/Manual/Bindings/index-debug.html
index 9463d3392..b976cd65b 100644
--- a/Tests/Manual/Bindings/index-debug.html
+++ b/Tests/Manual/Bindings/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/Bindings/index.html b/Tests/Manual/Bindings/index.html
index 3616a73b2..8d0aa3d38 100644
--- a/Tests/Manual/Bindings/index.html
+++ b/Tests/Manual/Bindings/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPAlertTest/index-debug.html b/Tests/Manual/CPAlertTest/index-debug.html
index f16c26a10..e19163777 100644
--- a/Tests/Manual/CPAlertTest/index-debug.html
+++ b/Tests/Manual/CPAlertTest/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPAlertTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPAlertTest/index.html b/Tests/Manual/CPAlertTest/index.html
index cfcc1eb3f..b7ef26beb 100644
--- a/Tests/Manual/CPAlertTest/index.html
+++ b/Tests/Manual/CPAlertTest/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPAlertTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPBinder-echo-bug/index-debug.html b/Tests/Manual/CPBinder-echo-bug/index-debug.html
index 2f3319b88..f91631eec 100644
--- a/Tests/Manual/CPBinder-echo-bug/index-debug.html
+++ b/Tests/Manual/CPBinder-echo-bug/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPBinder-echo-bug/index.html b/Tests/Manual/CPBinder-echo-bug/index.html
index 2d67d3934..89ab0667f 100644
--- a/Tests/Manual/CPBinder-echo-bug/index.html
+++ b/Tests/Manual/CPBinder-echo-bug/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPBoxTest/index-debug.html b/Tests/Manual/CPBoxTest/index-debug.html
index 4c5784ba1..665d6ea07 100644
--- a/Tests/Manual/CPBoxTest/index-debug.html
+++ b/Tests/Manual/CPBoxTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPBoxTest/index.html b/Tests/Manual/CPBoxTest/index.html
index 9ac7af0e0..488acb148 100644
--- a/Tests/Manual/CPBoxTest/index.html
+++ b/Tests/Manual/CPBoxTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPBrowserTest/AppController.j b/Tests/Manual/CPBrowserTest/AppController.j
index 642e917ab..434bfb774 100644
--- a/Tests/Manual/CPBrowserTest/AppController.j
+++ b/Tests/Manual/CPBrowserTest/AppController.j
@@ -126,7 +126,7 @@
 
 - (id)browser:(id)aBrowser imageValueForItem:(id)anItem
 {
-    return [[CPImage alloc] initWithContentsOfFile:"http://cappuccino.org/images/favicon.png" size:CGSizeMake(16, 16)];
+    return [[CPImage alloc] initWithContentsOfFile:"http://cappuccino-project.org/images/favicon.png" size:CGSizeMake(16, 16)];
 }
 
 - (id)browser:(id)aBrowser objectValueForItem:(id)anItem
diff --git a/Tests/Manual/CPBrowserTest/index-debug.html b/Tests/Manual/CPBrowserTest/index-debug.html
index 828565744..cdf809537 100644
--- a/Tests/Manual/CPBrowserTest/index-debug.html
+++ b/Tests/Manual/CPBrowserTest/index-debug.html
@@ -18,9 +18,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -35,7 +35,7 @@
             // Uncomment (along with both above) to print backtraces on type check errors:
             //objj_typecheck_prints_backtrace = true;
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -61,12 +61,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPBrowserTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPBrowserTest/index.html b/Tests/Manual/CPBrowserTest/index.html
index 1247a629b..9d33c844e 100644
--- a/Tests/Manual/CPBrowserTest/index.html
+++ b/Tests/Manual/CPBrowserTest/index.html
@@ -17,7 +17,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src="Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type="text/css">
@@ -45,12 +45,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPBrowserTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPButtonKeyEquivalentDefaultTest/index-debug.html b/Tests/Manual/CPButtonKeyEquivalentDefaultTest/index-debug.html
index dc88d66e3..2c219c143 100644
--- a/Tests/Manual/CPButtonKeyEquivalentDefaultTest/index-debug.html
+++ b/Tests/Manual/CPButtonKeyEquivalentDefaultTest/index-debug.html
@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPButtonKeyEquivalentDefaultTest/index.html b/Tests/Manual/CPButtonKeyEquivalentDefaultTest/index.html
index 23bd4feb5..32052c4a3 100644
--- a/Tests/Manual/CPButtonKeyEquivalentDefaultTest/index.html
+++ b/Tests/Manual/CPButtonKeyEquivalentDefaultTest/index.html
@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPButtonTest/index-debug.html b/Tests/Manual/CPButtonTest/index-debug.html
index 145fbc0cf..2fc2b0a44 100644
--- a/Tests/Manual/CPButtonTest/index-debug.html
+++ b/Tests/Manual/CPButtonTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPButtonTest/index.html b/Tests/Manual/CPButtonTest/index.html
index ea2b8abbf..6c8234b0e 100644
--- a/Tests/Manual/CPButtonTest/index.html
+++ b/Tests/Manual/CPButtonTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPColor-CPImage-description/index-debug.html b/Tests/Manual/CPColor-CPImage-description/index-debug.html
index 12e211e0c..cdb1fe922 100644
--- a/Tests/Manual/CPColor-CPImage-description/index-debug.html
+++ b/Tests/Manual/CPColor-CPImage-description/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPColor-CPImage-description/index.html b/Tests/Manual/CPColor-CPImage-description/index.html
index 807d9a657..ecc896bae 100644
--- a/Tests/Manual/CPColor-CPImage-description/index.html
+++ b/Tests/Manual/CPColor-CPImage-description/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPColorWellBindings/index-debug.html b/Tests/Manual/CPColorWellBindings/index-debug.html
index b63f30a55..1b641d790 100644
--- a/Tests/Manual/CPColorWellBindings/index-debug.html
+++ b/Tests/Manual/CPColorWellBindings/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPColorWellBindings/index.html b/Tests/Manual/CPColorWellBindings/index.html
index 121dcd10f..1374c447b 100644
--- a/Tests/Manual/CPColorWellBindings/index.html
+++ b/Tests/Manual/CPColorWellBindings/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPComboBoxTest/index-debug.html b/Tests/Manual/CPComboBoxTest/index-debug.html
index 052bcacac..4bcee21fc 100644
--- a/Tests/Manual/CPComboBoxTest/index-debug.html
+++ b/Tests/Manual/CPComboBoxTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPComboBoxTest/index.html b/Tests/Manual/CPComboBoxTest/index.html
index bf35f355e..d53f50a5a 100644
--- a/Tests/Manual/CPComboBoxTest/index.html
+++ b/Tests/Manual/CPComboBoxTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPControlPerformClickExceptionTest/index-debug.html b/Tests/Manual/CPControlPerformClickExceptionTest/index-debug.html
index dcc825c28..364887abc 100644
--- a/Tests/Manual/CPControlPerformClickExceptionTest/index-debug.html
+++ b/Tests/Manual/CPControlPerformClickExceptionTest/index-debug.html
@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPControlPerformClickExceptionTest/index.html b/Tests/Manual/CPControlPerformClickExceptionTest/index.html
index bd9ab5680..f6348e8f9 100644
--- a/Tests/Manual/CPControlPerformClickExceptionTest/index.html
+++ b/Tests/Manual/CPControlPerformClickExceptionTest/index.html
@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPCursor/index-debug.html b/Tests/Manual/CPCursor/index-debug.html
index bcac4065a..213aea188 100644
--- a/Tests/Manual/CPCursor/index-debug.html
+++ b/Tests/Manual/CPCursor/index-debug.html
@@ -19,24 +19,24 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
-        
+
         <script type = "text/javascript">
             objj_msgSend_reset();
-            
+
             // DEBUG OPTIONS:
-            
+
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to enable runtime type checking:
             //objj_msgSend_decorate(objj_typecheck_decorator);
-            
+
             // Uncomment (along with both above) to print backtraces on type check errors:
             //objj_typecheck_prints_backtrace = true;
         </script>
-        
+
         <style type = "text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -61,12 +61,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading CursorTest...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPCursor/index.html b/Tests/Manual/CPCursor/index.html
index 6d8fd04a1..fbc419e1e 100644
--- a/Tests/Manual/CPCursor/index.html
+++ b/Tests/Manual/CPCursor/index.html
@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -46,12 +46,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CursorTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPDocumentControllerTest/withNib/index-debug.html b/Tests/Manual/CPDocumentControllerTest/withNib/index-debug.html
index 8435cee74..f73a77933 100644
--- a/Tests/Manual/CPDocumentControllerTest/withNib/index-debug.html
+++ b/Tests/Manual/CPDocumentControllerTest/withNib/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPDocumentControllerTest/withNib/index.html b/Tests/Manual/CPDocumentControllerTest/withNib/index.html
index b03674ecf..e833b6ee0 100644
--- a/Tests/Manual/CPDocumentControllerTest/withNib/index.html
+++ b/Tests/Manual/CPDocumentControllerTest/withNib/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPDocumentControllerTest/withoutNib/index-debug.html b/Tests/Manual/CPDocumentControllerTest/withoutNib/index-debug.html
index 8435cee74..f73a77933 100644
--- a/Tests/Manual/CPDocumentControllerTest/withoutNib/index-debug.html
+++ b/Tests/Manual/CPDocumentControllerTest/withoutNib/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPDocumentControllerTest/withoutNib/index.html b/Tests/Manual/CPDocumentControllerTest/withoutNib/index.html
index b03674ecf..e833b6ee0 100644
--- a/Tests/Manual/CPDocumentControllerTest/withoutNib/index.html
+++ b/Tests/Manual/CPDocumentControllerTest/withoutNib/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPFormatterTest/index-debug.html b/Tests/Manual/CPFormatterTest/index-debug.html
index 106d36a06..d1b117f8a 100644
--- a/Tests/Manual/CPFormatterTest/index-debug.html
+++ b/Tests/Manual/CPFormatterTest/index-debug.html
@@ -21,9 +21,9 @@
         <link rel="apple-touch-startup-image" href="Resources/default.png" />
 
         <title>CPFormatterTest</title>
-        
+
         <script src="Resources/date-functions.js" type="text/javascript" charset="utf-8"></script>
-        
+
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks"];
@@ -86,7 +86,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPFormatterTest/index.html b/Tests/Manual/CPFormatterTest/index.html
index 80e399ef6..28f212619 100644
--- a/Tests/Manual/CPFormatterTest/index.html
+++ b/Tests/Manual/CPFormatterTest/index.html
@@ -21,7 +21,7 @@
         <link rel="apple-touch-startup-image" href="Resources/default.png" />
 
         <title>CPFormatterTest</title>
-        
+
         <script src="Resources/date-functions.js" type="text/javascript" charset="utf-8"></script>
 
         <script type="text/javascript">
@@ -60,7 +60,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPGraphicsTest/index-debug.html b/Tests/Manual/CPGraphicsTest/index-debug.html
index d286fc92d..8ff83bff3 100644
--- a/Tests/Manual/CPGraphicsTest/index-debug.html
+++ b/Tests/Manual/CPGraphicsTest/index-debug.html
@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPGraphicsTest/index.html b/Tests/Manual/CPGraphicsTest/index.html
index 2af35091e..9855ff52f 100644
--- a/Tests/Manual/CPGraphicsTest/index.html
+++ b/Tests/Manual/CPGraphicsTest/index.html
@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPImageViewAlignmentScaling/index-debug.html b/Tests/Manual/CPImageViewAlignmentScaling/index-debug.html
index 5ef913cb9..25cbf8af5 100644
--- a/Tests/Manual/CPImageViewAlignmentScaling/index-debug.html
+++ b/Tests/Manual/CPImageViewAlignmentScaling/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPImageViewAlignmentScaling/index.html b/Tests/Manual/CPImageViewAlignmentScaling/index.html
index 583b7fdd9..e0aad1756 100644
--- a/Tests/Manual/CPImageViewAlignmentScaling/index.html
+++ b/Tests/Manual/CPImageViewAlignmentScaling/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPImageViewTest/index-debug.html b/Tests/Manual/CPImageViewTest/index-debug.html
index a1d7c32a9..b304f1c39 100644
--- a/Tests/Manual/CPImageViewTest/index-debug.html
+++ b/Tests/Manual/CPImageViewTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPImageViewTest/index.html b/Tests/Manual/CPImageViewTest/index.html
index 0d59e5238..cc8dd3eec 100644
--- a/Tests/Manual/CPImageViewTest/index.html
+++ b/Tests/Manual/CPImageViewTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPImageViewbindingsTest/index-debug.html b/Tests/Manual/CPImageViewbindingsTest/index-debug.html
index 9781012c7..7e983997b 100644
--- a/Tests/Manual/CPImageViewbindingsTest/index-debug.html
+++ b/Tests/Manual/CPImageViewbindingsTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPImageViewbindingsTest/index.html b/Tests/Manual/CPImageViewbindingsTest/index.html
index 6ff6852a4..c73fad761 100644
--- a/Tests/Manual/CPImageViewbindingsTest/index.html
+++ b/Tests/Manual/CPImageViewbindingsTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPLevelIndicator/index-debug.html b/Tests/Manual/CPLevelIndicator/index-debug.html
index 2a39dc38f..1097bcf1b 100644
--- a/Tests/Manual/CPLevelIndicator/index-debug.html
+++ b/Tests/Manual/CPLevelIndicator/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPLevelIndicator/index.html b/Tests/Manual/CPLevelIndicator/index.html
index 5da5ba3cc..26086f976 100644
--- a/Tests/Manual/CPLevelIndicator/index.html
+++ b/Tests/Manual/CPLevelIndicator/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPLogTest/index-debug.html b/Tests/Manual/CPLogTest/index-debug.html
index 1b13a2b2b..69b7c0047 100644
--- a/Tests/Manual/CPLogTest/index-debug.html
+++ b/Tests/Manual/CPLogTest/index-debug.html
@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPLogTest/index.html b/Tests/Manual/CPLogTest/index.html
index 220bc9a8e..b1eef3174 100644
--- a/Tests/Manual/CPLogTest/index.html
+++ b/Tests/Manual/CPLogTest/index.html
@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPMenuKeyEquivalents/index-debug.html b/Tests/Manual/CPMenuKeyEquivalents/index-debug.html
index 86b7db4e6..0d31f8d54 100644
--- a/Tests/Manual/CPMenuKeyEquivalents/index-debug.html
+++ b/Tests/Manual/CPMenuKeyEquivalents/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPMenuKeyEquivalents/index.html b/Tests/Manual/CPMenuKeyEquivalents/index.html
index b91ca2252..db4ab645f 100644
--- a/Tests/Manual/CPMenuKeyEquivalents/index.html
+++ b/Tests/Manual/CPMenuKeyEquivalents/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPMenuRemoveAllTest/index-debug.html b/Tests/Manual/CPMenuRemoveAllTest/index-debug.html
index bb52b4dad..ddea8eb05 100644
--- a/Tests/Manual/CPMenuRemoveAllTest/index-debug.html
+++ b/Tests/Manual/CPMenuRemoveAllTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPMenuRemoveAllTest/index.html b/Tests/Manual/CPMenuRemoveAllTest/index.html
index a748831e5..d6a5a8915 100644
--- a/Tests/Manual/CPMenuRemoveAllTest/index.html
+++ b/Tests/Manual/CPMenuRemoveAllTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPMenuTest/index-debug.html b/Tests/Manual/CPMenuTest/index-debug.html
index 5109ce66d..a8f427610 100644
--- a/Tests/Manual/CPMenuTest/index-debug.html
+++ b/Tests/Manual/CPMenuTest/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPMenuTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPMenuTest/index.html b/Tests/Manual/CPMenuTest/index.html
index e5578e076..0e112f0a5 100644
--- a/Tests/Manual/CPMenuTest/index.html
+++ b/Tests/Manual/CPMenuTest/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPMenuTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPOutlineViewCibTest/index-debug.html b/Tests/Manual/CPOutlineViewCibTest/index-debug.html
index fc4af497d..1e85b1d0f 100644
--- a/Tests/Manual/CPOutlineViewCibTest/index-debug.html
+++ b/Tests/Manual/CPOutlineViewCibTest/index-debug.html
@@ -26,7 +26,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPOutlineViewCibTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPOutlineViewCibTest/index.html b/Tests/Manual/CPOutlineViewCibTest/index.html
index 547dcc523..3d3fde819 100644
--- a/Tests/Manual/CPOutlineViewCibTest/index.html
+++ b/Tests/Manual/CPOutlineViewCibTest/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPOutlineViewCibTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPOutlineViewTest/index-debug.html b/Tests/Manual/CPOutlineViewTest/index-debug.html
index 30fd821ac..2970da2bc 100644
--- a/Tests/Manual/CPOutlineViewTest/index-debug.html
+++ b/Tests/Manual/CPOutlineViewTest/index-debug.html
@@ -19,24 +19,24 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
-        
+
         <script type = "text/javascript">
             objj_msgSend_reset();
-            
+
             // DEBUG OPTIONS:
-            
+
             // Uncomment to enable printing of backtraces on exceptions:
             objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to enable runtime type checking:
             // objj_msgSend_decorate(objj_typecheck_decorator);
-            
+
             // Uncomment (along with both above) to print backtraces on type check errors:
             //objj_typecheck_prints_backtrace = true;
         </script>
-        
+
         <style type = "text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -61,12 +61,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading outlineview...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPOutlineViewTest/index.html b/Tests/Manual/CPOutlineViewTest/index.html
index e0a035c11..b777fd706 100644
--- a/Tests/Manual/CPOutlineViewTest/index.html
+++ b/Tests/Manual/CPOutlineViewTest/index.html
@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -45,12 +45,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading outlineview...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPopUpButtonBindings/index-debug.html b/Tests/Manual/CPPopUpButtonBindings/index-debug.html
index 1d257d406..0ad0aff89 100644
--- a/Tests/Manual/CPPopUpButtonBindings/index-debug.html
+++ b/Tests/Manual/CPPopUpButtonBindings/index-debug.html
@@ -27,7 +27,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -37,7 +37,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -54,7 +54,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -80,12 +80,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPPopUpButtonBindings...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPopUpButtonBindings/index.html b/Tests/Manual/CPPopUpButtonBindings/index.html
index 2114299d9..a997a675f 100644
--- a/Tests/Manual/CPPopUpButtonBindings/index.html
+++ b/Tests/Manual/CPPopUpButtonBindings/index.html
@@ -26,7 +26,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -54,12 +54,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPPopUpButtonBindings...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPopUpButtonTest/index-debug.html b/Tests/Manual/CPPopUpButtonTest/index-debug.html
index 44655171f..aa6461fdc 100644
--- a/Tests/Manual/CPPopUpButtonTest/index-debug.html
+++ b/Tests/Manual/CPPopUpButtonTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPopUpButtonTest/index.html b/Tests/Manual/CPPopUpButtonTest/index.html
index ca5a18889..1f2fb16e4 100644
--- a/Tests/Manual/CPPopUpButtonTest/index.html
+++ b/Tests/Manual/CPPopUpButtonTest/index.html
@@ -56,7 +56,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPopover/index-debug.html b/Tests/Manual/CPPopover/index-debug.html
index 2f7ed22a6..c8bfddf86 100644
--- a/Tests/Manual/CPPopover/index-debug.html
+++ b/Tests/Manual/CPPopover/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPopover/index.html b/Tests/Manual/CPPopover/index.html
index 20629ad2d..87cbb633f 100644
--- a/Tests/Manual/CPPopover/index.html
+++ b/Tests/Manual/CPPopover/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPredicateEditorCibTest/index-debug.html b/Tests/Manual/CPPredicateEditorCibTest/index-debug.html
index a35f6f935..c15f34a63 100644
--- a/Tests/Manual/CPPredicateEditorCibTest/index-debug.html
+++ b/Tests/Manual/CPPredicateEditorCibTest/index-debug.html
@@ -27,9 +27,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -51,7 +51,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -77,12 +77,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPPredicateEditorTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPredicateEditorCibTest/index.html b/Tests/Manual/CPPredicateEditorCibTest/index.html
index e1730c3c2..f4100327f 100644
--- a/Tests/Manual/CPPredicateEditorCibTest/index.html
+++ b/Tests/Manual/CPPredicateEditorCibTest/index.html
@@ -26,7 +26,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -54,12 +54,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPPredicateEditorTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPProgressIndicator/index-debug.html b/Tests/Manual/CPProgressIndicator/index-debug.html
index 1055afb39..b97c85b5c 100644
--- a/Tests/Manual/CPProgressIndicator/index-debug.html
+++ b/Tests/Manual/CPProgressIndicator/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPProgressIndicator/index.html b/Tests/Manual/CPProgressIndicator/index.html
index 461285189..d6c5ab5bb 100644
--- a/Tests/Manual/CPProgressIndicator/index.html
+++ b/Tests/Manual/CPProgressIndicator/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPropertyListSerializationTest/index-debug.html b/Tests/Manual/CPPropertyListSerializationTest/index-debug.html
index 0ab15ee27..5334885e6 100644
--- a/Tests/Manual/CPPropertyListSerializationTest/index-debug.html
+++ b/Tests/Manual/CPPropertyListSerializationTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPPropertyListSerializationTest/index.html b/Tests/Manual/CPPropertyListSerializationTest/index.html
index 827d3bbbe..1f6923ace 100644
--- a/Tests/Manual/CPPropertyListSerializationTest/index.html
+++ b/Tests/Manual/CPPropertyListSerializationTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPRuleEditorCibTest/index-debug.html b/Tests/Manual/CPRuleEditorCibTest/index-debug.html
index 1d4a53273..89bd441c7 100644
--- a/Tests/Manual/CPRuleEditorCibTest/index-debug.html
+++ b/Tests/Manual/CPRuleEditorCibTest/index-debug.html
@@ -27,7 +27,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -37,7 +37,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -54,7 +54,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -80,12 +80,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPRuleEditorCibTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPRuleEditorCibTest/index.html b/Tests/Manual/CPRuleEditorCibTest/index.html
index 50db3f53f..26facfdda 100644
--- a/Tests/Manual/CPRuleEditorCibTest/index.html
+++ b/Tests/Manual/CPRuleEditorCibTest/index.html
@@ -26,7 +26,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -54,12 +54,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPRuleEditorCibTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPScrollView/index-debug.html b/Tests/Manual/CPScrollView/index-debug.html
index 35b5913c5..1f2fe33c9 100644
--- a/Tests/Manual/CPScrollView/index-debug.html
+++ b/Tests/Manual/CPScrollView/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading Scrolling...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPScrollView/index.html b/Tests/Manual/CPScrollView/index.html
index 9f2c9fffd..62ab8c7fb 100644
--- a/Tests/Manual/CPScrollView/index.html
+++ b/Tests/Manual/CPScrollView/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading Scrolling...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPScrollView2/index-debug.html b/Tests/Manual/CPScrollView2/index-debug.html
index 0b45db901..e5d7a3445 100644
--- a/Tests/Manual/CPScrollView2/index-debug.html
+++ b/Tests/Manual/CPScrollView2/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPScrollView2/index.html b/Tests/Manual/CPScrollView2/index.html
index 426f900a2..4d99b1077 100644
--- a/Tests/Manual/CPScrollView2/index.html
+++ b/Tests/Manual/CPScrollView2/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPSearchField/index-debug.html b/Tests/Manual/CPSearchField/index-debug.html
index 41ff331a2..7b588b988 100644
--- a/Tests/Manual/CPSearchField/index-debug.html
+++ b/Tests/Manual/CPSearchField/index-debug.html
@@ -26,7 +26,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPSearchField...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPSearchField/index.html b/Tests/Manual/CPSearchField/index.html
index 1d37b00fd..f3a34919e 100644
--- a/Tests/Manual/CPSearchField/index.html
+++ b/Tests/Manual/CPSearchField/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPSearchField...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPSegmentedControlTest/index-debug.html b/Tests/Manual/CPSegmentedControlTest/index-debug.html
index 2c99f7310..39d14e30e 100644
--- a/Tests/Manual/CPSegmentedControlTest/index-debug.html
+++ b/Tests/Manual/CPSegmentedControlTest/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPSegmentedControlTest/index.html b/Tests/Manual/CPSegmentedControlTest/index.html
index ad0a11813..9f04cb8aa 100644
--- a/Tests/Manual/CPSegmentedControlTest/index.html
+++ b/Tests/Manual/CPSegmentedControlTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPSoundTest/index-debug.html b/Tests/Manual/CPSoundTest/index-debug.html
index c5a041a39..828d60ea2 100644
--- a/Tests/Manual/CPSoundTest/index-debug.html
+++ b/Tests/Manual/CPSoundTest/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPSoundTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPSoundTest/index.html b/Tests/Manual/CPSoundTest/index.html
index 2846cd242..32df44fb3 100644
--- a/Tests/Manual/CPSoundTest/index.html
+++ b/Tests/Manual/CPSoundTest/index.html
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPSoundTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPSplitViewTest/index-debug.html b/Tests/Manual/CPSplitViewTest/index-debug.html
index 3f4da4a39..59adbbf9e 100644
--- a/Tests/Manual/CPSplitViewTest/index-debug.html
+++ b/Tests/Manual/CPSplitViewTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPSplitViewTest/index.html b/Tests/Manual/CPSplitViewTest/index.html
index 96c5c30ba..f88dff0f4 100644
--- a/Tests/Manual/CPSplitViewTest/index.html
+++ b/Tests/Manual/CPSplitViewTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPStepperBindings/index-debug.html b/Tests/Manual/CPStepperBindings/index-debug.html
index a887b15b5..4977a329e 100644
--- a/Tests/Manual/CPStepperBindings/index-debug.html
+++ b/Tests/Manual/CPStepperBindings/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPStepperBindings/index.html b/Tests/Manual/CPStepperBindings/index.html
index 32c2114a4..9782d3281 100644
--- a/Tests/Manual/CPStepperBindings/index.html
+++ b/Tests/Manual/CPStepperBindings/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPStepperNibTest/index-debug.html b/Tests/Manual/CPStepperNibTest/index-debug.html
index 4054fd224..5d256189d 100644
--- a/Tests/Manual/CPStepperNibTest/index-debug.html
+++ b/Tests/Manual/CPStepperNibTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPStepperNibTest/index.html b/Tests/Manual/CPStepperNibTest/index.html
index 73a39bce6..0bd329799 100644
--- a/Tests/Manual/CPStepperNibTest/index.html
+++ b/Tests/Manual/CPStepperNibTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTabView2/index-debug.html b/Tests/Manual/CPTabView2/index-debug.html
index 5c20150a2..e1bbb8d33 100644
--- a/Tests/Manual/CPTabView2/index-debug.html
+++ b/Tests/Manual/CPTabView2/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPTabView2...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTabView2/index.html b/Tests/Manual/CPTabView2/index.html
index 9de1f045b..95c5dee7d 100644
--- a/Tests/Manual/CPTabView2/index.html
+++ b/Tests/Manual/CPTabView2/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPTabView2...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTabViewNib/index-debug.html b/Tests/Manual/CPTabViewNib/index-debug.html
index 9675166d1..8caf0bb8f 100644
--- a/Tests/Manual/CPTabViewNib/index-debug.html
+++ b/Tests/Manual/CPTabViewNib/index-debug.html
@@ -26,7 +26,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPTabViewNib...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTabViewNib/index.html b/Tests/Manual/CPTabViewNib/index.html
index 85bd75fcf..ef9d8b592 100644
--- a/Tests/Manual/CPTabViewNib/index.html
+++ b/Tests/Manual/CPTabViewNib/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPTabViewNib...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTableViewGroupRows/index-debug.html b/Tests/Manual/CPTableViewGroupRows/index-debug.html
index 820a0d5a3..a6c743171 100644
--- a/Tests/Manual/CPTableViewGroupRows/index-debug.html
+++ b/Tests/Manual/CPTableViewGroupRows/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTableViewGroupRows/index.html b/Tests/Manual/CPTableViewGroupRows/index.html
index dd7a2e23b..df695ceb7 100644
--- a/Tests/Manual/CPTableViewGroupRows/index.html
+++ b/Tests/Manual/CPTableViewGroupRows/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTextField/index-debug.html b/Tests/Manual/CPTextField/index-debug.html
index 57a267266..36a07aa27 100644
--- a/Tests/Manual/CPTextField/index-debug.html
+++ b/Tests/Manual/CPTextField/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPTextField...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTextField/index.html b/Tests/Manual/CPTextField/index.html
index c09065af8..b18467d00 100644
--- a/Tests/Manual/CPTextField/index.html
+++ b/Tests/Manual/CPTextField/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPTextField...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTextFieldHeightTest/index-debug.html b/Tests/Manual/CPTextFieldHeightTest/index-debug.html
index 3dbe60d0f..9a7feb2ab 100644
--- a/Tests/Manual/CPTextFieldHeightTest/index-debug.html
+++ b/Tests/Manual/CPTextFieldHeightTest/index-debug.html
@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTextFieldHeightTest/index.html b/Tests/Manual/CPTextFieldHeightTest/index.html
index 211be1ca5..b83fed1fa 100644
--- a/Tests/Manual/CPTextFieldHeightTest/index.html
+++ b/Tests/Manual/CPTextFieldHeightTest/index.html
@@ -49,7 +49,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTokenFieldTest/index-debug.html b/Tests/Manual/CPTokenFieldTest/index-debug.html
index 0fe9fe31d..8e19cc826 100644
--- a/Tests/Manual/CPTokenFieldTest/index-debug.html
+++ b/Tests/Manual/CPTokenFieldTest/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPTokenFieldTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPTokenFieldTest/index.html b/Tests/Manual/CPTokenFieldTest/index.html
index 32f6efd46..988f4eb7e 100644
--- a/Tests/Manual/CPTokenFieldTest/index.html
+++ b/Tests/Manual/CPTokenFieldTest/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPTokenFieldTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPToolTip/index-debug.html b/Tests/Manual/CPToolTip/index-debug.html
index ea9e7cf34..989b3bf61 100644
--- a/Tests/Manual/CPToolTip/index-debug.html
+++ b/Tests/Manual/CPToolTip/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPToolTip/index.html b/Tests/Manual/CPToolTip/index.html
index 224a5034e..86f03ebbd 100644
--- a/Tests/Manual/CPToolTip/index.html
+++ b/Tests/Manual/CPToolTip/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPToolbarTest/index-debug.html b/Tests/Manual/CPToolbarTest/index-debug.html
index 8daf532a4..757e3211e 100644
--- a/Tests/Manual/CPToolbarTest/index-debug.html
+++ b/Tests/Manual/CPToolbarTest/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPToolbarTest/index.html b/Tests/Manual/CPToolbarTest/index.html
index 38b4c27be..83e243181 100644
--- a/Tests/Manual/CPToolbarTest/index.html
+++ b/Tests/Manual/CPToolbarTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPUserDefaults/index-debug.html b/Tests/Manual/CPUserDefaults/index-debug.html
index 2345d36cd..51b93ad1d 100644
--- a/Tests/Manual/CPUserDefaults/index-debug.html
+++ b/Tests/Manual/CPUserDefaults/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPUserDefaults...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPUserDefaults/index.html b/Tests/Manual/CPUserDefaults/index.html
index 0c7d99da7..03fc990c9 100644
--- a/Tests/Manual/CPUserDefaults/index.html
+++ b/Tests/Manual/CPUserDefaults/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPUserDefaults...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPUserDefaultsControllerTest/index-debug.html b/Tests/Manual/CPUserDefaultsControllerTest/index-debug.html
index eba4226b6..c63d083d1 100644
--- a/Tests/Manual/CPUserDefaultsControllerTest/index-debug.html
+++ b/Tests/Manual/CPUserDefaultsControllerTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPUserDefaultsControllerTest/index.html b/Tests/Manual/CPUserDefaultsControllerTest/index.html
index 50e6efbc0..78f423d41 100644
--- a/Tests/Manual/CPUserDefaultsControllerTest/index.html
+++ b/Tests/Manual/CPUserDefaultsControllerTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPWebViewTest/AppController.j b/Tests/Manual/CPWebViewTest/AppController.j
index 39ee8a92d..771fec0f1 100644
--- a/Tests/Manual/CPWebViewTest/AppController.j
+++ b/Tests/Manual/CPWebViewTest/AppController.j
@@ -26,11 +26,11 @@
     [[theWindow contentView] setBackgroundColor:[CPColor grayColor]];
 
     [webView1 setScrollMode:CPWebViewScrollAuto];
-    [webView1 loadHTMLString:"<html><body style='background-color:transparent'><p>This web view should have a coloured background.</p><img src='http://cappuccino.org/images/cappuccino-icon.png'><img src='http://cappuccino.org/images/cappuccino-icon.png'></body></html>"];
+    [webView1 loadHTMLString:"<html><body style='background-color:transparent'><p>This web view should have a coloured background.</p><img src='http://cappuccino-project.org/images/cappuccino-icon.png'><img src='http://cappuccino-project.org/images/cappuccino-icon.png'></body></html>"];
     [webView1 setBackgroundColor:[CPColor orangeColor]];
 
     [webView2 setScrollMode:CPWebViewScrollNative];
-    [webView2 loadHTMLString:"<html><body style='background-color:transparent'><p>This web view should be transparent.</p><img src='http://cappuccino.org/images/cappuccino-icon.png'><img src='http://cappuccino.org/images/cappuccino-icon.png'></body></html>"];
+    [webView2 loadHTMLString:"<html><body style='background-color:transparent'><p>This web view should be transparent.</p><img src='http://cappuccino-project.org/images/cappuccino-icon.png'><img src='http://cappuccino-project.org/images/cappuccino-icon.png'></body></html>"];
     [webView2 setDrawsBackground:NO];
     [webView2 setBackgroundColor:[CPColor clearColor]];
 
@@ -49,10 +49,10 @@
     if (document.location.href.indexOf('file://') == 0)
         alert("This test should be run from http://, not file:// in order to properly enable SOP testing.");
     [webView5 setScrollMode:CPWebViewScrollAuto];
-    [webView5 setMainFrameURL:"http://www.cappuccino.org"];
+    [webView5 setMainFrameURL:"http://www.cappuccino-project.org"];
 
     [webView6 setScrollMode:CPWebViewScrollAppKit];
-    [webView6 setMainFrameURL:"http://www.cappuccino.org"];
+    [webView6 setMainFrameURL:"http://www.cappuccino-project.org"];
 }
 
 - (void)clearAll:(id)sender
diff --git a/Tests/Manual/CPWebViewTest/Resources/hello_world.html b/Tests/Manual/CPWebViewTest/Resources/hello_world.html
index 5a1b0a7b4..e1400ab49 100644
--- a/Tests/Manual/CPWebViewTest/Resources/hello_world.html
+++ b/Tests/Manual/CPWebViewTest/Resources/hello_world.html
@@ -5,7 +5,7 @@
 
 <p>After you sent me your money, please look at this pretty Cappuccino machine.</p>
 
-<img src='http://cappuccino.org/images/cappuccino-icon.png'>
+<img src='http://cappuccino-project.org/images/cappuccino-icon.png'>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/Tests/Manual/CPWebViewTest/index-debug.html b/Tests/Manual/CPWebViewTest/index-debug.html
index 6c9b61a03..6aba07546 100644
--- a/Tests/Manual/CPWebViewTest/index-debug.html
+++ b/Tests/Manual/CPWebViewTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPWebViewTest/index.html b/Tests/Manual/CPWebViewTest/index.html
index 18a85d5eb..6a4475958 100644
--- a/Tests/Manual/CPWebViewTest/index.html
+++ b/Tests/Manual/CPWebViewTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPWebViewTest2/AppController.j b/Tests/Manual/CPWebViewTest2/AppController.j
index 5b56b9d2f..445a632ac 100644
--- a/Tests/Manual/CPWebViewTest2/AppController.j
+++ b/Tests/Manual/CPWebViewTest2/AppController.j
@@ -47,7 +47,7 @@
     webview2 = [[CPWebView alloc] initWithFrame:CGRectMake([contentView frameSize].width / 2 + 10, 40, [contentView frameSize].width / 2 - 10, [contentView frameSize].height - 40)];
 	[webview2 setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
 	[webview2 setHidden:YES];
-	[webview2 setMainFrameURL:"http://www.cappuccino.org"];
+	[webview2 setMainFrameURL:"http://www.cappuccino-project.org"];
 	[contentView addSubview:webview2];
 
     [theWindow orderFront:self];
@@ -66,4 +66,4 @@
 	[webview2 setHidden:NO];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/Tests/Manual/CPWebViewTest2/index-debug.html b/Tests/Manual/CPWebViewTest2/index-debug.html
index 02130b60c..fab528613 100644
--- a/Tests/Manual/CPWebViewTest2/index-debug.html
+++ b/Tests/Manual/CPWebViewTest2/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPWebViewTest2/index.html b/Tests/Manual/CPWebViewTest2/index.html
index fbb8d75b9..a2b5829de 100644
--- a/Tests/Manual/CPWebViewTest2/index.html
+++ b/Tests/Manual/CPWebViewTest2/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPWindowMovableTest/index-debug.html b/Tests/Manual/CPWindowMovableTest/index-debug.html
index 048300db6..6dd11647b 100644
--- a/Tests/Manual/CPWindowMovableTest/index-debug.html
+++ b/Tests/Manual/CPWindowMovableTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPWindowMovableTest/index.html b/Tests/Manual/CPWindowMovableTest/index.html
index 0fcbd5fd4..48384810c 100644
--- a/Tests/Manual/CPWindowMovableTest/index.html
+++ b/Tests/Manual/CPWindowMovableTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPWindowResizeStyle/index-debug.html b/Tests/Manual/CPWindowResizeStyle/index-debug.html
index 514cce3db..8de964c5b 100644
--- a/Tests/Manual/CPWindowResizeStyle/index-debug.html
+++ b/Tests/Manual/CPWindowResizeStyle/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/CPWindowResizeStyle/index.html b/Tests/Manual/CPWindowResizeStyle/index.html
index 4ac50e53a..69456474f 100644
--- a/Tests/Manual/CPWindowResizeStyle/index.html
+++ b/Tests/Manual/CPWindowResizeStyle/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/ContinuouslyUpdatesValueBinding/index-debug.html b/Tests/Manual/ContinuouslyUpdatesValueBinding/index-debug.html
index 6b5114578..0395aa2b9 100644
--- a/Tests/Manual/ContinuouslyUpdatesValueBinding/index-debug.html
+++ b/Tests/Manual/ContinuouslyUpdatesValueBinding/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/ContinuouslyUpdatesValueBinding/index.html b/Tests/Manual/ContinuouslyUpdatesValueBinding/index.html
index e588896ec..31b5eb785 100644
--- a/Tests/Manual/ContinuouslyUpdatesValueBinding/index.html
+++ b/Tests/Manual/ContinuouslyUpdatesValueBinding/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/FF4096Test/index-debug.html b/Tests/Manual/FF4096Test/index-debug.html
index 93f09f3ca..cd522a8f3 100755
--- a/Tests/Manual/FF4096Test/index-debug.html
+++ b/Tests/Manual/FF4096Test/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading FFTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/FF4096Test/index.html b/Tests/Manual/FF4096Test/index.html
index 9df1b5369..13a118179 100755
--- a/Tests/Manual/FF4096Test/index.html
+++ b/Tests/Manual/FF4096Test/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading FFTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/FontEnhancementTest/index-debug.html b/Tests/Manual/FontEnhancementTest/index-debug.html
index 30f87d1d5..593d51edc 100644
--- a/Tests/Manual/FontEnhancementTest/index-debug.html
+++ b/Tests/Manual/FontEnhancementTest/index-debug.html
@@ -86,7 +86,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/FontEnhancementTest/index.html b/Tests/Manual/FontEnhancementTest/index.html
index 5fa2df0fb..426e2f3d8 100644
--- a/Tests/Manual/FontEnhancementTest/index.html
+++ b/Tests/Manual/FontEnhancementTest/index.html
@@ -60,7 +60,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/FontMetricsExplorer/index-debug.html b/Tests/Manual/FontMetricsExplorer/index-debug.html
index c202f4733..c6ae10bd7 100644
--- a/Tests/Manual/FontMetricsExplorer/index-debug.html
+++ b/Tests/Manual/FontMetricsExplorer/index-debug.html
@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/FontMetricsExplorer/index.html b/Tests/Manual/FontMetricsExplorer/index.html
index e9a81c538..e72a21f62 100644
--- a/Tests/Manual/FontMetricsExplorer/index.html
+++ b/Tests/Manual/FontMetricsExplorer/index.html
@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/KeyEquivalents/index-debug.html b/Tests/Manual/KeyEquivalents/index-debug.html
index 9bf14cec7..98b8fc8c6 100644
--- a/Tests/Manual/KeyEquivalents/index-debug.html
+++ b/Tests/Manual/KeyEquivalents/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading cappuccino-keyequivalents...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/KeyEquivalents/index.html b/Tests/Manual/KeyEquivalents/index.html
index 47f0af9fa..dde8ace3c 100644
--- a/Tests/Manual/KeyEquivalents/index.html
+++ b/Tests/Manual/KeyEquivalents/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading cappuccino-keyequivalents...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/KeyViewLoopTest/index-debug.html b/Tests/Manual/KeyViewLoopTest/index-debug.html
index 6d7c42403..47971c639 100644
--- a/Tests/Manual/KeyViewLoopTest/index-debug.html
+++ b/Tests/Manual/KeyViewLoopTest/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/KeyViewLoopTest/index.html b/Tests/Manual/KeyViewLoopTest/index.html
index 340fb75b1..6f77164fb 100644
--- a/Tests/Manual/KeyViewLoopTest/index.html
+++ b/Tests/Manual/KeyViewLoopTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/LayoutTest/index-debug.html b/Tests/Manual/LayoutTest/index-debug.html
index f0d24d464..9a4b7018f 100644
--- a/Tests/Manual/LayoutTest/index-debug.html
+++ b/Tests/Manual/LayoutTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/LayoutTest/index.html b/Tests/Manual/LayoutTest/index.html
index bdf3fc53a..eae1b83f8 100644
--- a/Tests/Manual/LayoutTest/index.html
+++ b/Tests/Manual/LayoutTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/LoadTimeTest/index-debug.html b/Tests/Manual/LoadTimeTest/index-debug.html
index e72864f5c..407368f65 100644
--- a/Tests/Manual/LoadTimeTest/index-debug.html
+++ b/Tests/Manual/LoadTimeTest/index-debug.html
@@ -20,24 +20,24 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
-        
+
         <script type = "text/javascript">
             objj_msgSend_reset();
-            
+
             // DEBUG OPTIONS:
-            
+
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to enable runtime type checking:
             //objj_msgSend_decorate(objj_typecheck_decorator);
-            
+
             // Uncomment (along with both above) to print backtraces on type check errors:
             //objj_typecheck_prints_backtrace = true;
         </script>
-        
+
         <style type = "text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -63,12 +63,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading LoadTimeTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/LoadTimeTest/index.html b/Tests/Manual/LoadTimeTest/index.html
index 29f7170bd..08ff8f5c6 100644
--- a/Tests/Manual/LoadTimeTest/index.html
+++ b/Tests/Manual/LoadTimeTest/index.html
@@ -20,7 +20,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -48,12 +48,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading LoadTimeTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/LongBindings/index-debug.html b/Tests/Manual/LongBindings/index-debug.html
index 33c74af77..29c1f8447 100644
--- a/Tests/Manual/LongBindings/index-debug.html
+++ b/Tests/Manual/LongBindings/index-debug.html
@@ -26,7 +26,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading bindings-bug...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/LongBindings/index.html b/Tests/Manual/LongBindings/index.html
index 78e3372b5..f267f39e7 100644
--- a/Tests/Manual/LongBindings/index.html
+++ b/Tests/Manual/LongBindings/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading bindings-bug...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/NSBoxTest/index-debug.html b/Tests/Manual/NSBoxTest/index-debug.html
index a0fa54c65..9dd3bf0ab 100644
--- a/Tests/Manual/NSBoxTest/index-debug.html
+++ b/Tests/Manual/NSBoxTest/index-debug.html
@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/NSBoxTest/index.html b/Tests/Manual/NSBoxTest/index.html
index acc894909..5178d2869 100644
--- a/Tests/Manual/NSBoxTest/index.html
+++ b/Tests/Manual/NSBoxTest/index.html
@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/NewTextFieldBezel/index-debug.html b/Tests/Manual/NewTextFieldBezel/index-debug.html
index 4c283399a..48c27eea6 100644
--- a/Tests/Manual/NewTextFieldBezel/index-debug.html
+++ b/Tests/Manual/NewTextFieldBezel/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/NewTextFieldBezel/index.html b/Tests/Manual/NewTextFieldBezel/index.html
index d288174a1..6bee03c49 100644
--- a/Tests/Manual/NewTextFieldBezel/index.html
+++ b/Tests/Manual/NewTextFieldBezel/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/Nib2CibAlignment/index-debug.html b/Tests/Manual/Nib2CibAlignment/index-debug.html
index 98d814738..a4f8d9c2b 100644
--- a/Tests/Manual/Nib2CibAlignment/index-debug.html
+++ b/Tests/Manual/Nib2CibAlignment/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/Nib2CibAlignment/index.html b/Tests/Manual/Nib2CibAlignment/index.html
index 1e3a9f4e4..e386d4a4f 100644
--- a/Tests/Manual/Nib2CibAlignment/index.html
+++ b/Tests/Manual/Nib2CibAlignment/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/Nib2CibBaselineAlignementTest/index-debug.html b/Tests/Manual/Nib2CibBaselineAlignementTest/index-debug.html
index 55a2cb592..99ef57a32 100644
--- a/Tests/Manual/Nib2CibBaselineAlignementTest/index-debug.html
+++ b/Tests/Manual/Nib2CibBaselineAlignementTest/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/Nib2CibBaselineAlignementTest/index.html b/Tests/Manual/Nib2CibBaselineAlignementTest/index.html
index 7c0d18ce7..fa46309ff 100644
--- a/Tests/Manual/Nib2CibBaselineAlignementTest/index.html
+++ b/Tests/Manual/Nib2CibBaselineAlignementTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/NibAppRemixed/index-debug.html b/Tests/Manual/NibAppRemixed/index-debug.html
index e2de94fff..43b89f4df 100644
--- a/Tests/Manual/NibAppRemixed/index-debug.html
+++ b/Tests/Manual/NibAppRemixed/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/NibAppRemixed/index.html b/Tests/Manual/NibAppRemixed/index.html
index 4be7863dc..9eed31aea 100644
--- a/Tests/Manual/NibAppRemixed/index.html
+++ b/Tests/Manual/NibAppRemixed/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/PatternFillTest/index-debug.html b/Tests/Manual/PatternFillTest/index-debug.html
index b5f2c8720..5d5c3884f 100644
--- a/Tests/Manual/PatternFillTest/index-debug.html
+++ b/Tests/Manual/PatternFillTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/PatternFillTest/index.html b/Tests/Manual/PatternFillTest/index.html
index 103eb5bc1..43c78f997 100644
--- a/Tests/Manual/PatternFillTest/index.html
+++ b/Tests/Manual/PatternFillTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/PlatformWindows/index-debug.html b/Tests/Manual/PlatformWindows/index-debug.html
index bf6ec0aa3..7af8f9aff 100644
--- a/Tests/Manual/PlatformWindows/index-debug.html
+++ b/Tests/Manual/PlatformWindows/index-debug.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -46,12 +46,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading PlatformWindows...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/PlatformWindows/index.html b/Tests/Manual/PlatformWindows/index.html
index b76b2ab9a..b1ddd94b6 100644
--- a/Tests/Manual/PlatformWindows/index.html
+++ b/Tests/Manual/PlatformWindows/index.html
@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -45,12 +45,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading PlatformWindows...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/ScrollviewTheming/index-debug.html b/Tests/Manual/ScrollviewTheming/index-debug.html
index 6e804b729..92795e08a 100644
--- a/Tests/Manual/ScrollviewTheming/index-debug.html
+++ b/Tests/Manual/ScrollviewTheming/index-debug.html
@@ -26,7 +26,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading ScrollviewTheming...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/ScrollviewTheming/index.html b/Tests/Manual/ScrollviewTheming/index.html
index 70a6a3603..8ca6ef9ac 100644
--- a/Tests/Manual/ScrollviewTheming/index.html
+++ b/Tests/Manual/ScrollviewTheming/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading ScrollviewTheming...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/SmartFoldersDemo/index-debug.html b/Tests/Manual/SmartFoldersDemo/index-debug.html
index a987ded85..36f2fa7f3 100644
--- a/Tests/Manual/SmartFoldersDemo/index-debug.html
+++ b/Tests/Manual/SmartFoldersDemo/index-debug.html
@@ -27,7 +27,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -37,7 +37,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -54,7 +54,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -80,12 +80,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading SmartFoldersDemo...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/SmartFoldersDemo/index.html b/Tests/Manual/SmartFoldersDemo/index.html
index 130870d18..b6b0c146e 100644
--- a/Tests/Manual/SmartFoldersDemo/index.html
+++ b/Tests/Manual/SmartFoldersDemo/index.html
@@ -26,7 +26,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -54,12 +54,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading SmartFoldersDemo...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/BorderTableTest/index-debug.html b/Tests/Manual/TableTest/BorderTableTest/index-debug.html
index 9c13f1632..4990e3c59 100644
--- a/Tests/Manual/TableTest/BorderTableTest/index-debug.html
+++ b/Tests/Manual/TableTest/BorderTableTest/index-debug.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <script type="text/javascript">
@@ -29,7 +29,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -71,12 +71,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading TableCibTest...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/BorderTableTest/index.html b/Tests/Manual/TableTest/BorderTableTest/index.html
index e3cc20955..7b7f10465 100644
--- a/Tests/Manual/TableTest/BorderTableTest/index.html
+++ b/Tests/Manual/TableTest/BorderTableTest/index.html
@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -45,12 +45,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading TableCibTest...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/ColumnResize/index-debug.html b/Tests/Manual/TableTest/ColumnResize/index-debug.html
index c255f5478..15bdf77e5 100644
--- a/Tests/Manual/TableTest/ColumnResize/index-debug.html
+++ b/Tests/Manual/TableTest/ColumnResize/index-debug.html
@@ -27,9 +27,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -37,7 +37,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -54,7 +54,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -80,12 +80,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading ColumnResize...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/ColumnResize/index.html b/Tests/Manual/TableTest/ColumnResize/index.html
index 7231031c2..ef6b76957 100644
--- a/Tests/Manual/TableTest/ColumnResize/index.html
+++ b/Tests/Manual/TableTest/ColumnResize/index.html
@@ -26,7 +26,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -54,12 +54,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading ColumnResize...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/ColumnSizing2/index-debug.html b/Tests/Manual/TableTest/ColumnSizing2/index-debug.html
index 1fedfcee8..f50a6af98 100644
--- a/Tests/Manual/TableTest/ColumnSizing2/index-debug.html
+++ b/Tests/Manual/TableTest/ColumnSizing2/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/ColumnSizing2/index.html b/Tests/Manual/TableTest/ColumnSizing2/index.html
index 19e987ce5..d3b5a8c7c 100644
--- a/Tests/Manual/TableTest/ColumnSizing2/index.html
+++ b/Tests/Manual/TableTest/ColumnSizing2/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/DragAndDrop/index-debug.html b/Tests/Manual/TableTest/DragAndDrop/index-debug.html
index d660d56ec..e1153eaf3 100644
--- a/Tests/Manual/TableTest/DragAndDrop/index-debug.html
+++ b/Tests/Manual/TableTest/DragAndDrop/index-debug.html
@@ -27,9 +27,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -37,7 +37,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -54,7 +54,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -80,12 +80,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading DragAndDrop...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/DragAndDrop/index.html b/Tests/Manual/TableTest/DragAndDrop/index.html
index 4c6650428..5092ed3a8 100644
--- a/Tests/Manual/TableTest/DragAndDrop/index.html
+++ b/Tests/Manual/TableTest/DragAndDrop/index.html
@@ -26,7 +26,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -54,12 +54,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading DragAndDrop...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/DrawRowTest/index-debug.html b/Tests/Manual/TableTest/DrawRowTest/index-debug.html
index d9d223eec..98e79f082 100644
--- a/Tests/Manual/TableTest/DrawRowTest/index-debug.html
+++ b/Tests/Manual/TableTest/DrawRowTest/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading DrawRowTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/DrawRowTest/index.html b/Tests/Manual/TableTest/DrawRowTest/index.html
index 7c7100aef..5868b8c12 100644
--- a/Tests/Manual/TableTest/DrawRowTest/index.html
+++ b/Tests/Manual/TableTest/DrawRowTest/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading DrawRowTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/Editing/index-debug.html b/Tests/Manual/TableTest/Editing/index-debug.html
index 2c3418a89..8126afa7d 100644
--- a/Tests/Manual/TableTest/Editing/index-debug.html
+++ b/Tests/Manual/TableTest/Editing/index-debug.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <!--
  index-debug.html
- TableTest/Editing 
+ TableTest/Editing
 
  Created by You on July 15, 2011.
  Copyright 2011, Your Company All rights reserved.
@@ -27,9 +27,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -37,7 +37,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -54,7 +54,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -80,12 +80,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading TableTest/Editing...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/Editing/index.html b/Tests/Manual/TableTest/Editing/index.html
index 69eebc50b..c817245d5 100644
--- a/Tests/Manual/TableTest/Editing/index.html
+++ b/Tests/Manual/TableTest/Editing/index.html
@@ -26,7 +26,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -54,12 +54,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading TableTest/Editing...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/EditingControls/index-debug.html b/Tests/Manual/TableTest/EditingControls/index-debug.html
index 2d6241861..e6542d36a 100644
--- a/Tests/Manual/TableTest/EditingControls/index-debug.html
+++ b/Tests/Manual/TableTest/EditingControls/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/EditingControls/index.html b/Tests/Manual/TableTest/EditingControls/index.html
index 6f2d2308d..5fa431cf1 100644
--- a/Tests/Manual/TableTest/EditingControls/index.html
+++ b/Tests/Manual/TableTest/EditingControls/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/GroupRowTest/AppController.j b/Tests/Manual/TableTest/GroupRowTest/AppController.j
index c2b57e6f8..31a3e565e 100644
--- a/Tests/Manual/TableTest/GroupRowTest/AppController.j
+++ b/Tests/Manual/TableTest/GroupRowTest/AppController.j
@@ -36,7 +36,7 @@
     [iconColumn setDataView:iconView];
     [tableView addTableColumn:iconColumn];
 
-    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino.org/images/favicon.png" size:CGSizeMake(16,16)];
+    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino-project.org/images/favicon.png" size:CGSizeMake(16,16)];
 
 
     for (var i = 1; i <= 5; i++)
@@ -76,7 +76,7 @@
     [iconColumn setDataView:iconView];
     [tableView addTableColumn:iconColumn];
 
-    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino.org/images/favicon.png" size:CGSizeMake(16,16)];
+    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino-project.org/images/favicon.png" size:CGSizeMake(16,16)];
 
 
     for (var i = 1; i <= 5; i++)
diff --git a/Tests/Manual/TableTest/GroupRowTest/index-debug.html b/Tests/Manual/TableTest/GroupRowTest/index-debug.html
index 5357b058f..69db152b8 100644
--- a/Tests/Manual/TableTest/GroupRowTest/index-debug.html
+++ b/Tests/Manual/TableTest/GroupRowTest/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading GroupRowTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/GroupRowTest/index.html b/Tests/Manual/TableTest/GroupRowTest/index.html
index f095071f3..80a9ca6ba 100644
--- a/Tests/Manual/TableTest/GroupRowTest/index.html
+++ b/Tests/Manual/TableTest/GroupRowTest/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading GroupRowTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/HeaderCornerView/index-debug.html b/Tests/Manual/TableTest/HeaderCornerView/index-debug.html
index f63033fca..0c1dbd8d6 100644
--- a/Tests/Manual/TableTest/HeaderCornerView/index-debug.html
+++ b/Tests/Manual/TableTest/HeaderCornerView/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/HeaderCornerView/index.html b/Tests/Manual/TableTest/HeaderCornerView/index.html
index 762e322ea..25e8abb1d 100644
--- a/Tests/Manual/TableTest/HeaderCornerView/index.html
+++ b/Tests/Manual/TableTest/HeaderCornerView/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/OldTest/AppController.j b/Tests/Manual/TableTest/OldTest/AppController.j
index 901a9bafd..99a4e0786 100644
--- a/Tests/Manual/TableTest/OldTest/AppController.j
+++ b/Tests/Manual/TableTest/OldTest/AppController.j
@@ -59,7 +59,7 @@ tableTestDragType = @"CPTableViewTestDragType";
     [iconColumn setMinWidth:32.0];
     [iconColumn setDataView:iconView];
     [tableView addTableColumn:iconColumn];
-    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino.org/images/favicon.png" size:CGSizeMake(16,16)];
+    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino-project.org/images/favicon.png" size:CGSizeMake(16,16)];
 
 
     var desc = [CPSortDescriptor sortDescriptorWithKey:@"self" ascending:YES];
diff --git a/Tests/Manual/TableTest/OldTest/index-debug.html b/Tests/Manual/TableTest/OldTest/index-debug.html
index 9bb71cc81..307093898 100644
--- a/Tests/Manual/TableTest/OldTest/index-debug.html
+++ b/Tests/Manual/TableTest/OldTest/index-debug.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -46,12 +46,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading TableTest...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/OldTest/index.html b/Tests/Manual/TableTest/OldTest/index.html
index e0fc94d0e..80699cfe8 100644
--- a/Tests/Manual/TableTest/OldTest/index.html
+++ b/Tests/Manual/TableTest/OldTest/index.html
@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -46,12 +46,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading TableTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/TableBindings/index-debug.html b/Tests/Manual/TableTest/TableBindings/index-debug.html
index 408fc1b32..9a29810d5 100644
--- a/Tests/Manual/TableTest/TableBindings/index-debug.html
+++ b/Tests/Manual/TableTest/TableBindings/index-debug.html
@@ -26,7 +26,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <script type="text/javascript">
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading TableBindings...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/TableBindings/index.html b/Tests/Manual/TableTest/TableBindings/index.html
index d1b8e5d67..e756f8673 100644
--- a/Tests/Manual/TableTest/TableBindings/index.html
+++ b/Tests/Manual/TableTest/TableBindings/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading TableBindings...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/TableCibTest/AppController.j b/Tests/Manual/TableTest/TableCibTest/AppController.j
index 4f417530c..bb0eebbc4 100644
--- a/Tests/Manual/TableTest/TableCibTest/AppController.j
+++ b/Tests/Manual/TableTest/TableCibTest/AppController.j
@@ -18,7 +18,7 @@ CPLogRegister(CPLogConsole);
 - (void)applicationDidFinishLaunching:(CPNotification)aNotification
 {
     // This is called when the application is done loading.
-    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino.org/images/favicon.png" size:CGSizeMake(16,16)];
+    iconImage = [[CPImage alloc] initWithContentsOfFile:"http://cappuccino-project.org/images/favicon.png" size:CGSizeMake(16,16)];
 }
 
 - (void)awakeFromCib
@@ -44,4 +44,4 @@ CPLogRegister(CPLogConsole);
         return String((row + 1) * [[tableColumn identifier] intValue]);
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/Tests/Manual/TableTest/TableCibTest/index-debug.html b/Tests/Manual/TableTest/TableCibTest/index-debug.html
index 218ae015c..723ff837a 100644
--- a/Tests/Manual/TableTest/TableCibTest/index-debug.html
+++ b/Tests/Manual/TableTest/TableCibTest/index-debug.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -46,12 +46,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading TableCibTest...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/TableCibTest/index.html b/Tests/Manual/TableTest/TableCibTest/index.html
index 41eca60ef..b22be0c25 100644
--- a/Tests/Manual/TableTest/TableCibTest/index.html
+++ b/Tests/Manual/TableTest/TableCibTest/index.html
@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -45,12 +45,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading TableCibTest...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/VariableRows/index-debug.html b/Tests/Manual/TableTest/VariableRows/index-debug.html
index 80699a8ef..784d30766 100644
--- a/Tests/Manual/TableTest/VariableRows/index-debug.html
+++ b/Tests/Manual/TableTest/VariableRows/index-debug.html
@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading VariableRows...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/TableTest/VariableRows/index.html b/Tests/Manual/TableTest/VariableRows/index.html
index 31db61eae..cb39c05f3 100644
--- a/Tests/Manual/TableTest/VariableRows/index.html
+++ b/Tests/Manual/TableTest/VariableRows/index.html
@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading VariableRows...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/ThemeBrowser/index-debug.html b/Tests/Manual/ThemeBrowser/index-debug.html
index 293792640..e2760f77a 100644
--- a/Tests/Manual/ThemeBrowser/index-debug.html
+++ b/Tests/Manual/ThemeBrowser/index-debug.html
@@ -60,7 +60,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/ThemeBrowser/index.html b/Tests/Manual/ThemeBrowser/index.html
index 6485c1c74..076934a98 100644
--- a/Tests/Manual/ThemeBrowser/index.html
+++ b/Tests/Manual/ThemeBrowser/index.html
@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/UndoRedoWithMenuUpdate/index-debug.html b/Tests/Manual/UndoRedoWithMenuUpdate/index-debug.html
index c6b79e920..b53ab38b7 100644
--- a/Tests/Manual/UndoRedoWithMenuUpdate/index-debug.html
+++ b/Tests/Manual/UndoRedoWithMenuUpdate/index-debug.html
@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -46,12 +46,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading iApplication...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/UndoRedoWithMenuUpdate/index.html b/Tests/Manual/UndoRedoWithMenuUpdate/index.html
index 2e6d37154..79663632a 100644
--- a/Tests/Manual/UndoRedoWithMenuUpdate/index.html
+++ b/Tests/Manual/UndoRedoWithMenuUpdate/index.html
@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -45,12 +45,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading iApplication...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/UserlandNSTest/index-debug.html b/Tests/Manual/UserlandNSTest/index-debug.html
index 042c48ad1..64a07e512 100644
--- a/Tests/Manual/UserlandNSTest/index-debug.html
+++ b/Tests/Manual/UserlandNSTest/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/UserlandNSTest/index.html b/Tests/Manual/UserlandNSTest/index.html
index 7fcf231e5..1f3b24fd9 100644
--- a/Tests/Manual/UserlandNSTest/index.html
+++ b/Tests/Manual/UserlandNSTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/layoutEphemeralSubviewTest/index-debug.html b/Tests/Manual/layoutEphemeralSubviewTest/index-debug.html
index b4140d1ae..3780ef7d2 100644
--- a/Tests/Manual/layoutEphemeralSubviewTest/index-debug.html
+++ b/Tests/Manual/layoutEphemeralSubviewTest/index-debug.html
@@ -83,7 +83,7 @@ Created by Aparajita Fishman on October 8, 2010.
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/layoutEphemeralSubviewTest/index.html b/Tests/Manual/layoutEphemeralSubviewTest/index.html
index f7dee6050..453aab498 100644
--- a/Tests/Manual/layoutEphemeralSubviewTest/index.html
+++ b/Tests/Manual/layoutEphemeralSubviewTest/index.html
@@ -57,7 +57,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/performKeyEquivalentTest/index-debug.html b/Tests/Manual/performKeyEquivalentTest/index-debug.html
index 89b8a1a32..a5cf3b8eb 100644
--- a/Tests/Manual/performKeyEquivalentTest/index-debug.html
+++ b/Tests/Manual/performKeyEquivalentTest/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/performKeyEquivalentTest/index.html b/Tests/Manual/performKeyEquivalentTest/index.html
index e5701184e..c3f1824be 100644
--- a/Tests/Manual/performKeyEquivalentTest/index.html
+++ b/Tests/Manual/performKeyEquivalentTest/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/predicateWithFormat/index-debug.html b/Tests/Manual/predicateWithFormat/index-debug.html
index bb7f1eabe..f4190a743 100644
--- a/Tests/Manual/predicateWithFormat/index-debug.html
+++ b/Tests/Manual/predicateWithFormat/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/predicateWithFormat/index.html b/Tests/Manual/predicateWithFormat/index.html
index 8629cc826..21379c635 100644
--- a/Tests/Manual/predicateWithFormat/index.html
+++ b/Tests/Manual/predicateWithFormat/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index-debug.html b/Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index-debug.html
index 95cbf3e3f..cddbb6cd0 100644
--- a/Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index-debug.html
+++ b/Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index-debug.html
@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index.html b/Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index.html
index 08dff7988..589fced48 100644
--- a/Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index.html
+++ b/Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/sizeToFitFix/index-debug.html b/Tests/Manual/sizeToFitFix/index-debug.html
index b84c85995..d1c338d03 100644
--- a/Tests/Manual/sizeToFitFix/index-debug.html
+++ b/Tests/Manual/sizeToFitFix/index-debug.html
@@ -59,7 +59,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tests/Manual/sizeToFitFix/index.html b/Tests/Manual/sizeToFitFix/index.html
index cd009d039..faa208422 100644
--- a/Tests/Manual/sizeToFitFix/index.html
+++ b/Tests/Manual/sizeToFitFix/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tools/READMEs/STARTER-README b/Tools/READMEs/STARTER-README
index cdb86dac1..d43724fdb 100644
--- a/Tools/READMEs/STARTER-README
+++ b/Tools/READMEs/STARTER-README
@@ -7,10 +7,8 @@ Included you should find the following:
 3. bootstrap.sh
 4. README
 
-NewApplication is a stand alone Cappuccino application that you can use as a template to start building your own apps.  To get started, just open up NewApplication/index.html in your favorite web browser.  A great place to go from there is to read the "Downloading and Getting Started" tutorial found at http://cappuccino.org/learn/tutorials/starter-tutorial.php.  This will walk you through these initial steps as well as getting you to do a little coding. If you want to debug your application, try running it with index-debug.html instead, which should make it easier.
+NewApplication is a stand alone Cappuccino application that you can use as a template to start building your own apps.  To get started, just open up NewApplication/index.html in your favorite web browser.  A great place to go from there is to read the "Downloading and Getting Started" tutorial found at http://cappuccino-project.org/learn/starter.html.  This will walk you through these initial steps as well as getting you to do a little coding. If you want to debug your application, try running it with index-debug.html instead, which should make it easier.
 
 You can build your entire application right from either of these sample projects, but if you want to dig a little deeper, you can install the full set of tools by running the bootstrap.sh script.  This will set you up with some great additions like build tools to help fine tune the performance of your deployments.
 
-NOTE: If you'd like to make a nib-based application (so you can create your interface in Interface Builder), you will need to install the Cappuccino tools. 
-
-For more details, see our more thorough README on our website: http://cappuccino.org/download/readme.php
+NOTE: If you'd like to make a nib-based application (so you can create your interface in Interface Builder), you will need to install the Cappuccino tools.
diff --git a/Tools/capp/Resources/Templates/Application/index-debug.html b/Tools/capp/Resources/Templates/Application/index-debug.html
index a2da7fe2d..127f03a18 100644
--- a/Tools/capp/Resources/Templates/Application/index-debug.html
+++ b/Tools/capp/Resources/Templates/Application/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tools/capp/Resources/Templates/Application/index.html b/Tools/capp/Resources/Templates/Application/index.html
index ef3f12912..b0c542eb2 100644
--- a/Tools/capp/Resources/Templates/Application/index.html
+++ b/Tools/capp/Resources/Templates/Application/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tools/capp/Resources/Templates/NibApplication/index-debug.html b/Tools/capp/Resources/Templates/NibApplication/index-debug.html
index 524efa47d..22e0f1dde 100644
--- a/Tools/capp/Resources/Templates/NibApplication/index-debug.html
+++ b/Tools/capp/Resources/Templates/NibApplication/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tools/capp/Resources/Templates/NibApplication/index.html b/Tools/capp/Resources/Templates/NibApplication/index.html
index e8aa7d028..16ad91926 100644
--- a/Tools/capp/Resources/Templates/NibApplication/index.html
+++ b/Tools/capp/Resources/Templates/NibApplication/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html b/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
index 31134063d..58652940e 100644
--- a/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
+++ b/Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tools/capp/Resources/Templates/ThemeDescriptor/index.html b/Tools/capp/Resources/Templates/ThemeDescriptor/index.html
index bdc67aa1f..6d199e149 100644
--- a/Tools/capp/Resources/Templates/ThemeDescriptor/index.html
+++ b/Tools/capp/Resources/Templates/ThemeDescriptor/index.html
@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
diff --git a/Tools/capp_lint/README b/Tools/capp_lint/README
index 976a5aeb8..93e23887d 100644
--- a/Tools/capp_lint/README
+++ b/Tools/capp_lint/README
@@ -1,7 +1,7 @@
 capp_lint is a formatting checker for Objective-J. It performs a number of checks that catch
 common formatting mistakes, as defined in the Cappuccino coding style guidelines:
 
-http://cappuccino.org/contribute/coding-style.php
+https://github.com/cappuccino/cappuccino/blob/master/CONTRIBUTING.md
 
 To install capp_lint and its man page, execute install.sh in Terminal. You must have sudo access
 to run the install script.
diff --git a/Tools/capp_lint/capp_lint b/Tools/capp_lint/capp_lint
index 599eb7002..1fa0e5087 100755
--- a/Tools/capp_lint/capp_lint
+++ b/Tools/capp_lint/capp_lint
@@ -3,7 +3,7 @@
 # capp_lint.py - Check Objective-J source code formatting,
 # according to Cappuccino standards:
 #
-# http://cappuccino.org/contribute/coding-style.php
+# https://github.com/cappuccino/cappuccino/blob/master/CONTRIBUTING.md
 #
 # Copyright (C) 2011 Aparajita Fishman <aparajita@aparajita.com>
 
diff --git a/Tools/capp_lint/capp_lint.1 b/Tools/capp_lint/capp_lint.1
index e0e6c0b3c..05c9cf1fd 100644
--- a/Tools/capp_lint/capp_lint.1
+++ b/Tools/capp_lint/capp_lint.1
@@ -21,7 +21,7 @@
 is a formatting checker for Objective-J. It performs a number of checks that catch
 common formatting mistakes, as defined in the Cappuccino coding style guidelines:
 .Pp
-http://cappuccino.org/contribute/coding-style.php
+https://github.com/cappuccino/cappuccino/blob/master/CONTRIBUTING.md
 .Pp
 .Nm
 operates on a list of files and/or directory. You may pass one or more paths (relative to the
@@ -58,9 +58,9 @@ Given the following code:
     var bow = "foobar",
         wow = "woof";
 .Pp
-The 
+The
 .Ar none
-policy will obviously not flag this. The 
+policy will obviously not flag this. The
 .Ar single
 policy will not flag
 this because both blocks contain more than one declaration. The
@@ -72,7 +72,7 @@ policy will flag this. Given the following code:
 
     var bow = "foobar";
 .Pp
-The 
+The
 .Ar single
 policy will flag this because the second block is a single declaration.
 .It Fl f, \-format=[text|html]
diff --git a/bootstrap.sh b/bootstrap.sh
index 7044cffbe..21b62cbea 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -139,7 +139,7 @@ install_directory=""
 tmp_zip="/tmp/cappuccino.zip"
 
 github_user="cappuccino"
-github_ref="v0.9.6-RC2"
+github_ref="v0.9.6"
 
 noprompt=""
 install_capp=""
@@ -194,7 +194,7 @@ if (( $verbosity > 0 )); then
                                  Version [[ CAPPUCCINO_VERSION ]]
 
 
-                             http://cappuccino.org
+                         http://cappuccino-project.org
                     http://github.com/cappuccino/cappuccino
                        irc://irc.freenode.org#cappuccino