diff --git a/Tools/capp/Templates/Application/index.html b/Tools/capp/Templates/Application/index.html
index bea6f5f36..070cf81c5 100644
--- a/Tools/capp/Templates/Application/index.html
+++ b/Tools/capp/Templates/Application/index.html
@@ -6,7 +6,7 @@
 <!--
 //
 //  index.html
-//  __Product__
+//  noscript
 //
 //  Created by __Me__ on __Date__.
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -28,7 +28,24 @@
     <body>
         <div style="position: absolute; left: 50%; top: 50%;">
             <center>
-                <img src = "Frameworks/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif" style="left: -32px; position: relative; top: -32px;" />
+                <script type = "text/javascript">
+                    document.write("<img src = \"Frameworks/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif\" style=\"left: -32px; position: relative; top: -32px;\" />");
+                </script>
+                
+                <noscript>
+                    <div style="width: 400px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #eeeeee; position: relative; left: -225px; 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: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>
+                            <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                            <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                            <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                            <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                        </ul>
+                    </div>
+                </noscript>
             </center>
         </div>
     </body>
diff --git a/Tools/capp/Templates/NibApplication/index.html b/Tools/capp/Templates/NibApplication/index.html
index bea6f5f36..070cf81c5 100644
--- a/Tools/capp/Templates/NibApplication/index.html
+++ b/Tools/capp/Templates/NibApplication/index.html
@@ -6,7 +6,7 @@
 <!--
 //
 //  index.html
-//  __Product__
+//  noscript
 //
 //  Created by __Me__ on __Date__.
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -28,7 +28,24 @@
     <body>
         <div style="position: absolute; left: 50%; top: 50%;">
             <center>
-                <img src = "Frameworks/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif" style="left: -32px; position: relative; top: -32px;" />
+                <script type = "text/javascript">
+                    document.write("<img src = \"Frameworks/AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif\" style=\"left: -32px; position: relative; top: -32px;\" />");
+                </script>
+                
+                <noscript>
+                    <div style="width: 400px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #eeeeee; position: relative; left: -225px; 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: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>
+                            <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                            <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                            <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                            <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                        </ul>
+                    </div>
+                </noscript>
             </center>
         </div>
     </body>
diff --git a/Tools/capp/Templates/ThemeDescriptor/index.html b/Tools/capp/Templates/ThemeDescriptor/index.html
index 1980e27f9..070cf81c5 100644
--- a/Tools/capp/Templates/ThemeDescriptor/index.html
+++ b/Tools/capp/Templates/ThemeDescriptor/index.html
@@ -6,7 +6,7 @@
 <!--
 //
 //  index.html
-//  __Product__
+//  noscript
 //
 //  Created by __Me__ on __Date__.
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -33,25 +33,17 @@
                 </script>
                 
                 <noscript>
-                    <div style="width: 500px; height: 300px; background-color: #eeeeee; left: -250px; top: -150px; position: relative; text-align: left; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                        <p style="padding: 25px;">
-                            JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.
-                            <br/><br/><br/>
-                            
-                            You can fix this problem by doing one of the following:
-                            <ul style="margin-top: -30px">
-                                <li>Enable JavaScript (<a href="http://www.google.com/search?q=enable+javascript">show me how</a>)</li>
-                                <li>Download a recent version of a major browser
-                                    <ul>
-                                        <li><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                        <li><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                        <li><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                        <li><a href="http://www.opera.com/download/">Opera</a></li>
-                                        <li><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                                    </ul>
-                                </li>
-                            </ul>
-                        </p>
+                    <div style="width: 400px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #eeeeee; position: relative; left: -225px; 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: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>
+                            <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                            <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                            <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                            <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                        </ul>
                     </div>
                 </noscript>
             </center>