diff --git a/samples/Core/TTCoreDemo/Configurations/App.xcconfig b/samples/Core/TTCoreDemo/Configurations/App.xcconfig
index 80b093f44f..fb121e8537 100644
--- a/samples/Core/TTCoreDemo/Configurations/App.xcconfig
+++ b/samples/Core/TTCoreDemo/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTCoreDemo
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB)
diff --git a/samples/Network/TTNetworkDemo/Configurations/App.xcconfig b/samples/Network/TTNetworkDemo/Configurations/App.xcconfig
index b5e6fc0b8a..fbccaba14b 100644
--- a/samples/Network/TTNetworkDemo/Configurations/App.xcconfig
+++ b/samples/Network/TTNetworkDemo/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTNetworkDemo
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB)
diff --git a/samples/Style/TTCSSStyleSheets/Configurations/App.xcconfig b/samples/Style/TTCSSStyleSheets/Configurations/App.xcconfig
index 0359785a99..194e82a226 100644
--- a/samples/Style/TTCSSStyleSheets/Configurations/App.xcconfig
+++ b/samples/Style/TTCSSStyleSheets/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTCSSStyleSheets
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB) $(EXTTHREE20CSSSTYLE_LIB)
diff --git a/samples/Style/TTStyleCatalog/Configurations/App.xcconfig b/samples/Style/TTStyleCatalog/Configurations/App.xcconfig
index 1de742f0fa..2d70dac123 100644
--- a/samples/Style/TTStyleCatalog/Configurations/App.xcconfig
+++ b/samples/Style/TTStyleCatalog/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTStyleCatalog
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB)
diff --git a/samples/TTCatalog/Configurations/App.xcconfig b/samples/TTCatalog/Configurations/App.xcconfig
index d4a4a2f00d..50efa07749 100644
--- a/samples/TTCatalog/Configurations/App.xcconfig
+++ b/samples/TTCatalog/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTCatalog
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB)
diff --git a/samples/TTFacebook/Configurations/App.xcconfig b/samples/TTFacebook/Configurations/App.xcconfig
index 88081abee5..cfdd10f214 100644
--- a/samples/TTFacebook/Configurations/App.xcconfig
+++ b/samples/TTFacebook/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTFacebook
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB) $(EXTTHREE20CSSSTYLE_LIB) $(EXTTHREE20JSONYAJL_LIB)
diff --git a/samples/TTFacebook/TTFacebook.xcodeproj/project.pbxproj b/samples/TTFacebook/TTFacebook.xcodeproj/project.pbxproj
index b358ec1458..47c105a8e8 100755
--- a/samples/TTFacebook/TTFacebook.xcodeproj/project.pbxproj
+++ b/samples/TTFacebook/TTFacebook.xcodeproj/project.pbxproj
@@ -12,31 +12,6 @@
 		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
 		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
-		664D012012664B5F004C20C2 /* Three20.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6E5F1F2E117FB4D9004BEBA9 /* Three20.bundle */; };
-		664D012112664B5F004C20C2 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E08B48C118288A300DA1579 /* Default.png */; };
-		664D012212664B5F004C20C2 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E08B48D118288A300DA1579 /* Icon.png */; };
-		664D012312664B5F004C20C2 /* extThree20CSSStyle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6E08361011B4C63400B99C32 /* extThree20CSSStyle.bundle */; };
-		664D012412664B5F004C20C2 /* stylesheet.css in Resources */ = {isa = PBXBuildFile; fileRef = 6E08373111B4D18D00B99C32 /* stylesheet.css */; };
-		664D012612664B5F004C20C2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
-		664D012712664B5F004C20C2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* AppDelegate.m */; };
-		664D012812664B5F004C20C2 /* Atlas.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E5F1F8A117FBE4D004BEBA9 /* Atlas.m */; };
-		664D012912664B5F004C20C2 /* TTFacebookPost.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E08B425118286D100DA1579 /* TTFacebookPost.m */; };
-		664D012A12664B5F004C20C2 /* TTFacebookSearchFeedDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E08B428118286D900DA1579 /* TTFacebookSearchFeedDataSource.m */; };
-		664D012B12664B5F004C20C2 /* TTFacebookSearchFeedModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E08B42B118286DF00DA1579 /* TTFacebookSearchFeedModel.m */; };
-		664D012C12664B5F004C20C2 /* TTFacebookSearchFeedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E08B42E118286E700DA1579 /* TTFacebookSearchFeedViewController.m */; };
-		664D012E12664B5F004C20C2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		664D012F12664B5F004C20C2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
-		664D013012664B5F004C20C2 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
-		664D013112664B5F004C20C2 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EB383B6410BBF62B0000B2D2 /* QuartzCore.framework */; };
-		664D018412664BEB004C20C2 /* libThree20Core-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 665E9AE0126644770025FA42 /* libThree20Core-Xcode3.2.5.a */; };
-		664D018512664BEB004C20C2 /* libThree20Network-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 665E9AED126644770025FA42 /* libThree20Network-Xcode3.2.5.a */; };
-		664D018612664BEB004C20C2 /* libThree20Style-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 665E9AFA126644770025FA42 /* libThree20Style-Xcode3.2.5.a */; };
-		664D018712664BEB004C20C2 /* libThree20UICommon-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 665E9B07126644770025FA42 /* libThree20UICommon-Xcode3.2.5.a */; };
-		664D018812664BEB004C20C2 /* libThree20UINavigator-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 665E9B14126644770025FA42 /* libThree20UINavigator-Xcode3.2.5.a */; };
-		664D018912664BEB004C20C2 /* libThree20UI-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 665E9B21126644770025FA42 /* libThree20UI-Xcode3.2.5.a */; };
-		664D018A12664BEB004C20C2 /* libThree20-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 665E9B2E126644770025FA42 /* libThree20-Xcode3.2.5.a */; };
-		664D018B12664BEB004C20C2 /* libextThree20JSON+YAJL-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 665E9B42126644770025FA42 /* libextThree20JSON+YAJL-Xcode3.2.5.a */; };
-		664D018C12664BEB004C20C2 /* libextThree20CSSStyle-Xcode3.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 665E9B50126644770025FA42 /* libextThree20CSSStyle-Xcode3.2.5.a */; };
 		6E08360311B4C60300B99C32 /* libextThree20CSSStyle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E08360011B4C5FF00B99C32 /* libextThree20CSSStyle.a */; };
 		6E08361111B4C63400B99C32 /* extThree20CSSStyle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6E08361011B4C63400B99C32 /* extThree20CSSStyle.bundle */; };
 		6E08373211B4D18D00B99C32 /* stylesheet.css in Resources */ = {isa = PBXBuildFile; fileRef = 6E08373111B4D18D00B99C32 /* stylesheet.css */; };
