diff --git a/SpriteBuilder/CCParticleSystem/CCBPParticleSystem.h b/SpriteBuilder/CCParticleSystem/CCBPParticleSystem.h
index ec2a78c18..65fda3cb9 100644
--- a/SpriteBuilder/CCParticleSystem/CCBPParticleSystem.h
+++ b/SpriteBuilder/CCParticleSystem/CCBPParticleSystem.h
@@ -23,6 +23,7 @@
  */
 
 #import "cocos2d.h"
+#import "CCParticleSystem.h"
 
 @interface CCBPParticleSystem : CCParticleSystem
 
diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m
index 028ca9b0d..373b6a954 100644
--- a/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m	
+++ b/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m	
@@ -19,6 +19,8 @@
 #import "CCScrollView.h"
 #import "SBErrors.h"
 #import "CCBDictionaryKeys.h"
+#import "CCEffects.h"
+#import "CCParticles.h"
 
 @interface CCBDictionaryReader_Tests : XCTestCase
 
diff --git a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilderTestProject.ccbproj b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilderTestProject.ccbproj
index 94f2dadb5..9b6b36120 100644
--- a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilderTestProject.ccbproj	
+++ b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilderTestProject.ccbproj	
@@ -21,7 +21,7 @@
 	<key>engine</key>
 	<integer>0</integer>
 	<key>excludedFromPackageMigration</key>
-	<integer>1</integer>
+	<true/>
 	<key>exporter</key>
 	<string>ccbi</string>
 	<key>fileType</key>
@@ -30,28 +30,14 @@
 	<integer>1</integer>
 	<key>onlyPublishCCBs</key>
 	<false/>
-	<key>publishAudioQuality_android</key>
-	<integer>4</integer>
 	<key>publishAudioQuality_ios</key>
 	<integer>4</integer>
 	<key>publishDirectory</key>
 	<string>Source/Resources/Published-iOS</string>
-	<key>publishDirectoryAndroid</key>
-	<string>Source/Resources/Published-Android</string>
-	<key>publishEnabledAndroid</key>
-	<true/>
 	<key>publishEnablediPhone</key>
 	<true/>
 	<key>publishEnvironment</key>
 	<integer>0</integer>
-	<key>publishResolution_android_phone</key>
-	<true/>
-	<key>publishResolution_android_phonehd</key>
-	<true/>
-	<key>publishResolution_android_tablet</key>
-	<true/>
-	<key>publishResolution_android_tablethd</key>
-	<true/>
 	<key>publishResolution_ios_phone</key>
 	<true/>
 	<key>publishResolution_ios_phonehd</key>
@@ -87,10 +73,9 @@
 		</dict>
 	</dict>
 	<key>versionStr</key>
-	<string>Version: 0.9
-Sku: pro
-GitHub: 
-59c650bc32
+	<string>revision : d5c6db563d
+sku : default
+version : 1.5.0
 </string>
 </dict>
 </plist>
diff --git a/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj b/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
index 9426ffa2a..c83e1b870 100644
--- a/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
+++ b/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
@@ -1091,13 +1091,6 @@
 			remoteGlobalIDString = 5018F24D0DFDEAC400C013A5;
 			remoteInfo = "cocos2d-ios";
 		};
-		836E2D5719EE5BCC00CD5B66 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 836E2D3E19EE5AF300CD5B66 /* cocos2d.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D2FEB74F194F6C9E00FC0574;
-			remoteInfo = cocos2dAndroid;
-		};
 		836E2D5B19EE5BCC00CD5B66 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 836E2D3E19EE5AF300CD5B66 /* cocos2d.xcodeproj */;
@@ -1259,6 +1252,13 @@
 			remoteGlobalIDString = E3D59120150F5367004180CA;
 			remoteInfo = CCBFile;
 		};
+		FF1E12B31C8F6C5F00C154B5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 836E2D3E19EE5AF300CD5B66 /* cocos2d.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 08F4AB671C6E98A1004DAAF7;
+			remoteInfo = "cocos2d-tvos";
+		};
 		FF3005A51C88CB0F0015A411 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 836E2D3E19EE5AF300CD5B66 /* cocos2d.xcodeproj */;
