diff --git a/AppKit/CPApplication.j b/AppKit/CPApplication.j
index ec4003cbb..8eb73df9e 100644
--- a/AppKit/CPApplication.j
+++ b/AppKit/CPApplication.j
@@ -1357,26 +1357,26 @@ var _CPAppBootstrapperActions = nil;
     // FIXME: We should implement autoenabling.
     [mainMenu setAutoenablesItems:NO];
 
-    var bundle = [CPBundle bundleForClass:[CPApplication class]],
+    var themeBundle = [[CPApp themeBlend] bundle],
         newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
 
-    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
-    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/new.png"] size:CGSizeMake(16.0, 16.0)]];
+    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/new-highlighted.png"] size:CGSizeMake(16.0, 16.0)]];
 
     [mainMenu addItem:newMenuItem];
 
     var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
 
-    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
-    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/open.png"] size:CGSizeMake(16.0, 16.0)]];
+    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/open-highlighted.png"] size:CGSizeMake(16.0, 16.0)]];
 
     [mainMenu addItem:openMenuItem];
 
     var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
         saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
 
-    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
-    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/save.png"] size:CGSizeMake(16.0, 16.0)]];
+    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/save-highlighted.png"] size:CGSizeMake(16.0, 16.0)]];
 
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
diff --git a/AppKit/CPCursor.j b/AppKit/CPCursor.j
index 9ab1aa2dc..876351f58 100755
--- a/AppKit/CPCursor.j
+++ b/AppKit/CPCursor.j
@@ -159,7 +159,11 @@ var currentCursor = nil,
         var cssString;
 
         if (doesHaveImage)
-            cssString = [CPString stringWithFormat:@"url(%@/CPCursor/%@.cur), %@", [[CPBundle bundleForClass:self] resourcePath], cursorName, aString];
+        {
+            var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath];
+            cssString = [CPString stringWithFormat:@"url(%@/cursors/%@.cur), %@", themeResourcePath, cursorName, aString];
+        }
+
         else
         {
             // IE <= 8 does not support some cursors, map them to supported cursors
diff --git a/AppKit/CPThemeBlend.j b/AppKit/CPThemeBlend.j
index eeea9c09c..8455bd4c0 100644
--- a/AppKit/CPThemeBlend.j
+++ b/AppKit/CPThemeBlend.j
@@ -33,7 +33,7 @@
 
 @implementation CPThemeBlend : CPObject
 {
-    CPBundle    _bundle;
+    CPBundle    _bundle @accessors(getter=bundle);
     CPArray     _themes;
     id          _loadDelegate;
 }
diff --git a/AppKit/Resources/CPApplication/NewHighlighted.png b/AppKit/Themes/Aristo2/Resources/application-icons/new-highlighted.png
similarity index 100%
rename from AppKit/Resources/CPApplication/NewHighlighted.png
rename to AppKit/Themes/Aristo2/Resources/application-icons/new-highlighted.png
diff --git a/AppKit/Resources/CPApplication/New.png b/AppKit/Themes/Aristo2/Resources/application-icons/new.png
similarity index 100%
rename from AppKit/Resources/CPApplication/New.png
rename to AppKit/Themes/Aristo2/Resources/application-icons/new.png
diff --git a/AppKit/Resources/CPApplication/OpenHighlighted.png b/AppKit/Themes/Aristo2/Resources/application-icons/open-highlighted.png
similarity index 100%
rename from AppKit/Resources/CPApplication/OpenHighlighted.png
rename to AppKit/Themes/Aristo2/Resources/application-icons/open-highlighted.png
diff --git a/AppKit/Resources/CPApplication/Open.png b/AppKit/Themes/Aristo2/Resources/application-icons/open.png
similarity index 100%
rename from AppKit/Resources/CPApplication/Open.png
rename to AppKit/Themes/Aristo2/Resources/application-icons/open.png
diff --git a/AppKit/Resources/CPApplication/SaveHighlighted.png b/AppKit/Themes/Aristo2/Resources/application-icons/save-highlighted.png
similarity index 100%
rename from AppKit/Resources/CPApplication/SaveHighlighted.png
rename to AppKit/Themes/Aristo2/Resources/application-icons/save-highlighted.png
diff --git a/AppKit/Resources/CPApplication/Save.png b/AppKit/Themes/Aristo2/Resources/application-icons/save.png
similarity index 100%
rename from AppKit/Resources/CPApplication/Save.png
rename to AppKit/Themes/Aristo2/Resources/application-icons/save.png
diff --git a/AppKit/Resources/CPCursor/closedHandCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/closedHandCursor.cur
similarity index 100%
rename from AppKit/Resources/CPCursor/closedHandCursor.cur
rename to AppKit/Themes/Aristo2/Resources/cursors/closedHandCursor.cur
diff --git a/AppKit/Resources/CPCursor/contextualMenuCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/contextualMenuCursor.cur
similarity index 100%
rename from AppKit/Resources/CPCursor/contextualMenuCursor.cur
rename to AppKit/Themes/Aristo2/Resources/cursors/contextualMenuCursor.cur
diff --git a/AppKit/Resources/CPCursor/disappearingItemCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/disappearingItemCursor.cur
similarity index 100%
rename from AppKit/Resources/CPCursor/disappearingItemCursor.cur
rename to AppKit/Themes/Aristo2/Resources/cursors/disappearingItemCursor.cur
diff --git a/AppKit/Resources/CPCursor/dragCopyCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/dragCopyCursor.cur
similarity index 100%
rename from AppKit/Resources/CPCursor/dragCopyCursor.cur
rename to AppKit/Themes/Aristo2/Resources/cursors/dragCopyCursor.cur
diff --git a/AppKit/Resources/CPCursor/dragLinkCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/dragLinkCursor.cur
similarity index 100%
rename from AppKit/Resources/CPCursor/dragLinkCursor.cur
rename to AppKit/Themes/Aristo2/Resources/cursors/dragLinkCursor.cur
diff --git a/AppKit/Resources/CPCursor/openHandCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/openHandCursor.cur
similarity index 100%
rename from AppKit/Resources/CPCursor/openHandCursor.cur
rename to AppKit/Themes/Aristo2/Resources/cursors/openHandCursor.cur