@@ -60,202 +35,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		664D017212664BC2004C20C2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792E811B7F2A40011C497 /* Three20Core.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 6650CA791262F6E2003FF804;
-			remoteInfo = "Three20Core-Xcode3.2.5";
-		};
-		664D017412664BC2004C20C2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792F711B7F2A40011C497 /* Three20UI.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 66FC2AB51264E3A400F56B19;
-			remoteInfo = "Three20UI-Xcode3.2.5";
-		};
-		664D017612664BC2004C20C2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E6462811187DF2C00F08CB1 /* extThree20JSON.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 66C34BB91266200600489E9A;
-			remoteInfo = "extThree20JSON+YAJL-Xcode3.2.5";
-		};
-		664D017812664BC2004C20C2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792F111B7F2A40011C497 /* Three20UICommon.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 665A53601264D54B0032D0BE;
-			remoteInfo = "Three20UICommon-Xcode3.2.5";
-		};
-		664D017A12664BC2004C20C2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792F411B7F2A40011C497 /* Three20UINavigator.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 665A541D1264DAF70032D0BE;
-			remoteInfo = "Three20UINavigator-Xcode3.2.5";
-		};
-		664D017C12664BC2004C20C2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E7F97F5118E385E00443B46 /* Three20.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 665A55C6126521740032D0BE;
-			remoteInfo = "Three20-Xcode3.2.5";
-		};
-		664D017E12664BC2004C20C2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E0835FA11B4C5FF00B99C32 /* extThree20CSSStyle.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 66C34B0412661C0500489E9A;
-			remoteInfo = "extThree20CSSStyle-Xcode3.2.5";
-		};
-		664D018012664BC2004C20C2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792EE11B7F2A40011C497 /* Three20Style.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 66C16B6012639E2700A7825A;
-			remoteInfo = "Three20Style-Xcode3.2.5";
-		};
-		664D018212664BC2004C20C2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792EB11B7F2A40011C497 /* Three20Network.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 662D81C912630516005851C2;
-			remoteInfo = "Three20Network-Xcode3.2.5";
-		};
-		665E9ADF126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792E811B7F2A40011C497 /* Three20Core.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 6650CAA21262F6E2003FF804;
-			remoteInfo = "Three20Core-Xcode3.2.5";
-		};
-		665E9AE3126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792E811B7F2A40011C497 /* Three20Core.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 664961641262EE5000C2C80E;
-			remoteInfo = "Three20CoreUnitTests-Xcode3.2.5";
-		};
-		665E9AEC126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792EB11B7F2A40011C497 /* Three20Network.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 662D81EF12630516005851C2;
-			remoteInfo = "Three20Network-Xcode3.2.5";
-		};
-		665E9AF0126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792EB11B7F2A40011C497 /* Three20Network.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 662D81B2126304EB005851C2;
-			remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5";
-		};
-		665E9AF9126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792EE11B7F2A40011C497 /* Three20Style.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 66C16BE912639E2700A7825A;
-			remoteInfo = "Three20Style-Xcode3.2.5";
-		};
-		665E9AFD126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792EE11B7F2A40011C497 /* Three20Style.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 66C16C0112639E4500A7825A;
-			remoteInfo = "Three20StyleUnitTests-Xcode3.2.5";
-		};
-		665E9B06126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792F111B7F2A40011C497 /* Three20UICommon.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 665A53761264D54B0032D0BE;
-			remoteInfo = "Three20UICommon-Xcode3.2.5";
-		};
-		665E9B0A126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792F111B7F2A40011C497 /* Three20UICommon.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 665A53891264D54B0032D0BE;
-			remoteInfo = "Three20UICommonUnitTests-Xcode3.2.5";
-		};
-		665E9B13126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792F411B7F2A40011C497 /* Three20UINavigator.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 665A54521264DAF70032D0BE;
-			remoteInfo = "Three20UINavigator-Xcode3.2.5";
-		};
-		665E9B17126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792F411B7F2A40011C497 /* Three20UINavigator.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 665A54681264DAF70032D0BE;
-			remoteInfo = "Three20UINavigatorUnitTests-Xcode3.2.5";
-		};
-		665E9B20126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792F711B7F2A40011C497 /* Three20UI.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 66FC2BC81264E3A400F56B19;
-			remoteInfo = "Three20UI-Xcode3.2.5";
-		};
-		665E9B24126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E3792F711B7F2A40011C497 /* Three20UI.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 66FC2BE61264E3A500F56B19;
-			remoteInfo = "Three20UIUnitTests-Xcode3.2.5";
-		};
-		665E9B2D126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E7F97F5118E385E00443B46 /* Three20.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 665A55DE126521740032D0BE;
-			remoteInfo = "Three20-Xcode3.2.5";
-		};
-		665E9B31126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E7F97F5118E385E00443B46 /* Three20.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 665A55FB126521740032D0BE;
-			remoteInfo = "Three20UnitTests-Xcode3.2.5";
-		};
-		665E9B3D126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E6462811187DF2C00F08CB1 /* extThree20JSON.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 66C34BB81266200600489E9A;
-			remoteInfo = "extThree20JSON+SBJSON-Xcode3.2.5";
-		};
-		665E9B41126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E6462811187DF2C00F08CB1 /* extThree20JSON.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 66C34BE41266200600489E9A;
-			remoteInfo = "extThree20JSON+YAJL-Xcode3.2.5";
-		};
-		665E9B45126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E6462811187DF2C00F08CB1 /* extThree20JSON.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 66C34BF91266200600489E9A;
-			remoteInfo = "extThree20JSONUnitTests+SBJSON-Xcode3.2.5";
-		};
-		665E9B4F126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E0835FA11B4C5FF00B99C32 /* extThree20CSSStyle.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 66C34B1D12661C0600489E9A;
-			remoteInfo = "extThree20CSSStyle-Xcode3.2.5";
-		};
-		665E9B53126644770025FA42 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6E0835FA11B4C5FF00B99C32 /* extThree20CSSStyle.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 66C34B3312661C0600489E9A;
-			remoteInfo = "extThree20CSSStyleUnitTests-Xcode3.2.5";
-		};
 		6E0835FF11B4C5FF00B99C32 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6E0835FA11B4C5FF00B99C32 /* extThree20CSSStyle.xcodeproj */;
