diff --git a/AppKit/Tools/blend/main.j b/AppKit/Tools/blend/main.j
index 5af515ee3..92cadf4de 100755
--- a/AppKit/Tools/blend/main.j
+++ b/AppKit/Tools/blend/main.j
@@ -53,7 +53,7 @@ function main()
 
     objj_import(descriptorFiles, YES, function()
     {
-        var themeDescriptorClasses = BKThemeDescriptorClasses(),
+        var themeDescriptorClasses = [BKThemeDescriptor allThemeDescriptorClasses],
             count = [themeDescriptorClasses count];
 
         while (count--)
@@ -63,7 +63,7 @@ function main()
 
             [themeTemplate setValue:[theClass themeName] forKey:@"name"];
 
-            var objectTemplates = BKThemeObjectTemplatesForClass(theClass),
+            var objectTemplates = [theClass themedObjectTemplates],
                 data = cibDataFromTopLevelObjects(objectTemplates.concat([themeTemplate])),
                 temporaryCibFile = Packages.java.io.File.createTempFile("temp", ".cib"),
                 temporaryCibFilePath = String(temporaryCibFile.getAbsolutePath());
diff --git a/Tools/capp/Templates/ThemeDescriptor/ThemeDescriptors.j b/Tools/capp/Templates/ThemeDescriptor/ThemeDescriptors.j
index 8e17474d0..c30d70946 100644
--- a/Tools/capp/Templates/ThemeDescriptor/ThemeDescriptors.j
+++ b/Tools/capp/Templates/ThemeDescriptor/ThemeDescriptors.j
@@ -6,10 +6,10 @@
  * Copyright __project.year__, __organization.name__ All rights reserved.
  */
 
-@import <Foundation/CPObject.j>
+@import <BlendKit/BKThemeDescriptor.j>
 
 
-@implementation __project.nameasidentifier__ThemeDescriptor : CPObject
+@implementation __project.nameasidentifier__ThemeDescriptor : BKThemeDescriptor
 {
 }