diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-down-arrow-disabled.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-down-arrow-disabled.png
deleted file mode 100644
index 79d1d716c..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-down-arrow-disabled.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-down-arrow-highlighted.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-down-arrow-highlighted.png
deleted file mode 100644
index 871a09bdb..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-down-arrow-highlighted.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-down-arrow.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-down-arrow.png
deleted file mode 100644
index 683c6b42a..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-down-arrow.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-up-arrow-disabled.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-up-arrow-disabled.png
deleted file mode 100644
index 3a3a9164f..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-up-arrow-disabled.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-up-arrow-highlighted.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-up-arrow-highlighted.png
deleted file mode 100644
index ae94fe98f..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-up-arrow-highlighted.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-up-arrow.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-up-arrow.png
deleted file mode 100644
index a9a1d2b67..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-up-arrow.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-knob-bottom.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-knob-bottom.png
deleted file mode 100644
index f82149d6f..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-knob-bottom.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-knob-center.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-knob-center.png
deleted file mode 100644
index 1be25a056..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-knob-center.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-knob-top.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-knob-top.png
deleted file mode 100644
index be784b0c9..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-knob-top.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-track-disabled.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-track-disabled.png
deleted file mode 100644
index 8979c9647..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-track-disabled.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-track.png b/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-track.png
deleted file mode 100644
index bd9c1930b..000000000
Binary files a/AppKit/Themes/Aristo/Resources/old-scroller/scroller-vertical-track.png and /dev/null differ
diff --git a/AppKit/Themes/Aristo/index-debug.html b/AppKit/Themes/Aristo/index-debug.html
index df94938fc..90e9a5ce7 100644
--- a/AppKit/Themes/Aristo/index-debug.html
+++ b/AppKit/Themes/Aristo/index-debug.html
@@ -4,17 +4,16 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">
 <!--
-//
-//  index-debug.html
-//  A
-//
-//  Created by __Me__ on __Date__.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
+ index-debug.html
+ Aristo
+
+ Created by Francisco Tolmasky on May 23, 2009.
+ Copyright 2009, 280 North, Inc. All rights reserved.
 -->
     <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
 
-        <title>Hello World</title>
+        <title>Aristo</title>
 
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
@@ -23,14 +22,49 @@
         
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
+        <style type = "text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
     </head>
 
-    <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;" />
-            </center>
+    <body style="">
+        <div id="loadingcontainer" style=" background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+            <script type = "text/javascript">
+                document.write("<div id='container'><p id='content'>" +
+                               "<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: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>
+                </div>
+            </noscript>
         </div>
     </body>
+
 </html>
 
diff --git a/AppKit/Themes/Aristo/index.html b/AppKit/Themes/Aristo/index.html
index 6088568e4..7be70d855 100644
--- a/AppKit/Themes/Aristo/index.html
+++ b/AppKit/Themes/Aristo/index.html
@@ -4,17 +4,16 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">
 <!--
-//
-//  index.html
-//  A
-//
-//  Created by __Me__ on __Date__.
-//  Copyright 2008 __MyCompanyName__. All rights reserved.
-//
+ index.html
+ Aristo
+
+ Created by Francisco Tolmasky on May 23, 2009.
+ Copyright 2009, 280 North, Inc. All rights reserved.
 -->
     <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
 
-        <title>Hello World</title>
+        <title>Aristo</title>
 
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
@@ -22,16 +21,48 @@
         
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
+        <style type = "text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
 
     </head>
 
-    <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;" />
-            </center>
+    <body style="">
+        <div id="loadingcontainer" style=" background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+            <script type = "text/javascript">
+                document.write("<div id='container'><p id='content'>" +
+                               "<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: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>
+                </div>
+            </noscript>
         </div>
     </body>
-    
-</html>
 
+</html>