@@ -462,7 +241,6 @@
 		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		664D013E12664B5F004C20C2 /* TTFacebook-Xcode3.2.5.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "TTFacebook-Xcode3.2.5.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E0835FA11B4C5FF00B99C32 /* extThree20CSSStyle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = extThree20CSSStyle.xcodeproj; path = ../../src/extThree20CSSStyle/extThree20CSSStyle.xcodeproj; sourceTree = SOURCE_ROOT; };
 		6E08361011B4C63400B99C32 /* extThree20CSSStyle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = extThree20CSSStyle.bundle; path = ../../src/extThree20CSSStyle/Resources/extThree20CSSStyle.bundle; sourceTree = SOURCE_ROOT; };
 		6E08373111B4D18D00B99C32 /* stylesheet.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = stylesheet.css; path = Resources/stylesheet.css; sourceTree = "<group>"; };
@@ -517,26 +295,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		664D012D12664B5F004C20C2 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				664D018412664BEB004C20C2 /* libThree20Core-Xcode3.2.5.a in Frameworks */,
-				664D018512664BEB004C20C2 /* libThree20Network-Xcode3.2.5.a in Frameworks */,
-				664D018612664BEB004C20C2 /* libThree20Style-Xcode3.2.5.a in Frameworks */,
-				664D018712664BEB004C20C2 /* libThree20UICommon-Xcode3.2.5.a in Frameworks */,
-				664D018812664BEB004C20C2 /* libThree20UINavigator-Xcode3.2.5.a in Frameworks */,
-				664D018912664BEB004C20C2 /* libThree20UI-Xcode3.2.5.a in Frameworks */,
-				664D018A12664BEB004C20C2 /* libThree20-Xcode3.2.5.a in Frameworks */,
-				664D018B12664BEB004C20C2 /* libextThree20JSON+YAJL-Xcode3.2.5.a in Frameworks */,
-				664D018C12664BEB004C20C2 /* libextThree20CSSStyle-Xcode3.2.5.a in Frameworks */,
-				664D012E12664B5F004C20C2 /* Foundation.framework in Frameworks */,
-				664D012F12664B5F004C20C2 /* UIKit.framework in Frameworks */,
-				664D013012664B5F004C20C2 /* CoreGraphics.framework in Frameworks */,
-				664D013112664B5F004C20C2 /* QuartzCore.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -554,7 +312,6 @@
 			isa = PBXGroup;
 			children = (
 				1D6058910D05DD3D006BFB54 /* TTFacebook.app */,
-				664D013E12664B5F004C20C2 /* TTFacebook-Xcode3.2.5.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -611,9 +368,7 @@
 			isa = PBXGroup;
 			children = (
 				6E08360011B4C5FF00B99C32 /* libextThree20CSSStyle.a */,
-				665E9B50126644770025FA42 /* libextThree20CSSStyle-Xcode3.2.5.a */,
 				6E08360211B4C5FF00B99C32 /* extCSSStyleUnitTests.octest */,
-				665E9B54126644770025FA42 /* extCSSStyleUnitTests-Xcode3.2.5.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -661,9 +416,7 @@
 			isa = PBXGroup;
 			children = (
 				6E3792FD11B7F2A40011C497 /* libThree20Core.a */,
-				665E9AE0126644770025FA42 /* libThree20Core-Xcode3.2.5.a */,
 				6E3792FF11B7F2A40011C497 /* CoreUnitTests.octest */,
-				665E9AE4126644770025FA42 /* CoreUnitTests-Xcode3.2.5.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -672,9 +425,7 @@
 			isa = PBXGroup;
 			children = (
 				6E37930311B7F2A40011C497 /* libThree20Network.a */,
-				665E9AED126644770025FA42 /* libThree20Network-Xcode3.2.5.a */,
 				6E37930511B7F2A40011C497 /* NetworkUnitTests.octest */,
-				665E9AF1126644770025FA42 /* NetworkUnitTests-Xcode3.2.5.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -683,9 +434,7 @@
 			isa = PBXGroup;
 			children = (
 				6E37930911B7F2A40011C497 /* libThree20Style.a */,
-				665E9AFA126644770025FA42 /* libThree20Style-Xcode3.2.5.a */,
 				6E37930B11B7F2A40011C497 /* StyleUnitTests.octest */,
-				665E9AFE126644770025FA42 /* StyleUnitTests-Xcode3.2.5.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -694,9 +443,7 @@
 			isa = PBXGroup;
 			children = (
 				6E37930F11B7F2A40011C497 /* libThree20UICommon.a */,
-				665E9B07126644770025FA42 /* libThree20UICommon-Xcode3.2.5.a */,
 				6E37931111B7F2A40011C497 /* UICommonUnitTests.octest */,
-				665E9B0B126644770025FA42 /* UICommonUnitTests-Xcode3.2.5.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -705,9 +452,7 @@
 			isa = PBXGroup;
 			children = (
 				6E37931511B7F2A40011C497 /* libThree20UINavigator.a */,
-				665E9B14126644770025FA42 /* libThree20UINavigator-Xcode3.2.5.a */,
 				6E37931711B7F2A40011C497 /* UINavigatorUnitTests.octest */,
-				665E9B18126644770025FA42 /* UINavigatorUnitTests-Xcode3.2.5.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -716,9 +461,7 @@
 			isa = PBXGroup;
 			children = (
 				6E37931B11B7F2A40011C497 /* libThree20UI.a */,
-				665E9B21126644770025FA42 /* libThree20UI-Xcode3.2.5.a */,
 				6E37931D11B7F2A40011C497 /* UIUnitTests.octest */,
-				665E9B25126644770025FA42 /* UIUnitTests-Xcode3.2.5.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -787,11 +530,8 @@
 			isa = PBXGroup;
 			children = (
 				6E6462881187DF2C00F08CB1 /* libextThree20JSON+SBJSON.a */,
-				665E9B3E126644770025FA42 /* libextThree20JSON+SBJSON-Xcode3.2.5.a */,
 				6E64628A1187DF2C00F08CB1 /* libextThree20JSON+YAJL.a */,
-				665E9B42126644770025FA42 /* libextThree20JSON+YAJL-Xcode3.2.5.a */,
 				6E64628C1187DF2C00F08CB1 /* extJSONUnitTests+SBJSON.octest */,
-				665E9B46126644770025FA42 /* extJSONUnitTests+SBJSON-Xcode3.2.5.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -800,9 +540,7 @@
 			isa = PBXGroup;
 			children = (
 				6E7F981A118E385E00443B46 /* libThree20.a */,
-				665E9B2E126644770025FA42 /* libThree20-Xcode3.2.5.a */,
 				6E7F981C118E385E00443B46 /* Three20UnitTests.octest */,
-				665E9B32126644770025FA42 /* Three20UnitTests-Xcode3.2.5.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -836,32 +574,6 @@
 			productReference = 1D6058910D05DD3D006BFB54 /* TTFacebook.app */;
 			productType = "com.apple.product-type.application";
 		};