@@ -4108,9 +4108,9 @@
 			isa = PBXGroup;
 			children = (
 				836E2D5619EE5BCC00CD5B66 /* libcocos2d.a */,
-				836E2D5819EE5BCC00CD5B66 /* libcocos2dAndroid.a */,
 				836E2D5C19EE5BCC00CD5B66 /* libcocos2d-mac.a */,
 				FF3005A61C88CB0F0015A411 /* cocos2dMacFramework.framework */,
+				FF1E12B41C8F6C5F00C154B5 /* libcocos2d-tvos.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -6449,18 +6449,18 @@
 			remoteRef = 836E2D5519EE5BCC00CD5B66 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		836E2D5819EE5BCC00CD5B66 /* libcocos2dAndroid.a */ = {
+		836E2D5C19EE5BCC00CD5B66 /* libcocos2d-mac.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = libcocos2dAndroid.a;
-			remoteRef = 836E2D5719EE5BCC00CD5B66 /* PBXContainerItemProxy */;
+			path = "libcocos2d-mac.a";
+			remoteRef = 836E2D5B19EE5BCC00CD5B66 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		836E2D5C19EE5BCC00CD5B66 /* libcocos2d-mac.a */ = {
+		FF1E12B41C8F6C5F00C154B5 /* libcocos2d-tvos.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libcocos2d-mac.a";
-			remoteRef = 836E2D5B19EE5BCC00CD5B66 /* PBXContainerItemProxy */;
+			path = "libcocos2d-tvos.a";
+			remoteRef = FF1E12B31C8F6C5F00C154B5 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		FF3005A61C88CB0F0015A411 /* cocos2dMacFramework.framework */ = {
@@ -8261,6 +8261,9 @@
 					"libs/cocos2d-iphone/external/Chipmunk/include/chipmunk",
 					"libs/cocos2d-iphone/external/Chipmunk/objectivec/include/",
 					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "ccBuilder/SpriteBuilder-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
@@ -8303,6 +8306,9 @@
 					"libs/cocos2d-iphone/external/Chipmunk/include/chipmunk",
 					"libs/cocos2d-iphone/external/Chipmunk/objectivec/include/",
 					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "ccBuilder/SpriteBuilder-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
@@ -8349,8 +8355,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCBReader/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "SpriteBuilder Tests/SpriteBuilder Tests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
@@ -8387,8 +8396,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCBReader/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "SpriteBuilder Tests/SpriteBuilder Tests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
@@ -8457,6 +8469,9 @@
 					"libs/cocos2d-iphone/external/Chipmunk/include/chipmunk",
 					"libs/cocos2d-iphone/external/Chipmunk/objectivec/include/",
 					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "ccBuilder/SpriteBuilder-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
@@ -8503,8 +8518,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCBReader/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "SpriteBuilder Tests/SpriteBuilder Tests-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
@@ -8642,6 +8660,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCSprite/CCSprite-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -8688,7 +8707,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCSprite9Slice/CCSprite9Slice-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -8817,7 +8836,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCLabelTTF/CCLabelTTF-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -8850,7 +8869,8 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "CCParticleSystem/CCParticleSystem-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -8883,7 +8903,9 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "CCBFile/CCBFile-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -8930,6 +8952,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCButton/CCButton-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9022,7 +9045,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCTextField/CCTextField-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9115,7 +9138,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCSlider/CCSlider-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9255,6 +9278,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCPhysicsPinJoint/CCPhysicsPinJoint-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9355,8 +9379,10 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				HEADER_SEARCH_PATHS = (
-					"libs/cocos2d-iphone/cocos2d/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCLightNode/CCLightNode-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9385,8 +9411,10 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				HEADER_SEARCH_PATHS = (
-					"libs/cocos2d-iphone/cocos2d/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCLightNode/CCLightNode-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9405,6 +9433,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
+				HEADER_SEARCH_PATHS = (
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+				);
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
 				LD_DEPENDENCY_INFO_FILE = "$(OBJECT_FILE_DIR_$(CURRENT_VARIANT))/$(CURRENT_ARCH)/$(PRODUCT_NAME)_dependency_info.dat";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -9540,6 +9574,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCPhysicsPinJoint/CCPhysicsPinJoint-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9584,6 +9619,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCPhysicsPinJoint/CCPhysicsPinJoint-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9601,6 +9637,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
+				HEADER_SEARCH_PATHS = (
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d/**",
+				);
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
 				LD_DEPENDENCY_INFO_FILE = "$(OBJECT_FILE_DIR_$(CURRENT_VARIANT))/$(CURRENT_ARCH)/$(PRODUCT_NAME)_dependency_info.dat";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -9627,8 +9668,9 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				HEADER_SEARCH_PATHS = (
-					"libs/cocos2d-iphone/cocos2d/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d/**",
 				);
 				INFOPLIST_FILE = "CCEffectNode/CCEffectNode-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9657,8 +9699,9 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				HEADER_SEARCH_PATHS = (
-					"libs/cocos2d-iphone/cocos2d/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d/**",
 				);
 				INFOPLIST_FILE = "CCEffectNode/CCEffectNode-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9797,7 +9840,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCSlider/CCSlider-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -9841,7 +9884,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCSlider/CCSlider-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10066,7 +10109,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCSprite9Slice/CCSprite9Slice-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10110,7 +10153,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCSprite9Slice/CCSprite9Slice-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10157,6 +10200,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCButton/CCButton-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10200,6 +10244,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCButton/CCButton-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10335,7 +10380,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCTextField/CCTextField-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10379,7 +10424,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCTextField/CCTextField-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10681,7 +10726,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCLabelTTF/CCLabelTTF-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10710,7 +10755,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCLabelTTF/CCLabelTTF-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10743,7 +10788,8 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "CCParticleSystem/CCParticleSystem-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10772,7 +10818,8 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "CCParticleSystem/CCParticleSystem-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10921,6 +10968,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCSprite/CCSprite-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10949,6 +10997,7 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
 				);
 				INFOPLIST_FILE = "CCSprite/CCSprite-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -10981,7 +11030,9 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "CCBFile/CCBFile-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -11010,7 +11061,9 @@
 				HEADER_SEARCH_PATHS = (
 					"libs/cocos2d-iphone/cocos2d/**",
 					"libs/cocos2d-iphone/cocos2d-ui/**",
-					"libs/cocos2d-iphone/external/ObjectAL/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCEffects/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCLighting/**",
+					"libs/cocos2d-iphone/cocos2d-ext/CCParticles/**",
 				);
 				INFOPLIST_FILE = "CCBFile/CCBFile-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
diff --git a/SpriteBuilder/SpriteBuilder.xcodeproj/xcshareddata/xcschemes/Tests(AppCode).xcscheme b/SpriteBuilder/SpriteBuilder.xcodeproj/xcshareddata/xcschemes/Tests(AppCode).xcscheme
index 58321b4f8..5c8f64700 100644
--- a/SpriteBuilder/SpriteBuilder.xcodeproj/xcshareddata/xcschemes/Tests(AppCode).xcscheme
+++ b/SpriteBuilder/SpriteBuilder.xcodeproj/xcshareddata/xcschemes/Tests(AppCode).xcscheme
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    version = "1.3">
-   <BuildAction>
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
+            buildForTesting = "YES"
             buildForRunning = "YES"
-            buildForTesting = "YES">
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "833A5C49192B48CA001837B3"
@@ -17,9 +22,13 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Testing">
+      buildConfiguration = "Testing"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference>
+         <TestableReference
+            skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "833A5C49192B48CA001837B3"
@@ -29,8 +38,43 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      useCustomWorkingDirectory = "NO">
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "833A5C49192B48CA001837B3"
+            BuildableName = "SpriteBuilder Tests.xctest"
+            BlueprintName = "SpriteBuilder Tests"
+            ReferencedContainer = "container:SpriteBuilder.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
 </Scheme>
diff --git a/SpriteBuilder/ccBuilder/CCBProjectCreator.m b/SpriteBuilder/ccBuilder/CCBProjectCreator.m
index f507612e4..d07baaa68 100644
--- a/SpriteBuilder/ccBuilder/CCBProjectCreator.m
+++ b/SpriteBuilder/ccBuilder/CCBProjectCreator.m
@@ -92,7 +92,8 @@ -(BOOL) createDefaultProjectAtPath:(NSString*)fileName engine:(CCBTargetEngine)e
                inFile:pbxprojFile
                search:@"MACOSX_DEPLOYMENT_TARGET = 10.10"];
         [self removeLinesMatching:@".*MainScene[.]swift.*" inFile:pbxprojFile];
-        filesToRemove = @[@"Source/MainScene.swift"];
+        [self removeLinesMatching:@".*AppDelegate[.]swift.*" inFile:pbxprojFile];
+        filesToRemove = @[@"Source/MainScene.swift", @"Source/Platforms/iOS/AppDelegate.swift", @"Source/Platforms/Mac/AppDelegate.swift"];
     }
     else if (programmingLanguage == CCBProgrammingLanguageSwift)
     {
@@ -111,7 +112,7 @@ -(BOOL) createDefaultProjectAtPath:(NSString*)fileName engine:(CCBTargetEngine)e
     // Update workspace data
     [self setName:projName inFile:[xcodeFileName stringByAppendingPathComponent:@"project.xcworkspace/contents.xcworkspacedata"] search:substitutableProjectName];
     
-    NSArray *platforms = @[@"iOS", @"Mac"];
+    NSArray *platforms = @[@"iOS", @"Mac", @"tvOS"];
     
     for (id platform in platforms) {
         // Update scheme
@@ -143,6 +144,9 @@ -(BOOL) createDefaultProjectAtPath:(NSString*)fileName engine:(CCBTargetEngine)e
     
     // Update Mac Xib file
     NSString* xibFileName = [parentPath stringByAppendingPathComponent:@"Source/Resources/Platforms/Mac/MainMenu.xib"];
+    if (programmingLanguage == CCBProgrammingLanguageObjectiveC) {
+        [self setName:@"" inFile:xibFileName search: @"customModule=\"PROJECTNAME\""];
+    }
     [self setName:identifier inFile:xibFileName search:substitutableProjectIdentifier];
     [self setName:projName inFile:xibFileName search:substitutableProjectName];
 	
diff --git a/SpriteBuilder/ccBuilder/CocosScene.h b/SpriteBuilder/ccBuilder/CocosScene.h
index 321efe164..b09a112e4 100644
--- a/SpriteBuilder/ccBuilder/CocosScene.h
+++ b/SpriteBuilder/ccBuilder/CocosScene.h
@@ -24,6 +24,7 @@
  */
 
 #import "cocos2d.h"
+#import "CCLightNode.h"
 @class SceneGraph;
 @class AppDelegate;
 @class CCBTemplateNode;
diff --git a/SpriteBuilder/ccBuilder/PropertyInspectorTemplateHandler.m b/SpriteBuilder/ccBuilder/PropertyInspectorTemplateHandler.m
index 4c12db8c1..12e9c5bff 100644
--- a/SpriteBuilder/ccBuilder/PropertyInspectorTemplateHandler.m
+++ b/SpriteBuilder/ccBuilder/PropertyInspectorTemplateHandler.m
@@ -11,6 +11,7 @@
 #import "PlugInNode.h"
 #import "PropertyInspectorTemplate.h"
 #import "InspectorController.h"
+#import "CCParticles.h"
 
 @implementation PropertyInspectorTemplateHandler
 
diff --git a/SpriteBuilder/ccBuilder/SequencerHandler.m b/SpriteBuilder/ccBuilder/SequencerHandler.m
index 46d65c019..dc81338fc 100644
--- a/SpriteBuilder/ccBuilder/SequencerHandler.m
+++ b/SpriteBuilder/ccBuilder/SequencerHandler.m
@@ -51,6 +51,7 @@
 #import "EffectsManager.h"
 #import "InspectorController.h"
 #import "NotificationNames.h"
+#import "CCEffect.h"
 
 static NSString *const ORIGINAL_NODE_POINTER_KEY = @"srcNode";
 static NSString *const ORIGINAL_NODE_KEY = @"originalNode";
diff --git a/SpriteBuilder/libs/cocos2d-iphone b/SpriteBuilder/libs/cocos2d-iphone
index d8b38b97d..3b3bc378e 160000
--- a/SpriteBuilder/libs/cocos2d-iphone
+++ b/SpriteBuilder/libs/cocos2d-iphone
@@ -1 +1 @@
-Subproject commit d8b38b97d5cdaa039a4e3d1157af20bbb38675a5
+Subproject commit 3b3bc378e2b3655801941b76667818f6ac0456bc