-		664D010C12664B5F004C20C2 /* TTFacebook-Xcode3.2.5 */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 664D013B12664B5F004C20C2 /* Build configuration list for PBXNativeTarget "TTFacebook-Xcode3.2.5" */;
-			buildPhases = (
-				664D011F12664B5F004C20C2 /* Resources */,
-				664D012512664B5F004C20C2 /* Sources */,
-				664D012D12664B5F004C20C2 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				664D017312664BC2004C20C2 /* PBXTargetDependency */,
-				664D017512664BC2004C20C2 /* PBXTargetDependency */,
-				664D017712664BC2004C20C2 /* PBXTargetDependency */,
-				664D017912664BC2004C20C2 /* PBXTargetDependency */,
-				664D017B12664BC2004C20C2 /* PBXTargetDependency */,
-				664D017D12664BC2004C20C2 /* PBXTargetDependency */,
-				664D017F12664BC2004C20C2 /* PBXTargetDependency */,
-				664D018112664BC2004C20C2 /* PBXTargetDependency */,
-				664D018312664BC2004C20C2 /* PBXTargetDependency */,
-			);
-			name = "TTFacebook-Xcode3.2.5";
-			productName = TTFacebook;
-			productReference = 664D013E12664B5F004C20C2 /* TTFacebook-Xcode3.2.5.app */;
-			productType = "com.apple.product-type.application";
-		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -923,145 +635,11 @@
 			projectRoot = "";
 			targets = (
 				1D6058900D05DD3D006BFB54 /* TTFacebook */,
-				664D010C12664B5F004C20C2 /* TTFacebook-Xcode3.2.5 */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		665E9AE0126644770025FA42 /* libThree20Core-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libThree20Core-Xcode3.2.5.a";
-			remoteRef = 665E9ADF126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9AE4126644770025FA42 /* CoreUnitTests-Xcode3.2.5.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "CoreUnitTests-Xcode3.2.5.octest";
-			remoteRef = 665E9AE3126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9AED126644770025FA42 /* libThree20Network-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libThree20Network-Xcode3.2.5.a";
-			remoteRef = 665E9AEC126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9AF1126644770025FA42 /* NetworkUnitTests-Xcode3.2.5.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "NetworkUnitTests-Xcode3.2.5.octest";
-			remoteRef = 665E9AF0126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9AFA126644770025FA42 /* libThree20Style-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libThree20Style-Xcode3.2.5.a";
-			remoteRef = 665E9AF9126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9AFE126644770025FA42 /* StyleUnitTests-Xcode3.2.5.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "StyleUnitTests-Xcode3.2.5.octest";
-			remoteRef = 665E9AFD126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B07126644770025FA42 /* libThree20UICommon-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libThree20UICommon-Xcode3.2.5.a";
-			remoteRef = 665E9B06126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B0B126644770025FA42 /* UICommonUnitTests-Xcode3.2.5.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "UICommonUnitTests-Xcode3.2.5.octest";
-			remoteRef = 665E9B0A126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B14126644770025FA42 /* libThree20UINavigator-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libThree20UINavigator-Xcode3.2.5.a";
-			remoteRef = 665E9B13126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B18126644770025FA42 /* UINavigatorUnitTests-Xcode3.2.5.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "UINavigatorUnitTests-Xcode3.2.5.octest";
-			remoteRef = 665E9B17126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B21126644770025FA42 /* libThree20UI-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libThree20UI-Xcode3.2.5.a";
-			remoteRef = 665E9B20126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B25126644770025FA42 /* UIUnitTests-Xcode3.2.5.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "UIUnitTests-Xcode3.2.5.octest";
-			remoteRef = 665E9B24126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B2E126644770025FA42 /* libThree20-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libThree20-Xcode3.2.5.a";
-			remoteRef = 665E9B2D126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B32126644770025FA42 /* Three20UnitTests-Xcode3.2.5.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Three20UnitTests-Xcode3.2.5.octest";
-			remoteRef = 665E9B31126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B3E126644770025FA42 /* libextThree20JSON+SBJSON-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libextThree20JSON+SBJSON-Xcode3.2.5.a";
-			remoteRef = 665E9B3D126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B42126644770025FA42 /* libextThree20JSON+YAJL-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libextThree20JSON+YAJL-Xcode3.2.5.a";
-			remoteRef = 665E9B41126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B46126644770025FA42 /* extJSONUnitTests+SBJSON-Xcode3.2.5.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "extJSONUnitTests+SBJSON-Xcode3.2.5.octest";
-			remoteRef = 665E9B45126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B50126644770025FA42 /* libextThree20CSSStyle-Xcode3.2.5.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libextThree20CSSStyle-Xcode3.2.5.a";
-			remoteRef = 665E9B4F126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		665E9B54126644770025FA42 /* extCSSStyleUnitTests-Xcode3.2.5.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "extCSSStyleUnitTests-Xcode3.2.5.octest";
-			remoteRef = 665E9B53126644770025FA42 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		6E08360011B4C5FF00B99C32 /* libextThree20CSSStyle.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1210,18 +788,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		664D011F12664B5F004C20C2 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				664D012012664B5F004C20C2 /* Three20.bundle in Resources */,
-				664D012112664B5F004C20C2 /* Default.png in Resources */,
-				664D012212664B5F004C20C2 /* Icon.png in Resources */,
-				664D012312664B5F004C20C2 /* extThree20CSSStyle.bundle in Resources */,
-				664D012412664B5F004C20C2 /* stylesheet.css in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1239,68 +805,9 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		664D012512664B5F004C20C2 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				664D012612664B5F004C20C2 /* main.m in Sources */,
-				664D012712664B5F004C20C2 /* AppDelegate.m in Sources */,
-				664D012812664B5F004C20C2 /* Atlas.m in Sources */,
-				664D012912664B5F004C20C2 /* TTFacebookPost.m in Sources */,
-				664D012A12664B5F004C20C2 /* TTFacebookSearchFeedDataSource.m in Sources */,
-				664D012B12664B5F004C20C2 /* TTFacebookSearchFeedModel.m in Sources */,
-				664D012C12664B5F004C20C2 /* TTFacebookSearchFeedViewController.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		664D017312664BC2004C20C2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "Three20Core-Xcode3.2.5";
-			targetProxy = 664D017212664BC2004C20C2 /* PBXContainerItemProxy */;
-		};
-		664D017512664BC2004C20C2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "Three20UI-Xcode3.2.5";
-			targetProxy = 664D017412664BC2004C20C2 /* PBXContainerItemProxy */;
-		};
-		664D017712664BC2004C20C2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "extThree20JSON+YAJL-Xcode3.2.5";
-			targetProxy = 664D017612664BC2004C20C2 /* PBXContainerItemProxy */;
-		};
-		664D017912664BC2004C20C2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "Three20UICommon-Xcode3.2.5";
-			targetProxy = 664D017812664BC2004C20C2 /* PBXContainerItemProxy */;
-		};
-		664D017B12664BC2004C20C2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "Three20UINavigator-Xcode3.2.5";
-			targetProxy = 664D017A12664BC2004C20C2 /* PBXContainerItemProxy */;
-		};
-		664D017D12664BC2004C20C2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "Three20-Xcode3.2.5";
-			targetProxy = 664D017C12664BC2004C20C2 /* PBXContainerItemProxy */;
-		};
-		664D017F12664BC2004C20C2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "extThree20CSSStyle-Xcode3.2.5";
-			targetProxy = 664D017E12664BC2004C20C2 /* PBXContainerItemProxy */;
-		};
-		664D018112664BC2004C20C2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "Three20Style-Xcode3.2.5";
-			targetProxy = 664D018012664BC2004C20C2 /* PBXContainerItemProxy */;
-		};
-		664D018312664BC2004C20C2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "Three20Network-Xcode3.2.5";
-			targetProxy = 664D018212664BC2004C20C2 /* PBXContainerItemProxy */;
-		};
 		6E08360D11B4C60B00B99C32 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = extThree20CSSStyle;
@@ -1370,51 +877,6 @@
 			};
 			name = Release;
 		};
-		664D013C12664B5F004C20C2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6E64627C1187DF0F00F08CB1 /* App.xcconfig */;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
-				OTHER_LDFLAGS = (
-					"$(THREE20CORE325_LIB)",
-					"$(THREE20NETWORK325_LIB)",
-					"$(THREE20STYLE325_LIB)",
-					"$(THREE20UICOMMON325_LIB)",
-					"$(THREE20UINAVIGATOR325_LIB)",
-					"$(THREE20UI325_LIB)",
-					"$(THREE20325_LIB)",
-					"$(EXTTHREE20CSSSTYLE325_LIB)",
-					"$(EXTTHREE20JSONYAJL325_LIB)",
-				);
-				PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.5";
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		664D013D12664B5F004C20C2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6E64627C1187DF0F00F08CB1 /* App.xcconfig */;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				OTHER_LDFLAGS = (
-					"$(THREE20CORE325_LIB)",
-					"$(THREE20NETWORK325_LIB)",
-					"$(THREE20STYLE325_LIB)",
-					"$(THREE20UICOMMON325_LIB)",
-					"$(THREE20UINAVIGATOR325_LIB)",
-					"$(THREE20UI325_LIB)",
-					"$(THREE20325_LIB)",
-					"$(EXTTHREE20CSSSTYLE325_LIB)",
-					"$(EXTTHREE20JSONYAJL325_LIB)",
-				);
-				PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.5";
-				SDKROOT = iphoneos;
-			};
-			name = Release;
-		};
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6E64627D1187DF0F00F08CB1 /* Project.xcconfig */;
@@ -1455,15 +917,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		664D013B12664B5F004C20C2 /* Build configuration list for PBXNativeTarget "TTFacebook-Xcode3.2.5" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				664D013C12664B5F004C20C2 /* Debug */,
-				664D013D12664B5F004C20C2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TTFacebook" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/samples/TTNavigatorDemo/Configurations/App.xcconfig b/samples/TTNavigatorDemo/Configurations/App.xcconfig
index 40ae29b8db..b57ac69293 100644
--- a/samples/TTNavigatorDemo/Configurations/App.xcconfig
+++ b/samples/TTNavigatorDemo/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTNavigatorDemo
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB)
diff --git a/samples/TTTwitter/Configurations/App.xcconfig b/samples/TTTwitter/Configurations/App.xcconfig
index 201297fe17..8785da6916 100644
--- a/samples/TTTwitter/Configurations/App.xcconfig
+++ b/samples/TTTwitter/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTTwitter
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB) $(EXTTHREE20JSONYAJL_LIB)
diff --git a/samples/UI/TTNibDemo/Configurations/App.xcconfig b/samples/UI/TTNibDemo/Configurations/App.xcconfig
index 549f6a8332..febefe95fb 100644
--- a/samples/UI/TTNibDemo/Configurations/App.xcconfig
+++ b/samples/UI/TTNibDemo/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTNibDemo
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB)
diff --git a/samples/common/Configurations/App.xcconfig b/samples/common/Configurations/App.xcconfig
index 7012ae2b95..df39effefb 100644
--- a/samples/common/Configurations/App.xcconfig
+++ b/samples/common/Configurations/App.xcconfig
@@ -25,7 +25,7 @@ INFOPLIST_FILE = $(BASE_PRODUCT_NAME)-Info.plist
 
 // Linker Flags
 
-OTHER_LDFLAGS           = $(OBJC_LIBRARY) $(OBJC_ALLLOAD)
+OTHER_LDFLAGS           = $(OBJC_LIBRARY)
 
 // Warning flags
 
diff --git a/src/Three20Core/Headers/TTCorePreprocessorMacros.h b/src/Three20Core/Headers/TTCorePreprocessorMacros.h
index f209c2839c..c203b20fb6 100644
--- a/src/Three20Core/Headers/TTCorePreprocessorMacros.h
+++ b/src/Three20Core/Headers/TTCorePreprocessorMacros.h
@@ -26,8 +26,8 @@
 #define __TTDEPRECATED_METHOD __attribute__((deprecated))
 
 /**
- * Add this macro to the end of each category addition implementation, so we don't have to use -all_load
- * or -force_load to load object files from static libraries that only contain categories and no classes.
+ * Add this macro before each category implementation, so we don't have to use -all_load or -force_load
+ * to load object files from static libraries that only contain categories and no classes.
  * See http://developer.apple.com/library/mac/#qa/qa2006/qa1490.html for more info.
  */
 #define TT_FIX_CATEGORY_BUG(name) @interface TT_FIX_CATEGORY_BUG_##name @end @implementation TT_FIX_CATEGORY_BUG_##name @end
diff --git a/src/Three20Core/Sources/NSArrayAdditions.m b/src/Three20Core/Sources/NSArrayAdditions.m
index cdda3f29a8..90949dd16d 100644
--- a/src/Three20Core/Sources/NSArrayAdditions.m
+++ b/src/Three20Core/Sources/NSArrayAdditions.m
@@ -16,7 +16,9 @@
 
 #import "Three20Core/NSArrayAdditions.h"
 
+// Core
 #import "Three20Core/NSObjectAdditions.h"
+#import "Three20Core/TTCorePreprocessorMacros.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -25,6 +27,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSArrayAdditions)
+
 @implementation NSArray (TTCategory)
 
 
@@ -134,6 +138,3 @@ - (BOOL)containsObject:(id)object withSelector:(SEL)selector {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSArrayAdditions)
diff --git a/src/Three20Core/Sources/NSDataAdditions.m b/src/Three20Core/Sources/NSDataAdditions.m
index c07d709048..86b62c1a67 100644
--- a/src/Three20Core/Sources/NSDataAdditions.m
+++ b/src/Three20Core/Sources/NSDataAdditions.m
@@ -18,6 +18,9 @@
 
 #import <CommonCrypto/CommonDigest.h>
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -25,6 +28,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSDataAdditions)
+
 @implementation NSData (TTCategory)
 
 
@@ -53,6 +58,3 @@ - (NSString*)sha1Hash {
 }
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSDataAdditions)
diff --git a/src/Three20Core/Sources/NSDateAdditions.m b/src/Three20Core/Sources/NSDateAdditions.m
index fc7ae1151f..5f869bea32 100644
--- a/src/Three20Core/Sources/NSDateAdditions.m
+++ b/src/Three20Core/Sources/NSDateAdditions.m
@@ -27,6 +27,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSDateAdditions)
+
 @implementation NSDate (TTCategory)
 
 
@@ -252,6 +254,3 @@ - (NSString*)formatYear {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSDateAdditions)
diff --git a/src/Three20Core/Sources/NSMutableArrayAdditions.m b/src/Three20Core/Sources/NSMutableArrayAdditions.m
index 5ab4886a65..c996605538 100644
--- a/src/Three20Core/Sources/NSMutableArrayAdditions.m
+++ b/src/Three20Core/Sources/NSMutableArrayAdditions.m
@@ -16,6 +16,8 @@
 
 #import "Three20Core/NSMutableArrayAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
 #import "Three20Core/TTGlobalCore.h"
 
 
@@ -25,6 +27,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSMutableArrayAdditions)
+
 @implementation NSMutableArray (TTCategory)
 
 
@@ -37,6 +41,3 @@ - (void) addNonEmptyString:(NSString*)string {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSMutableArrayAdditions)
diff --git a/src/Three20Core/Sources/NSMutableDictionaryAdditions.m b/src/Three20Core/Sources/NSMutableDictionaryAdditions.m
index a3557bf18f..8fd20bec44 100644
--- a/src/Three20Core/Sources/NSMutableDictionaryAdditions.m
+++ b/src/Three20Core/Sources/NSMutableDictionaryAdditions.m
@@ -17,6 +17,7 @@
 #import "Three20Core/NSMutableDictionaryAdditions.h"
 
 // Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
 #import "Three20Core/TTGlobalCore.h"
 
 
@@ -26,6 +27,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSMutableDictionaryAdditions)
+
 @implementation NSMutableDictionary (TTCategory)
 
 
@@ -38,6 +41,3 @@ - (void)setNonEmptyString:(NSString*)string forKey:(id)key {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSMutableDictionaryAdditions)
diff --git a/src/Three20Core/Sources/NSObjectAdditions.m b/src/Three20Core/Sources/NSObjectAdditions.m
index 7185e9694b..4762072322 100644
--- a/src/Three20Core/Sources/NSObjectAdditions.m
+++ b/src/Three20Core/Sources/NSObjectAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20Core/NSObjectAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -23,6 +26,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSObjectAdditions)
+
 @implementation NSObject (TTAdditions)
 
 
@@ -161,6 +166,3 @@ - (id)performSelector:(SEL)selector withObject:(id)p1 withObject:(id)p2 withObje
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSObjectAdditions)
diff --git a/src/Three20Core/Sources/NSStringAdditions.m b/src/Three20Core/Sources/NSStringAdditions.m
index 729e5090c2..f117924e07 100644
--- a/src/Three20Core/Sources/NSStringAdditions.m
+++ b/src/Three20Core/Sources/NSStringAdditions.m
@@ -17,6 +17,7 @@
 #import "Three20Core/NSStringAdditions.h"
 
 // Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
 #import "Three20Core/TTMarkupStripper.h"
 #import "Three20Core/NSDataAdditions.h"
 
@@ -24,6 +25,11 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+/**
+ * Additions.
+ */
+TT_FIX_CATEGORY_BUG(NSStringAdditions)
+
 @implementation NSString (TTAdditions)
 
 
@@ -174,6 +180,3 @@ - (NSString*)sha1Hash {
 }
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSStringAdditions)
diff --git a/src/Three20Style/Sources/TTStyleInternal.m b/src/Three20Style/Sources/TTStyleInternal.m
index 07344dd07f..c0cae07730 100644
--- a/src/Three20Style/Sources/TTStyleInternal.m
+++ b/src/Three20Style/Sources/TTStyleInternal.m
@@ -16,12 +16,18 @@
 
 #import "Three20Style/private/TTStyleInternal.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
+
 const NSInteger kDefaultLightSource = 125;
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(TTStyleInternal)
+
 @implementation TTStyle (TTInternal)
 
 
@@ -62,7 +68,3 @@ - (CGGradientRef)newGradientWithColors:(UIColor**)colors count:(int)count {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(TTStyleInternal)
-
diff --git a/src/Three20Style/Sources/TTStyledNodeInternal.m b/src/Three20Style/Sources/TTStyledNodeInternal.m
index 16ee568202..7cded31c2b 100644
--- a/src/Three20Style/Sources/TTStyledNodeInternal.m
+++ b/src/Three20Style/Sources/TTStyledNodeInternal.m
@@ -16,10 +16,15 @@
 
 #import "Three20Style/private/TTStyledNodeInternal.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(TTStyledNodeInternal)
+
 @implementation TTStyledNode (TTInternal)
 
 
@@ -36,7 +41,3 @@ - (TTStyledNode*)findLastSibling:(TTStyledNode*)sibling {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(TTStyledNodeInternal)
-
diff --git a/src/Three20Style/Sources/UIColorAdditions.m b/src/Three20Style/Sources/UIColorAdditions.m
index f2aeb50836..c6424b9479 100644
--- a/src/Three20Style/Sources/UIColorAdditions.m
+++ b/src/Three20Style/Sources/UIColorAdditions.m
@@ -16,6 +16,10 @@
 
 #import "Three20Style/UIColorAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Color algorithms from http://www.cs.rit.edu/~ncs/color/t_convert.html
 
@@ -106,6 +110,8 @@ void HSVtoRGB( float *r, float *g, float *b, float h, float s, float v ) {
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UIColorAdditions)
+
 @implementation UIColor (TTCategory)
 
 
@@ -210,6 +216,3 @@ - (CGFloat)value {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIColorAdditions)
diff --git a/src/Three20Style/Sources/UIFontAdditions.m b/src/Three20Style/Sources/UIFontAdditions.m
index 177e6cbd35..24652d7aa0 100644
--- a/src/Three20Style/Sources/UIFontAdditions.m
+++ b/src/Three20Style/Sources/UIFontAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20Style/UIFontAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -23,6 +26,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UIFontAdditions)
+
 @implementation UIFont (TTCategory)
 
 
@@ -32,6 +37,3 @@ - (CGFloat)ttLineHeight {
 }
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIFontAdditions)
diff --git a/src/Three20Style/Sources/UIImageAdditions.m b/src/Three20Style/Sources/UIImageAdditions.m
index d074c035db..d82ffdbdaa 100644
--- a/src/Three20Style/Sources/UIImageAdditions.m
+++ b/src/Three20Style/Sources/UIImageAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20Style/UIImageAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -23,6 +26,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UIImageAdditions)
+
 @implementation UIImage (TTCategory)
 
 
@@ -229,6 +234,3 @@ - (void)drawInRect:(CGRect)rect radius:(CGFloat)radius contentMode:(UIViewConten
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIImageAdditions)
diff --git a/src/Three20UI/Sources/TTImageViewInternal.m b/src/Three20UI/Sources/TTImageViewInternal.m
index b8edbc82a8..0eb78fbc75 100644
--- a/src/Three20UI/Sources/TTImageViewInternal.m
+++ b/src/Three20UI/Sources/TTImageViewInternal.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/private/TTImageViewInternal.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/TTImageViewDelegate.h"
 #import "Three20UI/UIViewAdditions.h"
@@ -27,6 +30,8 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(TTImageViewInternal)
+
 @implementation TTImageView (TTInternal)
 
 
@@ -106,7 +111,3 @@ - (void)setStyle:(TTStyle*)style {
 
 
 @end
-
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(TTImageViewInternal)
diff --git a/src/Three20UI/Sources/TTSearchTextFieldInternal.m b/src/Three20UI/Sources/TTSearchTextFieldInternal.m
index ba0e63a53e..2fd5ef52d1 100644
--- a/src/Three20UI/Sources/TTSearchTextFieldInternal.m
+++ b/src/Three20UI/Sources/TTSearchTextFieldInternal.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/private/TTSearchTextFieldInternal.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/TTSearchTextField.h"
 
@@ -23,6 +26,8 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(TTSearchTextFieldInternal)
+
 @implementation TTSearchTextFieldInternal
 
 @synthesize delegate = _delegate;
@@ -129,6 +134,3 @@ - (BOOL)textFieldShouldReturn:(UITextField*)textField {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(TTSearchTextFieldInternal)
diff --git a/src/Three20UI/Sources/TTTabBarInternal.m b/src/Three20UI/Sources/TTTabBarInternal.m
index 8715a7f368..eeff489b61 100644
--- a/src/Three20UI/Sources/TTTabBarInternal.m
+++ b/src/Three20UI/Sources/TTTabBarInternal.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/private/TTTabBarInternal.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/TTTab.h"
 #import "Three20UI/UIViewAdditions.h"
@@ -28,6 +31,8 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(TTTabBarInternal)
+
 @implementation TTTabBar (TTInternal)
 
 
@@ -88,6 +93,3 @@ - (CGSize)layoutTabs {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(TTTabBarInternal)
diff --git a/src/Three20UI/Sources/TTTextEditorInternal.m b/src/Three20UI/Sources/TTTextEditorInternal.m
index 49b1e8442d..db278f2485 100644
--- a/src/Three20UI/Sources/TTTextEditorInternal.m
+++ b/src/Three20UI/Sources/TTTextEditorInternal.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/private/TTTextEditorInternal.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/TTTextEditorDelegate.h"
 
@@ -23,6 +26,8 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(TTTextEditorInternal)
+
 @implementation TTTextEditorInternal
 
 @synthesize ignoreBeginAndEnd = _ignoreBeginAndEnd;
@@ -213,6 +218,3 @@ - (BOOL)textFieldShouldReturn:(UITextField *)textField {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(TTTextEditorInternal)
diff --git a/src/Three20UI/Sources/UINSObjectAdditions.m b/src/Three20UI/Sources/UINSObjectAdditions.m
index 1431352c8e..6939013af8 100644
--- a/src/Three20UI/Sources/UINSObjectAdditions.m
+++ b/src/Three20UI/Sources/UINSObjectAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/UINSObjectAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/TTNavigator.h"
 
@@ -29,6 +32,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UINSObjectAdditions)
+
 @implementation NSObject (TTCategory)
 
 
@@ -45,7 +50,3 @@ - (NSString*)URLValueWithName:(NSString*)name {
 
 
 @end
-
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UINSObjectAdditions)
diff --git a/src/Three20UI/Sources/UINSStringAdditions.m b/src/Three20UI/Sources/UINSStringAdditions.m
index 9df6d5fb38..dba10446e7 100644
--- a/src/Three20UI/Sources/UINSStringAdditions.m
+++ b/src/Three20UI/Sources/UINSStringAdditions.m
@@ -14,6 +14,9 @@
 
 #import "Three20UI/UINSStringAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/TTNavigator.h"
 
@@ -29,6 +32,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UINSStringAdditions)
+
 @implementation NSString (TTCategory)
 
 
@@ -56,6 +61,3 @@ - (void)openURLFromButton:(UIView*)button {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UINSStringAdditions)
diff --git a/src/Three20UI/Sources/UINavigationControllerAdditions.m b/src/Three20UI/Sources/UINavigationControllerAdditions.m
index 77c4807cbc..af6411ec21 100644
--- a/src/Three20UI/Sources/UINavigationControllerAdditions.m
+++ b/src/Three20UI/Sources/UINavigationControllerAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/UINavigationControllerAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/TTNavigator.h"
 #import "Three20UI/TTNavigationController.h"
@@ -38,6 +41,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UINavigationControllerAdditions)
+
 @implementation UINavigationController (TTCategory)
 
 
@@ -132,7 +137,3 @@ - (void)persistNavigationPath:(NSMutableArray*)path {
 
 
 @end
-
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UINavigationControllerAdditions)
diff --git a/src/Three20UI/Sources/UITabBarControllerAdditions.m b/src/Three20UI/Sources/UITabBarControllerAdditions.m
index 7a74e173e8..ce9c03b127 100644
--- a/src/Three20UI/Sources/UITabBarControllerAdditions.m
+++ b/src/Three20UI/Sources/UITabBarControllerAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/UITabBarControllerAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/TTNavigator.h"
 #import "Three20UI/TTNavigationController.h"
@@ -30,6 +33,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UITabBarControllerAdditions)
+
 @implementation UITabBarController (TTCategory)
 
 
@@ -122,6 +127,3 @@ - (void)setTabURLs:(NSArray*)URLs {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UITabBarControllerAdditions)
diff --git a/src/Three20UI/Sources/UITableViewAdditions.m b/src/Three20UI/Sources/UITableViewAdditions.m
index e38486b357..e9ac83271e 100644
--- a/src/Three20UI/Sources/UITableViewAdditions.m
+++ b/src/Three20UI/Sources/UITableViewAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/UITableViewAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/UIViewAdditions.h"
 
@@ -29,6 +32,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UITableViewAdditions)
+
 @implementation UITableView (TTCategory)
 
 
@@ -134,6 +139,3 @@ - (void)touchRowAtIndexPath:(NSIndexPath*)indexPath animated:(BOOL)animated {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UITableViewAdditions)
diff --git a/src/Three20UI/Sources/UIToolbarAdditions.m b/src/Three20UI/Sources/UIToolbarAdditions.m
index df3ae1507d..600dfc04bf 100644
--- a/src/Three20UI/Sources/UIToolbarAdditions.m
+++ b/src/Three20UI/Sources/UIToolbarAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/UIToolbarAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -23,6 +26,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UIToolbarAdditions)
+
 @implementation UIToolbar (TTCategory)
 
 
@@ -53,6 +58,3 @@ - (void)replaceItemWithTag:(NSInteger)tag withItem:(UIBarButtonItem*)item {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIToolbarAdditions)
diff --git a/src/Three20UI/Sources/UIViewAdditions.m b/src/Three20UI/Sources/UIViewAdditions.m
index 75aefb5b80..379531fb27 100644
--- a/src/Three20UI/Sources/UIViewAdditions.m
+++ b/src/Three20UI/Sources/UIViewAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/UIViewAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UINavigator
 #import "Three20UINavigator/TTGlobalNavigatorMetrics.h"
 
@@ -158,6 +161,11 @@ - (id)initWithTouch:(UITouch *)touch {
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+/**
+ * Additions.
+ */
+TT_FIX_CATEGORY_BUG(UIViewAdditions)
+
 @implementation UIView (TTCategory)
 
 
@@ -525,6 +533,3 @@ - (void)dismissAsKeyboard:(BOOL)animated {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIViewAdditions)
diff --git a/src/Three20UI/Sources/UIWebViewAdditions.m b/src/Three20UI/Sources/UIWebViewAdditions.m
index 11622ec52d..f4973f4465 100644
--- a/src/Three20UI/Sources/UIWebViewAdditions.m
+++ b/src/Three20UI/Sources/UIWebViewAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20UI/UIWebViewAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 // UI
 #import "Three20UI/UIViewAdditions.h"
 
@@ -26,6 +29,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UIWebViewAdditions)
+
 @implementation UIWebView (TTCategory)
 
 
@@ -67,6 +72,3 @@ - (void)simulateTapElement:(NSString*)query {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIWebViewAdditions)
diff --git a/src/Three20UICommon/Sources/UISplitViewController+TTNavigator.m b/src/Three20UICommon/Sources/UISplitViewController+TTNavigator.m
index 49b36e1539..29bcc2fd9f 100644
--- a/src/Three20UICommon/Sources/UISplitViewController+TTNavigator.m
+++ b/src/Three20UICommon/Sources/UISplitViewController+TTNavigator.m
@@ -16,10 +16,15 @@
 
 #import "UISplitViewController+TTNavigator.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(UISplitViewController_TTNavigator)
+
 @implementation UISplitViewController (TTNavigator)
 
 
@@ -42,4 +47,3 @@ - (UIViewController*)superController {
 
 
 @end
-
diff --git a/src/Three20UICommon/Sources/UIView+TTUICommon.m b/src/Three20UICommon/Sources/UIView+TTUICommon.m
index f64b454242..d1a360314a 100644
--- a/src/Three20UICommon/Sources/UIView+TTUICommon.m
+++ b/src/Three20UICommon/Sources/UIView+TTUICommon.m
@@ -16,10 +16,18 @@
 
 #import "UIView+TTUICommon.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+/**
+ * Additions.
+ */
+TT_FIX_CATEGORY_BUG(UIView_TTUICommon)
+
 @implementation UIView (TTUICommon)
 
 
diff --git a/src/Three20UICommon/Sources/UIViewControllerAdditions.m b/src/Three20UICommon/Sources/UIViewControllerAdditions.m
index 71c8aa7cd2..e4496d36f0 100644
--- a/src/Three20UICommon/Sources/UIViewControllerAdditions.m
+++ b/src/Three20UICommon/Sources/UIViewControllerAdditions.m
@@ -42,6 +42,11 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+/**
+ * Additions.
+ */
+TT_FIX_CATEGORY_BUG(UIViewControllerAdditions)
+
 @implementation UIViewController (TTCategory)
 
 
@@ -378,6 +383,3 @@ - (void)unsetCommonProperties {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIViewControllerAdditions)
diff --git a/src/Three20UICommon/Sources/UIWindowAdditions.m b/src/Three20UICommon/Sources/UIWindowAdditions.m
index 767b2edb6e..0cd0c406b4 100644
--- a/src/Three20UICommon/Sources/UIWindowAdditions.m
+++ b/src/Three20UICommon/Sources/UIWindowAdditions.m
@@ -16,6 +16,9 @@
 
 #import "Three20UICommon/UIWindowAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -23,6 +26,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UIWindowAdditions)
+
 @implementation UIWindow (TTCategory)
 
 
@@ -53,6 +58,3 @@ - (UIView*)findFirstResponderInView:(UIView*)topView {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIWindowAdditions)
diff --git a/src/Three20UINavigator/Sources/TTURLPatternInternal.m b/src/Three20UINavigator/Sources/TTURLPatternInternal.m
index f14fdc927c..d83bc0787f 100644
--- a/src/Three20UINavigator/Sources/TTURLPatternInternal.m
+++ b/src/Three20UINavigator/Sources/TTURLPatternInternal.m
@@ -16,10 +16,15 @@
 
 #import "Three20UINavigator/private/TTURLPatternInternal.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(TTURLPatternInternal)
+
 @implementation TTURLPattern (TTInternal)
 
 
@@ -32,7 +37,3 @@ - (void)setSelectorWithNames:(NSArray*)names {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(TTURLPatternInternal)
-
diff --git a/src/Three20UINavigator/Sources/UIViewController+TTNavigator.m b/src/Three20UINavigator/Sources/UIViewController+TTNavigator.m
index b03584e034..36b539bd4f 100644
--- a/src/Three20UINavigator/Sources/UIViewController+TTNavigator.m
+++ b/src/Three20UINavigator/Sources/UIViewController+TTNavigator.m
@@ -43,6 +43,11 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+/**
+ * Additions.
+ */
+TT_FIX_CATEGORY_BUG(UIViewController_TTNavigator)
+
 @implementation UIViewController (TTNavigator)
 
 
@@ -189,6 +194,3 @@ - (void)unsetNavigatorProperties {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIViewController_TTNavigator)
diff --git a/src/extThree20JSON/Vendors/JSON/NSObject+SBJSON.m b/src/extThree20JSON/Vendors/JSON/NSObject+SBJSON.m
index a17bf2123a..7263d14e40 100755
--- a/src/extThree20JSON/Vendors/JSON/NSObject+SBJSON.m
+++ b/src/extThree20JSON/Vendors/JSON/NSObject+SBJSON.m
@@ -30,6 +30,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #import "extThree20JSON/NSObject+SBJSON.h"
 #import "extThree20JSON/SBJsonWriter.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
+
+TT_FIX_CATEGORY_BUG(NSObject_SBJSON)
+
 @implementation NSObject (NSObject_SBJSON)
 
 - (NSString *)JSONRepresentation {
@@ -42,6 +48,3 @@ - (NSString *)JSONRepresentation {
 }
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSObject_SBJSON)
diff --git a/src/extThree20JSON/Vendors/JSON/NSString+SBJSON.m b/src/extThree20JSON/Vendors/JSON/NSString+SBJSON.m
index 6f292b3608..32d7c76664 100755
--- a/src/extThree20JSON/Vendors/JSON/NSString+SBJSON.m
+++ b/src/extThree20JSON/Vendors/JSON/NSString+SBJSON.m
@@ -30,6 +30,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #import "extThree20JSON/NSString+SBJSON.h"
 #import "extThree20JSON/SBJsonParser.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
+
+TT_FIX_CATEGORY_BUG(NSString_SBJSON)
+
 @implementation NSString (NSString_SBJSON)
 
 - (id)JSONValue
@@ -43,7 +49,3 @@ - (id)JSONValue
 }
 
 @end
-
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSString_SBJSON)
diff --git a/src/extThree20JSON/Vendors/YAJL/NSObject+YAJL.m b/src/extThree20JSON/Vendors/YAJL/NSObject+YAJL.m
index 8b71e7bfd7..6aa9406b24 100644
--- a/src/extThree20JSON/Vendors/YAJL/NSObject+YAJL.m
+++ b/src/extThree20JSON/Vendors/YAJL/NSObject+YAJL.m
@@ -31,6 +31,12 @@
 #import "extThree20JSON/YAJLGen.h"
 #import "extThree20JSON/YAJLDocument.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
+
+TT_FIX_CATEGORY_BUG(NSObject_YAJL)
+
 @implementation NSObject(YAJL)
 
 #pragma mark Gen
@@ -77,6 +83,3 @@ - (id)yajl_JSONWithOptions:(YAJLParserOptions)options error:(NSError **)error {
 }
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSObject_JAJL)