Painfully organize HTML wallpapers below bulletins.

[winterboard.git] / Library.mm

diff --git a/Library.mm b/Library.mm
index 34efd272a2c15e20950d98c23a0f55f5fa0ff496..b40f67e97e9a60683657e43b648f24bd49bbcc80 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -1,5 +1,5 @@
 /* WinterBoard - Theme Manager for the iPhone
 /* WinterBoard - Theme Manager for the iPhone

- * Copyright (C) 2008  Jay Freeman (saurik)
+ * Copyright (C) 2008-2011  Jay Freeman (saurik)

 */
 
 /*
 */
 
 /*


@@ -35,70 +35,172 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 

-#define _trace() NSLog(@"WB:_trace(%u)", __LINE__);
-#define _transient
+#include <sys/time.h>

 
 

-#include <substrate.h>
+struct timeval _ltv;
+bool _itv;
+
+#define _trace() do { \
+    struct timeval _ctv; \
+    gettimeofday(&_ctv, NULL); \
+    if (!_itv) { \
+        _itv = true; \
+        _ltv = _ctv; \
+    } \
+    NSLog(@"%lu.%.6u[%f]:WB:_trace()@%s:%u[%s]\n", \
+        _ctv.tv_sec, _ctv.tv_usec, \
+        (_ctv.tv_sec - _ltv.tv_sec) + (_ctv.tv_usec - _ltv.tv_usec) / 1000000.0, \
+        __FILE__, __LINE__, __FUNCTION__\
+    ); \
+    _ltv = _ctv; \
+} while (false)
+
+#define _transient

 
 #import <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
 
 #import <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>

+#import <ImageIO/CGImageSource.h>

 
 

-#import <UIKit/UIColor.h>
-#import <UIKit/UIFont.h>
-#import <UIKit/UIImage.h>
-#import <UIKit/UIImageView.h>
-#import <UIKit/UINavigationBar.h>
-#import <UIKit/UINavigationBarBackground.h>
-#import <UIKit/UIToolbar.h>
-#import <UIKit/UIWebDocumentView.h>
+#import <Celestial/AVController.h>
+#import <Celestial/AVItem.h>
+#import <Celestial/AVQueue.h>

 
 

-#import <UIKit/NSString-UIStringDrawing.h>
-#import <UIKit/NSString-UIStringDrawingDeprecated.h>
-
-#import <UIKit/UIImage-UIImageDeprecated.h>
+#include <substrate.h>

 
 

-#import <UIKit/UIView-Geometry.h>
-#import <UIKit/UIView-Hierarchy.h>
-#import <UIKit/UIView-Rendering.h>
+#import <UIKit/UIKit.h>

 
 #import <SpringBoard/SBApplication.h>
 #import <SpringBoard/SBApplicationIcon.h>
 #import <SpringBoard/SBAppWindow.h>
 
 #import <SpringBoard/SBApplication.h>
 #import <SpringBoard/SBApplicationIcon.h>
 #import <SpringBoard/SBAppWindow.h>

+#import <SpringBoard/SBAwayView.h>

 #import <SpringBoard/SBBookmarkIcon.h>
 #import <SpringBoard/SBButtonBar.h>
 #import <SpringBoard/SBCalendarIconContentsView.h>
 #import <SpringBoard/SBBookmarkIcon.h>
 #import <SpringBoard/SBButtonBar.h>
 #import <SpringBoard/SBCalendarIconContentsView.h>

-#import <SpringBoard/SBContentLayer.h>

 #import <SpringBoard/SBIconController.h>
 #import <SpringBoard/SBIconLabel.h>
 #import <SpringBoard/SBIconController.h>
 #import <SpringBoard/SBIconLabel.h>

-#import <SpringBoard/SBSlidingAlertDisplay.h>
+#import <SpringBoard/SBIconList.h>
+#import <SpringBoard/SBIconModel.h>
+#import <SpringBoard/SBImageCache.h>
+// XXX: #import <SpringBoard/SBSearchView.h>
+#import <SpringBoard/SBSearchTableViewCell.h>

 #import <SpringBoard/SBStatusBarContentsView.h>
 #import <SpringBoard/SBStatusBarController.h>
 #import <SpringBoard/SBStatusBarContentsView.h>
 #import <SpringBoard/SBStatusBarController.h>

+#import <SpringBoard/SBStatusBarOperatorNameView.h>

 #import <SpringBoard/SBStatusBarTimeView.h>
 #import <SpringBoard/SBUIController.h>
 #import <SpringBoard/SBStatusBarTimeView.h>
 #import <SpringBoard/SBUIController.h>

+#import <SpringBoard/SBWidgetApplicationIcon.h>

 
 

+#import <MobileSMS/mSMSMessageTranscriptController.h>
+
+#import <MediaPlayer/MPMoviePlayerController.h>

 #import <MediaPlayer/MPVideoView.h>
 #import <MediaPlayer/MPVideoView-PlaybackControl.h>
 
 #import <CoreGraphics/CGGeometry.h>
 
 #import <MediaPlayer/MPVideoView.h>
 #import <MediaPlayer/MPVideoView-PlaybackControl.h>
 
 #import <CoreGraphics/CGGeometry.h>
 

+#import <ChatKit/CKMessageCell.h>
+
+#include <sys/sysctl.h>
+
+#include "WBMarkup.h"
+

 extern "C" void __clear_cache (char *beg, char *end);
 
 extern "C" void __clear_cache (char *beg, char *end);
 

+static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_AssociationPolicy policy);
+static id (*$objc_getAssociatedObject)(id object, void *key);
+static void (*$objc_removeAssociatedObjects)(id object);
+
+@protocol WinterBoard
+- (void *) _node;
+@end
+
+Class $MPMoviePlayerController;

 Class $MPVideoView;
 
 Class $MPVideoView;
 

-Class $UIColor;
-Class $UIImage;
-Class $UIImageView;
-Class $UIWebDocumentView;
+MSClassHook(NSBundle)
+MSClassHook(NSString)
+
+MSClassHook(UIImage)
+MSMetaClassHook(UIImage)
+MSClassHook(UIImageTableArtwork)
+MSClassHook(UINavigationBar)
+MSClassHook(UISharedArtwork)
+MSClassHook(UIToolbar)
+MSClassHook(UIStatusBarTimeItemView)
+MSClassHook(UIWebDocumentView)
+
+MSClassHook(CKBalloonView)
+MSClassHook(CKMessageCell)
+MSClassHook(CKTimestampView)
+MSClassHook(CKTranscriptCell)
+MSClassHook(CKTranscriptController)
+MSClassHook(CKTranscriptHeaderView)
+MSClassHook(CKTranscriptTableView)
+
+MSClassHook(SBApplication)
+MSClassHook(SBApplicationIcon)
+MSClassHook(SBAwayView)
+MSClassHook(SBBookmarkIcon)
+MSClassHook(SBButtonBar)
+MSClassHook(SBCalendarApplicationIcon)
+MSClassHook(SBCalendarIconContentsView)
+MSClassHook(SBDockIconListView)
+MSClassHook(SBIcon)
+MSClassHook(SBIconAccessoryImage)
+MSMetaClassHook(SBIconAccessoryImage)
+MSClassHook(SBIconBadge)
+MSClassHook(SBIconBadgeFactory)
+MSClassHook(SBIconBadgeImage)
+MSClassHook(SBIconContentView)
+MSClassHook(SBIconController)
+MSClassHook(SBIconLabel)
+MSClassHook(SBIconLabelImage)
+MSMetaClassHook(SBIconLabelImage)
+MSClassHook(SBIconLabelImageParameters)
+MSClassHook(SBIconList)
+MSClassHook(SBIconModel)
+MSClassHook(SBIconView)
+MSMetaClassHook(SBIconView)
+//MSClassHook(SBImageCache)
+MSClassHook(SBSearchView)
+MSClassHook(SBSearchTableViewCell)
+MSClassHook(SBSlidingAlertDisplay)
+MSClassHook(SBStatusBarContentsView)
+MSClassHook(SBStatusBarController)
+MSClassHook(SBStatusBarOperatorNameView)
+MSClassHook(SBStatusBarTimeView)
+MSClassHook(SBUIController)
+MSClassHook(SBWallpaperView)
+MSClassHook(SBWidgetApplicationIcon)
+
+extern "C" void WKSetCurrentGraphicsContext(CGContextRef);
+
+static struct MSFixClass { MSFixClass() {
+    $UIWebDocumentView = objc_getClass("UIWebBrowserView") ?: $UIWebDocumentView;
+    $SBIcon = objc_getClass("SBIconView") ?: $SBIcon;
+
+    if ($SBIconList == nil)
+        $SBIconList = objc_getClass("SBIconListView");
+    if ($CKTranscriptController == nil)
+        $CKTranscriptController = objc_getClass("mSMSMessageTranscriptController");
+} } MSFixClass;
+
+static bool IsWild_;
+static bool Four_($SBDockIconListView != nil);
+
+@interface NSObject (wb$SBIconAccessoryImage)
++ (Class) _imageClassForIcon:(SBIcon *)icon location:(int)location;
+@end

 
 @interface NSDictionary (WinterBoard)
 
 @interface NSDictionary (WinterBoard)

-- (UIColor *) colorForKey:(NSString *)key;
-- (BOOL) boolForKey:(NSString *)key;
+- (UIColor *) wb$colorForKey:(NSString *)key;
+- (BOOL) wb$boolForKey:(NSString *)key;

 @end
 
 @implementation NSDictionary (WinterBoard)
 
 @end
 
 @implementation NSDictionary (WinterBoard)
 

-- (UIColor *) colorForKey:(NSString *)key {
+- (UIColor *) wb$colorForKey:(NSString *)key {

     NSString *value = [self objectForKey:key];
     if (value == nil)
         return nil;
     NSString *value = [self objectForKey:key];
     if (value == nil)
         return nil;


@@ -106,7 +208,7 @@ Class $UIWebDocumentView;
     return nil;
 }
 
     return nil;
 }
 

-- (BOOL) boolForKey:(NSString *)key {
+- (BOOL) wb$boolForKey:(NSString *)key {

     if (NSString *value = [self objectForKey:key])
         return [value boolValue];
     return false;
     if (NSString *value = [self objectForKey:key])
         return [value boolValue];
     return false;


@@ -114,234 +216,465 @@ Class $UIWebDocumentView;
 
 @end
 
 
 @end
 

-bool Debug_ = false;
-bool Engineer_ = false;
-
-/* WinterBoard Backend {{{ */
-void WBInject(const char *classname, const char *oldname, IMP newimp, const char *type) {
-    Class _class = objc_getClass(classname);
-    if (_class == nil)
-        return;
-    if (!class_addMethod(_class, sel_registerName(oldname), newimp, type))
-        NSLog(@"WB:Error: failed to inject [%s %s]", classname, oldname);
-}
+static BOOL (*_GSFontGetUseLegacyFontMetrics)();
+#define $GSFontGetUseLegacyFontMetrics() \
+    (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics())

 
 

-/* }}} */
+static bool Debug_ = false;
+static bool UIDebug_ = false;
+static bool Engineer_ = false;
+static bool SummerBoard_ = false;
+static bool SpringBoard_;

 
 

-@protocol WinterBoard
-- (CGSize) wb_renderedSizeOfNode:(id)node constrainedToWidth:(float)width;
-- (void *) _node;
-- (void) wb_updateDesktopImage:(UIImage *)image;
-- (UIImage *) wb_defaultDesktopImage;
-- (NSString *) wb_bundlePath;
-- (NSString *) wb_pathForIcon;
-- (NSString *) wb_pathForResource:(NSString *)resource ofType:(NSString *)type;
-- (id) wb_init;
-- (id) wb_layer;
-- (id) wb_initWithSize:(CGSize)size;
-- (id) wb_initWithSize:(CGSize)size label:(NSString *)label;
-- (id) wb_initWithFrame:(CGRect)frame;
-- (id) wb_initWithCoder:(NSCoder *)coder;
-- (void) wb_setFrame:(CGRect)frame;
-- (void) wb_drawRect:(CGRect)rect;
-- (void) wb_setBackgroundColor:(id)color;
-- (void) wb_setAlpha:(float)value;
-- (void) wb_setBarStyle:(int)style;
-- (id) wb_initWithFrame:(CGRect)frame withBarStyle:(int)style withTintColor:(UIColor *)color;
-- (void) wb_setOpaque:(BOOL)opaque;
-- (void) wb_setInDock:(BOOL)docked;
-- (void) wb_didMoveToSuperview;
-+ (UIImage *) wb_imageNamed:(NSString *)name inBundle:(NSBundle *)bundle;
-+ (UIImage *) wb_applicationImageNamed:(NSString *)name;
-- (NSDictionary *) wb_infoDictionary;
-- (UIImage *) wb_icon;
-- (void) wb_appendIconList:(SBIconList *)list;
-- (id) wb_initWithStatusBar:(id)bar mode:(int)mode;
-- (id) wb_initWithMode:(int)mode orientation:(int)orientation;
-- (id) wb_imageAtPath:(NSString *)path;
-- (id) wb_initWithContentsOfFile:(NSString *)file;
-- (id) wb_initWithContentsOfFile:(NSString *)file cache:(BOOL)cache;
-- (void) wb_setStatusBarMode:(int)mode orientation:(int)orientation duration:(float)duration fenceID:(int)id animation:(int)animation;
-@end
+static UIImage *(*_UIApplicationImageWithName)(NSString *name);
+static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain);
+static NSBundle *(*_UIKitBundle)();
+static bool (*_UIPackedImageTableGetIdentifierForName)(NSString *, int *);
+static int (*_UISharedImageNameGetIdentifier)(NSString *);

 
 

-static NSMutableDictionary **__mappedImages;
-static NSMutableDictionary *UIImages_;
-static NSMutableDictionary *PathImages_;
+static NSMutableDictionary *UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:32];
+static NSMutableDictionary *PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16];
+static NSMutableDictionary *Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64];
+static NSMutableDictionary *Strings_ = [[NSMutableDictionary alloc] initWithCapacity:0];
+static NSMutableDictionary *Bundles_ = [[NSMutableDictionary alloc] initWithCapacity:2];

 
 static NSFileManager *Manager_;
 
 static NSFileManager *Manager_;

+static NSMutableArray *Themes_;
+

 static NSDictionary *English_;
 static NSMutableDictionary *Info_;
 static NSDictionary *English_;
 static NSMutableDictionary *Info_;

-static NSMutableArray *themes_;

 
 

-static NSString *$getTheme$(NSArray *files) {
-    for (NSString *theme in themes_)
-        for (NSString *file in files) {
-            NSString *path([NSString stringWithFormat:@"%@/%@", theme, file]);
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
-        }
+// $getTheme$() {{{
+static NSMutableDictionary *Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128];

 
 

-    return nil;
+static unsigned Scale_ = 0;
+
+static unsigned $getScale$(NSString *path) {
+    NSString *name(path);
+
+    #define StripName(strip) \
+        if ([name hasSuffix:@ strip]) \
+            name = [name substringWithRange:NSMakeRange(0, [name length] - sizeof(strip) - 1)];
+
+    StripName(".png");
+    StripName(".jpg");
+    StripName("~iphone");
+    StripName("~ipad");
+
+    return [name hasSuffix:@"@2x"] ? 2 : 1;

 }
 
 }
 

-static NSString *$pathForIcon$(SBApplication<WinterBoard> *self) {
-    for (NSString *theme in themes_) {
-        NSString *identifier = [self bundleIdentifier];
-        NSString *folder = [[self path] lastPathComponent];
-        NSString *dname = [self displayName];
-        NSString *didentifier = [self displayIdentifier];
+static NSArray *$useScale$(NSArray *files, bool use = true) {
+    if (use && Scale_ == 0) {
+        UIScreen *screen([UIScreen mainScreen]);
+        if ([screen respondsToSelector:@selector(scale)])
+            Scale_ = [screen scale];
+        else
+            Scale_ = 1;
+    }

 
 

-        if (Debug_)
-            NSLog(@"WB:Debug: [SBApplication(%@:%@:%@:%@) pathForIcon]", identifier, folder, dname, didentifier);
+    if (Scale_ == 1)
+        return files;
+
+    NSString *idiom(IsWild_ ? @"ipad" : @"iphone");
+
+    NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 4)]);

 
 

-        #define testForIcon(Name) \
-            if (NSString *name = Name) { \
-                NSString *path = [NSString stringWithFormat:@"%@/Icons/%@.png", theme, name]; \
-                if ([Manager_ fileExistsAtPath:path]) \
-                    return path; \
+    for (NSString *file in files) {
+        NSString *base([file stringByDeletingPathExtension]);
+        NSString *extension([file pathExtension]);
+
+        if (use) {
+            if (Scale_ == 2) {
+                [scaled addObject:[NSString stringWithFormat:@"%@@2x~%@.%@", base, idiom, extension]];
+                [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", base, extension]];

             }
 
             }
 

-        if (identifier != nil) {
-            NSString *path = [NSString stringWithFormat:@"%@/Bundles/%@/icon.png", theme, identifier];
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
-        }
+            [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
+
+            // if (!IsWild_) <- support old themes
+            [scaled addObject:file];
+        } else if ([base hasSuffix: @"@2x"]) {
+            [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
+            [scaled addObject:file];
+
+            // XXX: this actually can't be used, as the person loading the file doesn't realize that the @2x changed
+            /*NSString *rest([base substringWithRange:NSMakeRange(0, [base length] - 3)]);
+            [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", rest, idiom, extension]];
+            [scaled addObject:[rest stringByAppendingPathExtension:extension]];*/
+        } else {
+            // XXX: this code isn't really complete

 
 

-        if (folder != nil) {
-            NSString *path = [NSString stringWithFormat:@"%@/Folders/%@/icon.png", theme, folder];
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
+            [scaled addObject:file];
+
+            if ([base hasSuffix:[NSString stringWithFormat:@"~%@", idiom]])
+                [scaled addObject:[[base substringWithRange:NSMakeRange(0, [base length] - 1 - [idiom length])] stringByAppendingPathExtension:extension]];

         }
         }

+    }
+
+    return scaled;
+}

 
 

-        testForIcon(identifier);
-        testForIcon(dname);
+static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) {
+    // XXX: this is not reasonable; OMG
+    id key(files);

 
 

-        if (didentifier != nil) {
-            testForIcon([English_ objectForKey:didentifier]);
+    @synchronized (Themed_) {
+        if (NSString *path = [Themed_ objectForKey:key])
+            return reinterpret_cast<id>(path) == [NSNull null] ? nil : path;
+    }
+
+    if (Debug_)
+        NSLog(@"WB:Debug: %@", [files description]);
+
+    NSString *path;

 
 

-            NSArray *parts = [didentifier componentsSeparatedByString:@"-"];
-            if ([parts count] != 1)
-                if (NSDictionary *english = [[[NSDictionary alloc] initWithContentsOfFile:[[self path] stringByAppendingString:@"/English.lproj/UIRoleDisplayNames.strings"]] autorelease])
-                    testForIcon([english objectForKey:[parts lastObject]]);
+    for (NSString *theme in Themes_)
+        for (NSString *file in files) {
+            path = [NSString stringWithFormat:@"%@/%@", theme, file];
+            if ([Manager_ fileExistsAtPath:path]) {
+                if ([[Manager_ pathContentOfSymbolicLinkAtPath:path] isEqualToString:@"/"])
+                    path = nil;
+                goto set;
+            }

         }
         }

+
+    path = nil;
+  set:
+
+    @synchronized (Themed_) {
+        [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast<id>(path)) forKey:key];

     }
 
     }
 

-    return nil;
+    return path;

 }
 }

+// }}}
+// $pathForFile$inBundle$() {{{
+static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui, bool use) {
+    NSString *identifier = [bundle bundleIdentifier];
+    NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
+
+    if (identifier != nil)
+        [names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]];
+    if (NSString *folder = [[bundle bundlePath] lastPathComponent]) {
+        [names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
+        NSString *base([folder stringByDeletingPathExtension]);
+        if ([base hasSuffix:@"~iphone"])
+            [names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 7)], [folder pathExtension], file]];
+        if ([base hasSuffix:@"~ipad"])
+            [names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 5)], [folder pathExtension], file]];
+    }
+    if (ui)
+        [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];
+
+    #define remapResourceName(oldname, newname) \
+        else if ([file isEqualToString:(oldname)]) \
+            [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \
+
+    bool summer(SpringBoard_ && SummerBoard_);
+
+    if (identifier == nil);
+    else if ([identifier isEqualToString:@"com.apple.chatkit"])
+        [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.MobileSMS/%@", file]];
+    else if ([identifier isEqualToString:@"com.apple.calculator"])
+        [names addObject:[NSString stringWithFormat:@"Files/Applications/Calculator.app/%@", file]];
+    else if ([identifier isEqualToString:@"com.apple.Maps"] && [file isEqualToString:@"Icon-57@2x.png"])
+        [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.Maps/icon.png"]];
+    else if (!summer);
+        remapResourceName(@"FSO_BG.png", @"StatusBar")
+        remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock")
+        remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
+
+    [names addObject:[NSString stringWithFormat:@"Fallback/%@", file]];
+
+    if (NSString *path = $getTheme$($useScale$(names, use)))
+        return path;

 
 

-static UIImage *SBApplicationIcon$icon(SBApplicationIcon<WinterBoard> *self, SEL sel) {
-    if (![Info_ boolForKey:@"ComposeStoreIcons"])
-        if (NSString *path = $pathForIcon$([self application]))
-            return [$UIImage imageWithContentsOfFile:path];
-    return [self wb_icon];
+    return nil;

 }
 }

+// }}}
+
+static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
+    NSString *identifier = [self bundleIdentifier];
+    NSString *path = [self path];
+    NSString *folder = [path lastPathComponent];
+    NSString *dname = [self displayName];
+    NSString *didentifier = [self displayIdentifier];

 
 

-static UIImage *SBBookmarkIcon$icon(SBBookmarkIcon<WinterBoard> *self, SEL sel) {

     if (Debug_)
     if (Debug_)

-        NSLog(@"WB:Debug:Bookmark(%@:%@)", [self displayIdentifier], [self displayName]);
-    if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Icons/%@.png", [self displayName]]]))
-        return [$UIImage imageWithContentsOfFile:path];
-    return [self wb_icon];
-}
+        NSLog(@"WB:Debug: [SBApplication(%@:%@:%@:%@) pathForIcon]", identifier, folder, dname, didentifier);

 
 

-static NSString *SBApplication$pathForIcon(SBApplication<WinterBoard> *self, SEL sel) {
-    if (NSString *path = $pathForIcon$(self))
+    NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
+
+    /* XXX: I might need to keep this for backwards compatibility
+    if (identifier != nil)
+        [names addObject:[NSString stringWithFormat:@"Bundles/%@/icon.png", identifier]];
+    if (folder != nil)
+        [names addObject:[NSString stringWithFormat:@"Folders/%@/icon.png", folder]]; */
+
+    #define testForIcon(Name) \
+        if (NSString *name = Name) \
+            [names addObject:[NSString stringWithFormat:@"Icons%@/%@.png", suffix, name]];
+
+    if (![didentifier isEqualToString:identifier])
+        testForIcon(didentifier);
+
+    testForIcon(identifier);
+    testForIcon(dname);
+
+    if ([identifier isEqualToString:@"com.apple.MobileSMS"])
+        testForIcon(@"SMS");
+
+    if (didentifier != nil) {
+        testForIcon([English_ objectForKey:didentifier]);
+
+        NSArray *parts = [didentifier componentsSeparatedByString:@"-"];
+        if ([parts count] != 1)
+            if (NSDictionary *english = [[[NSDictionary alloc] initWithContentsOfFile:[path stringByAppendingString:@"/English.lproj/UIRoleDisplayNames.strings"]] autorelease])
+                testForIcon([english objectForKey:[parts lastObject]]);
+    }
+
+    if (NSString *path = $getTheme$(names))

         return path;
         return path;

-    return [self wb_pathForIcon];
+
+    return nil;
+}
+
+// -[NSBundle wb$bundleWithFile] {{{
+@interface NSBundle (WinterBoard)
++ (NSBundle *) wb$bundleWithFile:(NSString *)path;
+@end
+
+@implementation NSBundle (WinterBoard)
+
++ (NSBundle *) wb$bundleWithFile:(NSString *)path {
+    path = [path stringByDeletingLastPathComponent];
+    if (path == nil || [path length] == 0 || [path isEqualToString:@"/"])
+        return nil;
+
+    NSBundle *bundle([Bundles_ objectForKey:path]);
+    if (reinterpret_cast<id>(bundle) == [NSNull null])
+        return nil;
+    else if (bundle == nil) {
+        if ([Manager_ fileExistsAtPath:[path stringByAppendingPathComponent:@"Info.plist"]])
+            bundle = [NSBundle bundleWithPath:path];
+        if (bundle == nil)
+            bundle = [NSBundle wb$bundleWithFile:path];
+        if (Debug_)
+            NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle);
+        [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast<id>(bundle)) forKey:path];
+    }
+
+    return bundle;

 }
 
 }
 

-static NSString *$pathForFile$inBundle$(NSString *file, NSBundle<WinterBoard> *bundle, bool ui) {
-    for (NSString *theme in themes_) {
-        NSString *identifier = [bundle bundleIdentifier];
+@end
+// }}}
+// -[NSString wb$themedPath] {{{
+@interface NSString (WinterBoard)
+- (NSString *) wb$themedPath;
+@end
+
+@implementation NSString (WinterBoard)
+
+- (NSString *) wb$themedPath {
+    if ([self hasPrefix:@"/Library/Themes/"])
+        return self;
+
+    if (Debug_)
+        NSLog(@"WB:Debug:Bypass(\"%@\")", self);

 
 

-        if (identifier != nil) {
-            NSString *path = [NSString stringWithFormat:@"%@/Bundles/%@/%@", theme, identifier, file];
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
+    if (NSBundle *bundle = [NSBundle wb$bundleWithFile:self]) {
+        NSString *file([self stringByResolvingSymlinksInPath]);
+        NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]);
+        if ([file hasPrefix:prefix]) {
+            NSUInteger length([prefix length]);
+            if (length != [file length])
+                if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false, false))
+                    return path;

         }
         }

+    }
+
+    return self;
+}
+
+@end
+// }}}
+
+void WBLogRect(const char *tag, struct CGRect rect) {
+    NSLog(@"%s:{%f,%f+%f,%f}", tag, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+}
+
+void WBLogHierarchy(UIView *view, unsigned index = 0, unsigned indent = 0) {
+    CGRect frame([view frame]);
+    NSLog(@"%*s|%2d:%p:%s : {%f,%f+%f,%f} (%@)", indent * 3, "", index, view, class_getName([view class]), frame.origin.x, frame.origin.y, frame.size.width, frame.size.height, [view backgroundColor]);
+    index = 0;
+    for (UIView *child in [view subviews])
+        WBLogHierarchy(child, index++, indent + 1);
+}
+
+UIImage *$cacheForImage$(UIImage *image) {
+    CGColorSpaceRef space(CGColorSpaceCreateDeviceRGB());
+    CGRect rect = {CGPointMake(1, 1), [image size]};
+    CGSize size = {rect.size.width + 2, rect.size.height + 2};
+
+    CGContextRef context(CGBitmapContextCreate(NULL, size.width, size.height, 8, 4 * size.width, space, kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst));
+    CGColorSpaceRelease(space);
+
+    CGContextDrawImage(context, rect, [image CGImage]);
+    CGImageRef ref(CGBitmapContextCreateImage(context));
+    CGContextRelease(context);
+
+    UIImage *cache([UIImage imageWithCGImage:ref]);
+    CGImageRelease(ref);

 
 

-        if (NSString *folder = [[bundle wb_bundlePath] lastPathComponent]) {
-            NSString *path = [NSString stringWithFormat:@"%@/Folders/%@/%@", theme, folder, file];
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
+    return cache;
+}
+
+/*MSHook(id, SBImageCache$initWithName$forImageWidth$imageHeight$initialCapacity$, SBImageCache *self, SEL sel, NSString *name, unsigned width, unsigned height, unsigned capacity) {
+    //if ([name isEqualToString:@"icons"]) return nil;
+    return _SBImageCache$initWithName$forImageWidth$imageHeight$initialCapacity$(self, sel, name, width, height, capacity);
+}*/
+
+MSHook(void, SBIconModel$cacheImageForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) {
+    NSString *key([icon displayIdentifier]);
+
+    if (UIImage *image = [icon icon]) {
+        CGSize size = [image size];
+        if (size.width != 59 || size.height != 60) {
+            UIImage *cache($cacheForImage$(image));
+            [Cache_ setObject:cache forKey:key];
+            return;

         }
         }

+    }

 
 

-        #define remapResourceName(oldname, newname) \
-            else if ([file isEqualToString:oldname]) { \
-                NSString *path = [NSString stringWithFormat:@"%@/%@.png", theme, newname]; \
-                if ([Manager_ fileExistsAtPath:path]) \
-                    return path; \
-            }
+    _SBIconModel$cacheImageForIcon$(self, sel, icon);
+}

 
 

-        if (identifier == nil || ![identifier isEqualToString:@"com.apple.springboard"]);
-            remapResourceName(@"FSO_BG.png", @"StatusBar")
-            remapResourceName(@"SBDockBG.png", @"Dock")
-            remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
+MSHook(void, SBIconModel$cacheImagesForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) {
+    /* XXX: do I /really/ have to do this? figure out how to cache the small icon! */
+    _SBIconModel$cacheImagesForIcon$(self, sel, icon);

 
 

-        if (ui) {
-            NSString *path = [NSString stringWithFormat:@"%@/UIImages/%@", theme, file];
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
+    NSString *key([icon displayIdentifier]);
+
+    if (UIImage *image = [icon icon]) {
+        CGSize size = [image size];
+        if (size.width != 59 || size.height != 60) {
+            UIImage *cache($cacheForImage$(image));
+            [Cache_ setObject:cache forKey:key];
+            return;

         }
     }
         }
     }

+}

 
 

-    return nil;
+MSHook(UIImage *, SBIconModel$getCachedImagedForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) {
+    NSString *key([icon displayIdentifier]);
+    if (UIImage *image = [Cache_ objectForKey:key])
+        return image;
+    else
+        return _SBIconModel$getCachedImagedForIcon$(self, sel, icon);

 }
 
 }
 

-static UIImage *CachedImageAtPath(NSString *path) {
-    UIImage *image = [PathImages_ objectForKey:path];
-    if (image != nil)
-        return reinterpret_cast<id>(image) == [NSNull null] ? nil : image;
-    image = [[$UIImage alloc] wb_initWithContentsOfFile:path cache:true];
-    if (image != nil)
-        image = [image autorelease];
-    [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:path];
-    return image;
+MSHook(UIImage *, SBIconModel$getCachedImagedForIcon$smallIcon$, SBIconModel *self, SEL sel, SBIcon *icon, BOOL small) {
+    if (small)
+        return _SBIconModel$getCachedImagedForIcon$smallIcon$(self, sel, icon, small);
+    NSString *key([icon displayIdentifier]);
+    if (UIImage *image = [Cache_ objectForKey:key])
+        return image;
+    else
+        return _SBIconModel$getCachedImagedForIcon$smallIcon$(self, sel, icon, small);

 }
 
 }
 

-static UIImage *UIImage$imageNamed$inBundle$(Class<WinterBoard> self, SEL sel, NSString *name, NSBundle *bundle) {
-    NSString *key = [NSString stringWithFormat:@"B:%@/%@", [bundle bundleIdentifier], name];
-    UIImage *image = [PathImages_ objectForKey:key];
-    if (image != nil)
-        return reinterpret_cast<id>(image) == [NSNull null] ? nil : image;
-    if (Debug_)
-        NSLog(@"WB:Debug: [UIImage(%@) imageNamed:\"%@\"]", [bundle bundleIdentifier], name);
-    if (NSString *path = $pathForFile$inBundle$(name, bundle, false))
-        image = CachedImageAtPath(path);
-    if (image == nil)
-        image = [self wb_imageNamed:name inBundle:bundle];
-    [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
-    return image;
+MSHook(id, SBSearchView$initWithFrame$, id /* XXX: SBSearchView */ self, SEL sel, struct CGRect frame) {
+    if ((self = _SBSearchView$initWithFrame$(self, sel, frame)) != nil) {
+        [self setBackgroundColor:[UIColor clearColor]];
+        for (UIView *child in [self subviews])
+            [child setBackgroundColor:[UIColor clearColor]];
+    } return self;

 }
 
 }
 

-static UIImage *UIImage$imageNamed$(Class<WinterBoard> self, SEL sel, NSString *name) {
-    return UIImage$imageNamed$inBundle$(self, sel, name, [NSBundle mainBundle]);
+MSHook(id, SBSearchTableViewCell$initWithStyle$reuseIdentifier$, SBSearchTableViewCell *self, SEL sel, int style, NSString *reuse) {
+    if ((self = _SBSearchTableViewCell$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) {
+        [self setBackgroundColor:[UIColor clearColor]];
+    } return self;

 }
 
 }
 

-static UIImage *UIImage$applicationImageNamed$(Class<WinterBoard> self, SEL sel, NSString *name) {
-    NSBundle *bundle = [NSBundle mainBundle];
-    if (Debug_)
-        NSLog(@"WB:Debug: [UIImage(%@) applicationImageNamed:\"%@\"]", [bundle bundleIdentifier], name);
-    if (NSString *path = $pathForFile$inBundle$(name, bundle, false))
-        return CachedImageAtPath(path);
-    return [self wb_applicationImageNamed:name];
+MSHook(void, SBSearchTableViewCell$drawRect$, SBSearchTableViewCell *self, SEL sel, struct CGRect rect, BOOL selected) {
+    _SBSearchTableViewCell$drawRect$(self, sel, rect, selected);
+    float inset([self edgeInset]);
+    [[UIColor clearColor] set];
+    UIRectFill(CGRectMake(0, 0, inset, rect.size.height));
+    UIRectFill(CGRectMake(rect.size.width - inset, 0, inset, rect.size.height));

 }
 
 }
 

-@interface NSString (WinterBoard)
-- (NSString *) wb_themedPath;
-@end
+MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) {
+    if (![Info_ wb$boolForKey:@"ComposeStoreIcons"])
+        if (NSString *path = $pathForIcon$([self application]))
+            return [UIImage imageWithContentsOfFile:path];
+    return _SBApplicationIcon$icon(self, sel);
+}

 
 

-@implementation NSString (WinterBoard)
+MSHook(UIImage *, SBApplicationIcon$generateIconImage$, SBApplicationIcon *self, SEL sel, int type) {
+    if (type == 2)
+        if (![Info_ wb$boolForKey:@"ComposeStoreIcons"]) {
+            if (IsWild_ && false) // XXX: delete this code, it should not be supported
+                if (NSString *path72 = $pathForIcon$([self application], @"-72"))
+                    return [UIImage imageWithContentsOfFile:path72];
+            if (NSString *path = $pathForIcon$([self application]))
+                if (UIImage *image = [UIImage imageWithContentsOfFile:path]) {
+                    float width;
+                    if ([$SBIcon respondsToSelector:@selector(defaultIconImageSize)])
+                        width = [$SBIcon defaultIconImageSize].width;
+                    else
+                        width = 59;
+                    return width == 59 ? image : [image _imageScaledToProportion:(width / 59.0) interpolationQuality:5];
+                }
+        }
+    return _SBApplicationIcon$generateIconImage$(self, sel, type);
+}

 
 

-- (NSString *) wb_themedPath {
+MSHook(UIImage *, SBWidgetApplicationIcon$icon, SBWidgetApplicationIcon *self, SEL sel) {

     if (Debug_)
     if (Debug_)

-        NSLog(@"WB:Debug:Bypass(\"%@\")", self);
-    return self;
+        NSLog(@"WB:Debug:Widget(%@:%@)", [self displayIdentifier], [self displayName]);
+    if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Icons/%@.png", [self displayName]]]))
+        return [UIImage imageWithContentsOfFile:path];
+    return _SBWidgetApplicationIcon$icon(self, sel);

 }
 
 }
 

-@end
+MSHook(UIImage *, SBBookmarkIcon$icon, SBBookmarkIcon *self, SEL sel) {
+    if (Debug_)
+        NSLog(@"WB:Debug:Bookmark(%@:%@)", [self displayIdentifier], [self displayName]);
+    if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Icons/%@.png", [self displayName]]]))
+        return [UIImage imageWithContentsOfFile:path];
+    return _SBBookmarkIcon$icon(self, sel);
+}
+
+MSHook(NSString *, SBApplication$pathForIcon, SBApplication *self, SEL sel) {
+    if (NSString *path = $pathForIcon$(self))
+        return path;
+    return _SBApplication$pathForIcon(self, sel);
+}
+
+static UIImage *CachedImageAtPath(NSString *path) {
+    path = [path stringByResolvingSymlinksInPath];
+    UIImage *image = [PathImages_ objectForKey:path];
+    if (image != nil)
+        return reinterpret_cast<id>(image) == [NSNull null] ? nil : image;
+    image = [[UIImage alloc] initWithContentsOfFile:path cache:true];
+    if (image != nil)
+        image = [image autorelease];
+    [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:path];
+    return image;
+}

 
 

-static NSMutableDictionary *Files_;
+MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) {
+    NSBundle *bundle = [NSBundle mainBundle];
+    if (Debug_)
+        NSLog(@"WB:Debug: _UIApplicationImageWithName(\"%@\", %@)", name, bundle);
+    if (NSString *path = $pathForFile$inBundle$(name, bundle, false, false))
+        return CachedImageAtPath(path);
+    return __UIApplicationImageWithName(name);
+}

 
 #define WBDelegate(delegate) \
     - (NSMethodSignature*) methodSignatureForSelector:(SEL)sel { \
 
 #define WBDelegate(delegate) \
     - (NSMethodSignature*) methodSignatureForSelector:(SEL)sel { \


@@ -361,141 +694,300 @@ static NSMutableDictionary *Files_;
             NSLog(@"WB:Error: [%s forwardInvocation:(%s)]", class_getName([self class]), sel_getName(sel)); \
     }
 
             NSLog(@"WB:Error: [%s forwardInvocation:(%s)]", class_getName([self class]), sel_getName(sel)); \
     }
 

-/*@interface WBBundlePath : NSProxy {
-    NSBundle<WinterBoard> *bundle_;
-    NSString *path_;
+// %hook -[NSBundle pathForResource:ofType:] {{{
+MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, resource, NSString *, type) {
+    NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type];
+    if (Debug_)
+        NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file);
+    if (NSString *path = $pathForFile$inBundle$(file, self, false, false))
+        return path;
+    return MSOldCall(resource, type);

 }
 }

+// }}}
+
+static void $drawLabel$(NSString *label, CGRect rect, NSString *style, NSString *custom) {
+    bool ellipsis(false);
+    float max = rect.size.width - 11, width;
+  width:
+    width = [(ellipsis ? [label stringByAppendingString:@"..."] : label) sizeWithStyle:style forWidth:320].width;
+
+    if (width > max) {
+        size_t length([label length]);
+        float spacing((width - max) / (length - 1));
+
+        if (spacing > 1.25) {
+            ellipsis = true;
+            label = [label substringToIndex:(length - 1)];
+            goto width;
+        }

 
 

-- (id) initWithBundle:(NSBundle *)bundle path:(NSString *)path;
-
-- (NSString *) wb_themedPath;
+        style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", spacing]];
+    }

 
 

-@end
+    if (ellipsis)
+        label = [label stringByAppendingString:@"..."];

 
 

-@implementation WBBundlePath
+    if (custom != nil)
+        style = [style stringByAppendingString:custom];

 
 

-- (void) dealloc {
-    [bundle_ release];
-    [path_ release];
-    [super dealloc];
+    CGSize size = [label sizeWithStyle:style forWidth:rect.size.width];
+    [label drawAtPoint:CGPointMake((rect.size.width - size.width) / 2 + rect.origin.x, rect.origin.y) withStyle:style];

 }
 
 }
 

-- (id) initWithBundle:(NSBundle *)bundle path:(NSString *)path {
-    bundle_ = [bundle retain];
-    path_ = [path retain];
-    return self;
+static struct WBStringDrawingState {
+    WBStringDrawingState *next_;
+    unsigned count_;
+    NSString *base_;
+    NSString *info_;
+} *stringDrawingState_;
+
+extern "C" CGColorSpaceRef CGContextGetFillColorSpace(CGContextRef);
+extern "C" void CGContextGetFillColor(CGContextRef, CGFloat[]);
+
+static NSString *WBColorMarkup() {
+    CGContextRef context(UIGraphicsGetCurrentContext());
+    //NSLog(@"XXX:1:%p", context);
+    if (context == NULL)
+        return @"";
+
+    CGColorSpaceRef space(CGContextGetFillColorSpace(context));
+    //NSLog(@"XXX:2:%p", space);
+    if (space == NULL)
+        return @"";
+
+    size_t number(CGColorSpaceGetNumberOfComponents(space));
+    //NSLog(@"XXX:3:%u", number);
+    if (number == 0)
+        return @"";
+
+    CGFloat components[number + 1];
+    CGContextGetFillColor(context, components);
+
+    CGFloat r, g, b, a;
+
+    switch (number) {
+        case 1:
+            r = components[0];
+            g = components[0];
+            b = components[0];
+            a = components[1];
+        break;
+
+        case 3:
+            r = components[0];
+            g = components[1];
+            b = components[2];
+            a = components[3];
+        break;
+
+        default:
+            return @"";
+    }
+
+    return [NSString stringWithFormat:@"color: rgba(%g, %g, %g, %g)", r * 255, g * 255, b * 255, a];

 }
 
 }
 

-WBDelegate(path_)
+MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing,includeEmoji, CGPoint, point, float, width, UIFont *, font, UILineBreakMode, mode, float, spacing, BOOL, emoji) {
+    //NSLog(@"XXX: @\"%@\" %g", self, spacing);
+
+    WBStringDrawingState *state(stringDrawingState_);
+    if (state == NULL)
+        return MSOldCall(point, width, font, mode, spacing, emoji);
+
+    if (--state->count_ == 0)
+        stringDrawingState_ = state->next_;
+    if (state->info_ == nil)
+        return MSOldCall(point, width, font, mode, spacing, emoji);
+
+    NSString *info([Info_ objectForKey:state->info_]);
+    if (info == nil)
+        return MSOldCall(point, width, font, mode, spacing, emoji);

 
 

-- (NSString *) stringByAppendingPathComponent:(NSString *)component {
-    NSLog(@"WB:Debug:app:%@:%@", path_, component);
-    return [[[WBBundlePath alloc] initWithBundle:bundle_ path:[path_ stringByAppendingPathComponent:component]] autorelease];
+    NSString *base(state->base_ ?: @"");
+    NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]);
+    [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info]];
+    return CGSizeZero;

 }
 
 }
 

-- (NSString *) stringByAppendingPathExtension:(NSString *)extension {
-    return [[[WBBundlePath alloc] initWithBundle:bundle_ path:[path_ stringByAppendingPathExtension:extension]] autorelease];
+extern "C" NSString *NSStringFromCGRect(CGRect rect);
+
+MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alignment,lineSpacing,includeEmoji,truncationRect, CGRect, rect, UIFont *, font, UILineBreakMode, mode, UITextAlignment, alignment, float, spacing, BOOL, emoji, CGRect, truncation) {
+    //NSLog(@"XXX: &\"%@\" %@ \"%@\" %u %u %g %u %@", self, NSStringFromCGRect(rect), font, mode, alignment, spacing, emoji, NSStringFromCGRect(truncation));
+
+    WBStringDrawingState *state(stringDrawingState_);
+    if (state == NULL)
+        return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
+
+    if (--state->count_ == 0)
+        stringDrawingState_ = state->next_;
+    if (state->info_ == nil)
+        return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
+
+    NSString *info([Info_ objectForKey:state->info_]);
+    if (info == nil)
+        return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
+
+    NSString *textAlign;
+    switch (alignment) {
+        default:
+        case UITextAlignmentLeft:
+            textAlign = @"left";
+            break;
+        case UITextAlignmentCenter:
+            textAlign = @"center";
+            break;
+        case UITextAlignmentRight:
+            textAlign = @"right";
+            break;
+    }
+
+    NSString *base(state->base_ ?: @"");
+    NSString *extra([NSString stringWithFormat:@"text-align: %@", textAlign]);
+
+    if (true)
+        $drawLabel$(self, rect, [NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], WBColorMarkup(), base], info);
+    else
+        [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info]];
+
+    return CGSizeZero;

 }
 
 }
 

-- (const char *) UTF8String {
-    const char *string = [path_ UTF8String];
-    NSLog(@"WB:Debug:UTF=%s", string);
-    return string;
+MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, float, width, UILineBreakMode, mode, float, spacing) {
+    //NSLog(@"XXX: #\"%@\" \"%@\" %g %u %g", self, font, width, mode, spacing);
+
+    WBStringDrawingState *state(stringDrawingState_);
+    if (state == NULL)
+        return MSOldCall(font, width, mode, spacing);
+
+    if (--state->count_ == 0)
+        stringDrawingState_ = state->next_;
+    if (state->info_ == nil)
+        return MSOldCall(font, width, mode, spacing);
+
+    NSString *info([Info_ objectForKey:state->info_]);
+    if (info == nil)
+        return MSOldCall(font, width, mode, spacing);
+
+    NSString *base(state->base_ ?: @"");
+    NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]);
+    return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info] forWidth:width];

 }
 
 }
 

-- (NSString *) description {
-    return [path_ description];
+MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) {
+    //NSLog(@"XXX: ?\"%@\"", self);
+
+    WBStringDrawingState *state(stringDrawingState_);
+    if (state == NULL)
+        return MSOldCall(font);
+
+    if (--state->count_ == 0)
+        stringDrawingState_ = state->next_;
+    if (state->info_ == nil)
+        return MSOldCall(font);
+
+    NSString *info([Info_ objectForKey:state->info_]);
+    if (info == nil)
+        return MSOldCall(font);
+
+    NSString *base(state->base_ ?: @"");
+    return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), base, info] forWidth:65535];

 }
 
 }
 

-- (NSString *) wb_themedPath {
-    return path_;
-    NSString *path = [Files_ objectForKey:path_];
-    if (path == nil) {
-        NSString *path = [bundle_ wb_bundlePath];
-        if (![path_ hasPrefix:path]) {
-            NSLog(@"WB:Error:![@\"%@\" hasPrefix:@\"%@\"]", path_, path);
-            return path_;
-        }
-        path = [path_ substringFromIndex:([path length] + 1)];
-        path = $pathForFile$inBundle$(path, bundle_, false);
-        if (path == nil)
-            path = reinterpret_cast<NSString *>([NSNull null]);
-        [Files_ setObject:path forKey:path_];
-        if (Debug_)
-            NSLog(@"WB:Debug:ThemePath(\"%@\")->\"%@\"", path_, path);
-    }
-    if (reinterpret_cast<id>(path) == [NSNull null])
-        path = path_;
-    NSLog(@"WB:Debug:ThemePath=%@", path);
-    return path;
+MSClassMessageHook2(UIImage *, SBIconAccessoryImage, checkoutAccessoryImageForIcon,location, id, icon, int, location) {
+    if ([self _imageClassForIcon:icon location:location] != $SBIconBadgeImage)
+        return MSOldCall(icon, location);
+
+    WBStringDrawingState badgeState = {NULL, -1, @""
+    , @"BadgeStyle"};
+
+    stringDrawingState_ = &badgeState;
+
+    UIImage *image(MSOldCall(icon, location));
+
+    stringDrawingState_ = NULL;
+    return image;

 }
 
 }
 

-@end*/
+MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, NSString *, text) {
+    WBStringDrawingState badgeState = {NULL, -1, @""
+    , @"BadgeStyle"};
+
+    stringDrawingState_ = &badgeState;
+
+    UIImage *image(MSOldCall(text));

 
 

-static NSString *NSBundle$bundlePath$(NSBundle<WinterBoard> *self, SEL sel) {
-    //return [[WBBundlePath alloc] initWithBundle:self path:[self wb_bundlePath]];
-    return [self wb_bundlePath];
+    stringDrawingState_ = NULL;
+    return image;

 }
 
 }
 

-static NSString *NSBundle$pathForResource$ofType$(NSBundle<WinterBoard> *self, SEL sel, NSString *resource, NSString *type) {
-    NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type];
-    if (Debug_)
-        NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file);
-    if (NSString *path = $pathForFile$inBundle$(file, self, false))
-        return path;
-    return [self wb_pathForResource:resource ofType:type];
+MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, int, type) {
+    WBStringDrawingState dayState = {NULL, 2, @""
+        // XXX: this is only correct on an iPod dock
+        "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;"
+    , @"CalendarIconDayStyle"};
+
+    WBStringDrawingState sizeState = {&dayState, 7, nil, nil};
+
+    WBStringDrawingState dateState = {&sizeState, 2, @""
+    , @"CalendarIconDateStyle"};
+
+    stringDrawingState_ = &dateState;
+
+    UIImage *image(MSOldCall(type));
+
+    stringDrawingState_ = NULL;
+    return image;

 }
 
 }
 

-static bool $setBarStyle$_(NSString *name, UIView<WinterBoard> *self, int style) {
-    if (Debug_)
-        NSLog(@"WB:Debug:%@Style:%d", name, style);
-    NSNumber *number = nil;
-    if (number == nil)
-        number = [Info_ objectForKey:[NSString stringWithFormat:@"%@Style-%d", name, style]];
-    if (number == nil)
-        number = [Info_ objectForKey:[NSString stringWithFormat:@"%@Style", name]];
-    if (number == nil)
-        return false;
-    else {
-        style = [number intValue];
-        if (Debug_)
-            NSLog(@"WB:Debug:%@Style=%d", name, style);
-        [self wb_setBarStyle:style];
-        return true;
-    }
+MSInstanceMessageHook1(UIImage *, UIStatusBarTimeItemView, contentsImageForStyle, int, style) {
+    WBStringDrawingState timeState = {NULL, 0, @""
+    , @"TimeStyle"};
+
+    stringDrawingState_ = &timeState;
+
+    UIImage *image(MSOldCall(style));
+
+    stringDrawingState_ = NULL;
+    return image;

 }
 
 }
 

-static void SBCalendarIconContentsView$drawRect$(SBCalendarIconContentsView<WinterBoard> *self, SEL sel, CGRect rect) {
+MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *self, SEL sel, CGRect rect) {
+    NSBundle *bundle([NSBundle mainBundle]);
+

     CFLocaleRef locale(CFLocaleCopyCurrent());
     CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, locale, kCFDateFormatterNoStyle, kCFDateFormatterNoStyle));
     CFRelease(locale);
 
     CFDateRef now(CFDateCreate(NULL, CFAbsoluteTimeGetCurrent()));
 
     CFLocaleRef locale(CFLocaleCopyCurrent());
     CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, locale, kCFDateFormatterNoStyle, kCFDateFormatterNoStyle));
     CFRelease(locale);
 
     CFDateRef now(CFDateCreate(NULL, CFAbsoluteTimeGetCurrent()));
 

-    CFDateFormatterSetFormat(formatter, CFSTR("d"));
+    CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NUMBER_FORMAT" value:@"d" table:@"SpringBoard"]);

     CFStringRef date(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
     CFStringRef date(CFDateFormatterCreateStringWithDate(NULL, formatter, now));

-    CFDateFormatterSetFormat(formatter, CFSTR("EEEE"));
+    CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NAME_FORMAT" value:@"cccc" table:@"SpringBoard"]);

     CFStringRef day(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
 
     CFRelease(now);
 
     CFRelease(formatter);
 
     CFStringRef day(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
 
     CFRelease(now);
 
     CFRelease(formatter);
 

-    NSString *datestyle(@""
+    NSString *datestyle([@""

         "font-family: Helvetica; "
         "font-weight: bold; "
         "font-family: Helvetica; "
         "font-weight: bold; "

-        "font-size: 39px; "

         "color: #333333; "
         "alpha: 1.0; "
         "color: #333333; "
         "alpha: 1.0; "

-    "");
+    "" stringByAppendingString:(IsWild_
+        ? @"font-size: 54px; "
+        : @"font-size: 39px; "
+    )]);

 
 

-    NSString *daystyle(@""
+    NSString *daystyle([@""

         "font-family: Helvetica; "
         "font-weight: bold; "
         "font-family: Helvetica; "
         "font-weight: bold; "

-        "font-size: 9px; "

         "color: white; "
         "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px; "
         "color: white; "
         "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px; "

-    "");
+    "" stringByAppendingString:(IsWild_
+        ? @"font-size: 11px; "
+        : @"font-size: 9px; "
+    )]);

 
     if (NSString *style = [Info_ objectForKey:@"CalendarIconDateStyle"])
         datestyle = [datestyle stringByAppendingString:style];
 
     if (NSString *style = [Info_ objectForKey:@"CalendarIconDateStyle"])
         datestyle = [datestyle stringByAppendingString:style];


@@ -503,152 +995,304 @@ static void SBCalendarIconContentsView$drawRect$(SBCalendarIconContentsView<Wint
         daystyle = [daystyle stringByAppendingString:style];
 
     float width([self bounds].size.width);
         daystyle = [daystyle stringByAppendingString:style];
 
     float width([self bounds].size.width);

-    CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:width];
-    CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:width];
+    float leeway(10);
+    CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)];
+    CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)];
+
+    unsigned base0(IsWild_ ? 89 : 70);
+    if ($GSFontGetUseLegacyFontMetrics())
+        base0 = base0 + 1;
+    unsigned base1(IsWild_ ? 18 : 16);
+
+    if (Four_) {
+        ++base0;
+        ++base1;
+    }

 
     [(NSString *)date drawAtPoint:CGPointMake(
 
     [(NSString *)date drawAtPoint:CGPointMake(

-        (width + 4 - datesize.width) / 2, (71 - datesize.height) / 2
+        (width + 1 - datesize.width) / 2, (base0 - datesize.height) / 2

     ) withStyle:datestyle];
 
     [(NSString *)day drawAtPoint:CGPointMake(
     ) withStyle:datestyle];
 
     [(NSString *)day drawAtPoint:CGPointMake(

-        (width - daysize.width) / 2, (16 - daysize.height) / 2
+        (width + 1 - daysize.width) / 2, (base1 - daysize.height) / 2

     ) withStyle:daystyle];
 
     CFRelease(date);
     CFRelease(day);
 }
 
     ) withStyle:daystyle];
 
     CFRelease(date);
     CFRelease(day);
 }
 

-/*static id UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$(UINavigationBarBackground<WinterBoard> *self, SEL sel, CGRect frame, int style, UIColor *tint) {
-    _trace();
-
-    if (NSNumber *number = [Info_ objectForKey:@"NavigationBarStyle"])
+// %hook -[{NavigationBar,Toolbar} setBarStyle:] {{{
+void $setBarStyle$_(NSString *name, int &style) {
+    if (Debug_)
+        NSLog(@"WB:Debug:%@Style:%d", name, style);
+    NSNumber *number = nil;
+    if (number == nil)
+        number = [Info_ objectForKey:[NSString stringWithFormat:@"%@Style-%d", name, style]];
+    if (number == nil)
+        number = [Info_ objectForKey:[NSString stringWithFormat:@"%@Style", name]];
+    if (number != nil) {

         style = [number intValue];
         style = [number intValue];

-
-    if (UIColor *color = [Info_ colorForKey:@"NavigationBarTint"])
-        tint = color;
-
-    return [self wb_initWithFrame:frame withBarStyle:style withTintColor:tint];
-}*/
-
-/*static id UINavigationBar$initWithCoder$(SBAppWindow<WinterBoard> *self, SEL sel, CGRect frame, NSCoder *coder) {
-    self = [self wb_initWithCoder:coder];
-    if (self == nil)
-        return nil;
-    UINavigationBar$setBarStyle$_(self);
-    return self;
+        if (Debug_)
+            NSLog(@"WB:Debug:%@Style=%d", name, style);
+    }

 }
 
 }
 

-static id UINavigationBar$initWithFrame$(SBAppWindow<WinterBoard> *self, SEL sel, CGRect frame) {
-    self = [self wb_initWithFrame:frame];
-    if (self == nil)
-        return nil;
-    UINavigationBar$setBarStyle$_(self);
-    return self;
-}*/
+MSInstanceMessageHook1(void, UIToolbar, setBarStyle, int, style) {
+    $setBarStyle$_(@"Toolbar", style);
+    return MSOldCall(style);
+}

 
 

-static void UIToolbar$setBarStyle$(UIToolbar<WinterBoard> *self, SEL sel, int style) {
-    if ($setBarStyle$_(@"Toolbar", self, style))
-        return;
-    return [self wb_setBarStyle:style];
+MSInstanceMessageHook1(void, UINavigationBar, setBarStyle, int, style) {
+    $setBarStyle$_(@"NavigationBar", style);
+    return MSOldCall(style);

 }
 }

+// }}}

 
 

-static void UINavigationBar$setBarStyle$(UINavigationBar<WinterBoard> *self, SEL sel, int style) {
-    if ($setBarStyle$_(@"NavigationBar", self, style))
-        return;
-    return [self wb_setBarStyle:style];
+MSHook(void, SBButtonBar$didMoveToSuperview, UIView *self, SEL sel) {
+    [[self superview] setBackgroundColor:[UIColor clearColor]];
+    _SBButtonBar$didMoveToSuperview(self, sel);

 }
 
 }
 

-static void $didMoveToSuperview(SBButtonBar<WinterBoard> *self, SEL sel) {
-    [[self superview] setBackgroundColor:[$UIColor clearColor]];
-    [self wb_didMoveToSuperview];
+MSHook(void, SBStatusBarContentsView$didMoveToSuperview, UIView *self, SEL sel) {
+    [[self superview] setBackgroundColor:[UIColor clearColor]];
+    _SBStatusBarContentsView$didMoveToSuperview(self, sel);

 }
 
 }
 

-static id UIImage$imageAtPath$(NSObject<WinterBoard> *self, SEL sel, NSString *path) {
-    return [self wb_imageAtPath:[path wb_themedPath]];
+static NSArray *Wallpapers_;
+static bool Papered_;
+static bool Docked_;
+static bool SMSBackgrounded_;
+static NSString *WallpaperFile_;
+static UIImageView *WallpaperImage_;
+static UIWebDocumentView *WallpaperPage_;
+static NSURL *WallpaperURL_;
+
+#define _release(object) \
+    do if (object != nil) { \
+        [object release]; \
+        object = nil; \
+    } while (false)
+
+static UIImage *$getImage$(NSString *path) {
+    UIImage *image([UIImage imageWithContentsOfFile:path]);
+
+    unsigned scale($getScale$(path));
+    if (scale != 1 && [image respondsToSelector:@selector(setScale)])
+        [image setScale:scale];
+
+    return image;

 }
 
 }
 

-static id $initWithContentsOfFile$(NSObject<WinterBoard> *self, SEL sel, NSString *file) {
-    return [self wb_initWithContentsOfFile:[file wb_themedPath]];
+static UIImage *$getDefaultDesktopImage$() {
+    if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"LockBackground.png", @"LockBackground.jpg", nil])))
+        return $getImage$(path);
+    return nil;

 }
 
 }
 

-static id UIImage$initWithContentsOfFile$cache$(UIImage<WinterBoard> *self, SEL sel, NSString *file, BOOL cache) {
-    return [self wb_initWithContentsOfFile:[file wb_themedPath] cache:cache];
+MSClassMessageHook0(UIImage *, UIImage, defaultDesktopImage) {
+    return $getDefaultDesktopImage$() ?: MSOldCall();

 }
 
 }
 

-static UIImage *UIImage$defaultDesktopImage$(UIImage<WinterBoard> *self, SEL sel) {
-    if (Debug_)
-        NSLog(@"WB:Debug:DefaultDesktopImage");
-    if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"LockBackground.png", @"LockBackground.jpg", nil]))
-        return [$UIImage imageWithContentsOfFile:path];
-    return [self wb_defaultDesktopImage];
+MSInstanceMessageHook0(UIImage *, SBSlidingAlertDisplay, _defaultDesktopImage) {
+    return $getDefaultDesktopImage$() ?: MSOldCall();

 }
 
 }
 

-static UIImageView *WallpaperImage_;
-static UIWebDocumentView *WallpaperPage_;
-static NSURL *WallpaperURL_;
+MSInstanceMessageHook0(void, SBWallpaperView, resetCurrentImageToWallpaper) {
+    for (UIView *parent([self superview]); parent != nil; parent = [parent superview])
+        if ([parent isKindOfClass:$SBSlidingAlertDisplay]) {
+            if (UIImage *image = $getDefaultDesktopImage$()) {
+                [self setImage:image];
+                return;
+            }

 
 

-static id SBContentLayer$initWithSize$(SBContentLayer<WinterBoard> *self, SEL sel, CGSize size) {
-    self = [self wb_initWithSize:size];
+            break;
+        }
+
+    MSOldCall();
+}
+
+// %hook -[SBUIController init] {{{
+MSInstanceMessageHook0(id, SBUIController, init) {
+    self = MSOldCall();

     if (self == nil)
         return nil;
 
     if (self == nil)
         return nil;
 

-    if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"])) {
-        MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[self bounds]] autorelease];
-        [video setMovieWithPath:path];
-        [video setRepeatMode:1];
-        [video setRepeatGap:0];
-        [self addSubview:video];
-        [video playFromBeginning];;
+    NSString *paper($getTheme$(Wallpapers_));
+    if (paper != nil)
+        paper = [paper stringByDeletingLastPathComponent];
+
+    {
+        size_t size;
+        sysctlbyname("hw.machine", NULL, &size, NULL, 0);
+        char *machine = new char[size];
+
+        if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1) {
+            perror("sysctlbyname(\"hw.machine\", ?)");
+            delete [] machine;
+            machine = NULL;
+        }
+
+        IsWild_ = machine != NULL && strncmp(machine, "iPad", 4) == 0;

     }
 
     }
 

-    UIImage *image;
-    if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"Wallpaper.png", @"Wallpaper.jpg", nil])) {
-        image = [[$UIImage alloc] wb_initWithContentsOfFile:path];
-        if (image != nil)
-            image = [image autorelease];
-    } else image = nil;
+    if (Debug_)
+        NSLog(@"WB:Debug:Info = %@", [Info_ description]);

 
 

-    if (WallpaperImage_ != nil)
-        [WallpaperImage_ release];
-    WallpaperImage_ = [[$UIImageView alloc] initWithImage:image];
-    [self addSubview:WallpaperImage_];
+    if (paper != nil) {
+        UIImageView *&_wallpaperView(MSHookIvar<UIImageView *>(self, "_wallpaperView"));
+        if (&_wallpaperView != NULL) {
+            [_wallpaperView removeFromSuperview];
+            [_wallpaperView release];
+            _wallpaperView = nil;
+        }
+    }

 
 

-    if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Wallpaper.html"])) {
-        CGRect bounds = [self bounds];
+    UIView *&_contentLayer(MSHookIvar<UIView *>(self, "_contentLayer"));
+    UIView *&_contentView(MSHookIvar<UIView *>(self, "_contentView"));

 
 

-        UIWebDocumentView *view([[[$UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
-        [view setAutoresizes:true];
+    UIView **player;
+    if (&_contentLayer != NULL)
+        player = &_contentLayer;
+    else if (&_contentView != NULL)
+        player = &_contentView;
+    else
+        player = NULL;
+    UIView *layer(player == NULL ? nil : *player);

 
 

-        if (WallpaperPage_ != nil)
-            [WallpaperPage_ release];
-        WallpaperPage_ = [view retain];
+    UIWindow *window([[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]);
+    UIView *content([[[UIView alloc] initWithFrame:[window frame]] autorelease]);
+    [window setContentView:content];

 
 

-        if (WallpaperURL_ != nil)
-            [WallpaperURL_ release];
-        WallpaperURL_ = [[NSURL fileURLWithPath:path] retain];
+    UIWindow *&_window(MSHookIvar<UIWindow *>(self, "_window"));
+    [window setBackgroundColor:[_window backgroundColor]];
+    [_window setBackgroundColor:[UIColor clearColor]];

 
 

-        [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
+    [window setLevel:-1000];
+    [window setHidden:NO];

 
 

-        [[view webView] setDrawsBackground:false];
-        [view setBackgroundColor:[$UIColor clearColor]];
+    /*if (player != NULL)
+        *player = content;*/

 
 

-        [self addSubview:view];
+    [content setBackgroundColor:[layer backgroundColor]];
+    [layer setBackgroundColor:[UIColor clearColor]];
+
+    UIView *indirect;
+    if (!SummerBoard_ || !IsWild_)
+        indirect = content;
+    else {
+        CGRect bounds([content bounds]);
+        bounds.origin.y = -30;
+        indirect = [[[UIView alloc] initWithFrame:bounds] autorelease];
+        [content addSubview:indirect];
+        [indirect zoomToScale:2.4];
+    }
+
+    _release(WallpaperFile_);
+    _release(WallpaperImage_);
+    _release(WallpaperPage_);
+    _release(WallpaperURL_);
+
+    if (paper != nil) {
+        NSArray *themes([NSArray arrayWithObject:paper]);
+
+        if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"], themes)) {
+#if UseAVController
+            NSError *error;
+
+            static AVController *controller_(nil);
+            if (controller_ == nil) {
+                AVQueue *queue([AVQueue avQueue]);
+                controller_ = [[AVController avControllerWithQueue:queue error:&error] retain];
+            }
+
+            AVQueue *queue([controller_ queue]);
+
+            UIView *video([[[UIView alloc] initWithFrame:[indirect bounds]] autorelease]);
+            [controller_ setLayer:[video _layer]];
+
+            AVItem *item([[[AVItem alloc] initWithPath:path error:&error] autorelease]);
+            [queue appendItem:item error:&error];
+
+            [controller_ play:&error];
+#elif UseMPMoviePlayerController
+            NSURL *url([NSURL fileURLWithPath:path]);
+            MPMoviePlayerController *controller = [[$MPMoviePlayerController alloc] initWithContentURL:url];
+           controller.movieControlMode = MPMovieControlModeHidden;
+           [controller play];
+#else
+            MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[indirect bounds]] autorelease];
+            [video setMovieWithPath:path];
+            [video setRepeatMode:1];
+            [video setRepeatGap:-1];
+            [video playFromBeginning];;
+#endif
+
+            [indirect addSubview:video];
+        }
+
+        if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"Wallpaper.png", @"Wallpaper.jpg", nil]), themes)) {
+            if (UIImage *image = $getImage$(path)) {
+                WallpaperFile_ = [path retain];
+                WallpaperImage_ = [[UIImageView alloc] initWithImage:image];
+                if (NSNumber *number = [Info_ objectForKey:@"WallpaperAlpha"])
+                    [WallpaperImage_ setAlpha:[number floatValue]];
+                [indirect addSubview:WallpaperImage_];
+            }
+        }
+
+        if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Wallpaper.html"], themes)) {
+            CGRect bounds = [indirect bounds];
+
+            UIWebDocumentView *view([[[$UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
+            [view setAutoresizes:true];
+
+            WallpaperPage_ = [view retain];
+            WallpaperURL_ = [[NSURL fileURLWithPath:path] retain];
+
+            [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
+
+            [view setBackgroundColor:[UIColor clearColor]];
+            if ([view respondsToSelector:@selector(setDrawsBackground:)])
+                [view setDrawsBackground:NO];
+            [[view webView] setDrawsBackground:NO];
+
+            [indirect addSubview:view];
+        }
+    }
+
+    for (size_t i(0), e([Themes_ count]); i != e; ++i) {
+        NSString *theme = [Themes_ objectAtIndex:(e - i - 1)];
+        NSString *html = [theme stringByAppendingPathComponent:@"Widget.html"];
+        if ([Manager_ fileExistsAtPath:html]) {
+            CGRect bounds = [indirect bounds];
+
+            UIWebDocumentView *view([[[$UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
+            [view setAutoresizes:true];
+
+            NSURL *url = [NSURL fileURLWithPath:html];
+            [view loadRequest:[NSURLRequest requestWithURL:url]];
+
+            [view setBackgroundColor:[UIColor clearColor]];
+            if ([view respondsToSelector:@selector(setDrawsBackground:)])
+                [view setDrawsBackground:NO];
+            [[view webView] setDrawsBackground:NO];
+
+            [indirect addSubview:view];
+        }

     }
 
     return self;
 }
     }
 
     return self;
 }

+// }}}

 
 

-static void SBSlidingAlertDisplay$updateDesktopImage$(SBSlidingAlertDisplay<WinterBoard> *self, SEL sel, UIImage *image) {
+MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage *image) {

     NSString *path = $getTheme$([NSArray arrayWithObject:@"LockBackground.html"]);
     NSString *path = $getTheme$([NSArray arrayWithObject:@"LockBackground.html"]);

+    UIView *&_backgroundView(MSHookIvar<UIView *>(self, "_backgroundView"));

 
 

-    if (path) {
-        UIView *background;
-        object_getInstanceVariable(self, "_backgroundView", reinterpret_cast<void **>(&background));
-        if (background != nil)
-            path = nil;
-    }
+    if (path != nil && _backgroundView != nil)
+        path = nil;

 
 

-    [self wb_updateDesktopImage:image];
+    _SBAwayView$updateDesktopImage$(self, sel, image);

 
     if (path != nil) {
         CGRect bounds = [self bounds];
 
     if (path != nil) {
         CGRect bounds = [self bounds];


@@ -667,25 +1311,33 @@ static void SBSlidingAlertDisplay$updateDesktopImage$(SBSlidingAlertDisplay<Wint
         [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
 
         [[view webView] setDrawsBackground:false];
         [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
 
         [[view webView] setDrawsBackground:false];

-        [view setBackgroundColor:[$UIColor clearColor]];
+        [view setBackgroundColor:[UIColor clearColor]];

 
 

-        UIView *background;
-        object_getInstanceVariable(self, "_backgroundView", reinterpret_cast<void **>(&background));
-        NSLog(@"back:%@", background);
+        [self insertSubview:view aboveSubview:_backgroundView];

 
 

-        [self insertSubview:view aboveSubview:background];
+        if ($objc_setAssociatedObject != NULL)
+            $objc_setAssociatedObject(self, @selector(wb$widgetView), view, OBJC_ASSOCIATION_RETAIN_NONATOMIC);

     }
 }
 
     }
 }
 

-static unsigned *__currentContextCount;
-static void ***__currentContextStack;
+MSHook(void, SBAwayView$_addSubview$positioned$relativeTo$, SBAwayView *self, SEL sel, UIView *view, int positioned, UIView *relative) {
+    UIView *&_backgroundView(MSHookIvar<UIView *>(self, "_backgroundView"));
+    UIView *&_chargingView(MSHookIvar<UIView *>(self, "_chargingView"));
+    if (&_chargingView != NULL)
+        if (positioned == -2 && (relative == _backgroundView && _chargingView == nil || relative == _chargingView))
+            if ($objc_getAssociatedObject != NULL)
+                if (UIView *widget = $objc_getAssociatedObject(self, @selector(wb$widgetView)))
+                    relative = widget;
+    return _SBAwayView$_addSubview$positioned$relativeTo$(self, sel, view, positioned, relative);
+}

 
 /*extern "C" CGColorRef CGGStateGetSystemColor(void *);
 extern "C" CGColorRef CGGStateGetFillColor(void *);
 extern "C" CGColorRef CGGStateGetStrokeColor(void *);
 extern "C" NSString *UIStyleStringFromColor(CGColorRef);*/
 
 
 /*extern "C" CGColorRef CGGStateGetSystemColor(void *);
 extern "C" CGColorRef CGGStateGetFillColor(void *);
 extern "C" CGColorRef CGGStateGetStrokeColor(void *);
 extern "C" NSString *UIStyleStringFromColor(CGColorRef);*/
 

-@interface WBTime : NSProxy {
+/* WBTimeLabel {{{ */
+@interface WBTimeLabel : NSProxy {

     NSString *time_;
     _transient SBStatusBarTimeView *view_;
 }
     NSString *time_;
     _transient SBStatusBarTimeView *view_;
 }


@@ -694,7 +1346,7 @@ extern "C" NSString *UIStyleStringFromColor(CGColorRef);*/
 
 @end
 
 
 @end
 

-@implementation WBTime
+@implementation WBTimeLabel

 
 - (void) dealloc {
     [time_ release];
 
 - (void) dealloc {
     [time_ release];


@@ -707,19 +1359,22 @@ extern "C" NSString *UIStyleStringFromColor(CGColorRef);*/
     return self;
 }
 
     return self;
 }
 

+- (NSString *) description {
+    return time_;
+}
+

 WBDelegate(time_)
 
 WBDelegate(time_)
 

-- (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode {
+- (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(UILineBreakMode)mode {

     if (NSString *custom = [Info_ objectForKey:@"TimeStyle"]) {
     if (NSString *custom = [Info_ objectForKey:@"TimeStyle"]) {

-        BOOL mode;
-        object_getInstanceVariable(view_, "_mode", reinterpret_cast<void **>(&mode));
+        BOOL &_mode(MSHookIvar<BOOL>(view_, "_mode"));;

 
         [time_ drawAtPoint:point withStyle:[NSString stringWithFormat:@""
             "font-family: Helvetica; "
             "font-weight: bold; "
             "font-size: 14px; "
             "color: %@; "
 
         [time_ drawAtPoint:point withStyle:[NSString stringWithFormat:@""
             "font-family: Helvetica; "
             "font-weight: bold; "
             "font-size: 14px; "
             "color: %@; "

-        "%@", mode ? @"white" : @"black", custom]];
+        "%@", _mode ? @"white" : @"black", custom]];

 
         return CGSizeZero;
     }
 
         return CGSizeZero;
     }


@@ -728,188 +1383,640 @@ WBDelegate(time_)
 }
 
 @end
 }
 
 @end

+/* }}} */
+/* WBBadgeLabel {{{ */
+@interface WBBadgeLabel : NSProxy {
+    NSString *badge_;
+}
+
+- (id) initWithBadge:(NSString *)badge;
+- (NSString *) description;
+
+@end
+
+@implementation WBBadgeLabel
+
+- (void) dealloc {
+    [badge_ release];
+    [super dealloc];
+}

 
 

-@interface WBIconLabel : NSProxy {
-    NSString *string_;
-    BOOL docked_;
+- (id) initWithBadge:(NSString *)badge {
+    badge_ = [badge retain];
+    return self;

 }
 
 }
 

-- (id) initWithString:(NSString *)string;
+- (NSString *) description {
+    return [badge_ description];
+}
+
+WBDelegate(badge_)
+
+- (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(UILineBreakMode)mode {
+    if (NSString *custom = [Info_ objectForKey:@"BadgeStyle"]) {
+        [badge_ drawAtPoint:point withStyle:[NSString stringWithFormat:@""
+            "font-family: Helvetica; "
+            "font-weight: bold; "
+            "font-size: 17px; "
+            "color: white; "
+        "%@", custom]];
+
+        return CGSizeZero;
+    }
+
+    return [badge_ drawAtPoint:point forWidth:width withFont:font lineBreakMode:mode];
+}

 
 @end
 
 @end

+/* }}} */

 
 

-static void SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$(SBStatusBarController<WinterBoard> *self, SEL sel, int mode, int orientation, float duration, int id, int animation) {
+// IconAlpha {{{
+MSInstanceMessageHook1(void, SBIcon, setIconImageAlpha, float, alpha) {
+    if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
+        alpha = [number floatValue];
+    return MSOldCall(alpha);
+}
+
+MSInstanceMessageHook1(void, SBIcon, setIconLabelAlpha, float, alpha) {
+    if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
+        alpha = [number floatValue];
+    return MSOldCall(alpha);
+}
+
+MSInstanceMessageHook0(id, SBIcon, initWithDefaultSize) {
+    if ((self = MSOldCall()) != nil) {
+        if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) {
+            // XXX: note: this is overridden above, which is silly
+            float alpha([number floatValue]);
+            if ([self respondsToSelector:@selector(setIconImageAlpha:)])
+                [self setIconImageAlpha:alpha];
+            if ([self respondsToSelector:@selector(setIconLabelAlpha:)])
+                [self setIconLabelAlpha:alpha];
+            if ([self respondsToSelector:@selector(setAlpha:)])
+                [self setAlpha:alpha];
+        }
+    } return self;
+}
+
+MSInstanceMessageHook1(void, SBIcon, setAlpha, float, alpha) {
+    if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
+        alpha = [number floatValue];
+    return MSOldCall(alpha);
+}
+// }}}
+
+MSHook(id, SBIconBadge$initWithBadge$, SBIconBadge *self, SEL sel, NSString *badge) {
+    if ((self = _SBIconBadge$initWithBadge$(self, sel, badge)) != nil) {
+        id &_badge(MSHookIvar<id>(self, "_badge"));
+        if (_badge != nil)
+            if (id label = [[WBBadgeLabel alloc] initWithBadge:[_badge autorelease]])
+                _badge = label;
+    } return self;
+}
+
+void SBStatusBarController$setStatusBarMode(int &mode) {

     if (Debug_)
         NSLog(@"WB:Debug:setStatusBarMode:%d", mode);
     if (mode < 100) // 104:hidden 105:glowing
         if (NSNumber *number = [Info_ objectForKey:@"StatusBarMode"])
             mode = [number intValue];
     if (Debug_)
         NSLog(@"WB:Debug:setStatusBarMode:%d", mode);
     if (mode < 100) // 104:hidden 105:glowing
         if (NSNumber *number = [Info_ objectForKey:@"StatusBarMode"])
             mode = [number intValue];

-    return [self wb_setStatusBarMode:mode orientation:orientation duration:duration fenceID:id animation:animation];

 }
 
 }
 

-/*static id SBStatusBar$initWithMode$orientation$(SBStatusBar<WinterBoard> *self, SEL sel, int mode, int orientation) {
-    return [self wb_initWithMode:mode orientation:orientation];
+/*MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, double duration, int animation) {
+    NSLog(@"mode:%d orientation:%d duration:%f animation:%d", mode, orientation, duration, animation);
+    SBStatusBarController$setStatusBarMode(mode);
+    return _SBStatusBarController$setStatusBarMode$orientation$duration$animation$(self, sel, mode, orientation, duration, animation);

 }*/
 
 }*/
 

-static id SBStatusBarContentsView$initWithStatusBar$mode$(SBStatusBarContentsView<WinterBoard> *self, SEL sel, id bar, int mode) {
+MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, float duration, int fenceID, int animation) {
+    //NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d", mode, orientation, duration, fenceID, animation);
+    SBStatusBarController$setStatusBarMode(mode);
+    return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$(self, sel, mode, orientation, duration, fenceID, animation);
+}
+
+MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$, SBStatusBarController *self, SEL sel, int mode, int orientation, double duration, int fenceID, int animation, double startTime) {
+    //NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d startTime:%f", mode, orientation, duration, fenceID, animation, startTime);
+    SBStatusBarController$setStatusBarMode(mode);
+    //NSLog(@"mode=%u", mode);
+    return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$(self, sel, mode, orientation, duration, fenceID, animation, startTime);
+}
+
+/*MSHook(id, SBStatusBarContentsView$initWithStatusBar$mode$, SBStatusBarContentsView *self, SEL sel, id bar, int mode) {

     if (NSNumber *number = [Info_ objectForKey:@"StatusBarContentsMode"])
         mode = [number intValue];
     if (NSNumber *number = [Info_ objectForKey:@"StatusBarContentsMode"])
         mode = [number intValue];

-    return [self wb_initWithStatusBar:bar mode:mode];
-}
+    return _SBStatusBarContentsView$initWithStatusBar$mode$(self, sel, bar, mode);
+}*/

 
 

-static void SBStatusBarTimeView$drawRect$(SBStatusBarTimeView<WinterBoard> *self, SEL sel, CGRect rect) {
-    id time;
-    object_getInstanceVariable(self, "_time", reinterpret_cast<void **>(&time));
-    if (time != nil && [time class] != [WBTime class])
-        object_setInstanceVariable(self, "_time", reinterpret_cast<void *>([[WBTime alloc] initWithTime:[time autorelease] view:self]));
-    return [self wb_drawRect:rect];
+MSHook(NSString *, SBStatusBarOperatorNameView$operatorNameStyle, SBStatusBarOperatorNameView *self, SEL sel) {
+    NSString *style(_SBStatusBarOperatorNameView$operatorNameStyle(self, sel));
+    if (Debug_)
+        NSLog(@"operatorNameStyle= %@", style);
+    if (NSString *custom = [Info_ objectForKey:@"OperatorNameStyle"])
+        style = [NSString stringWithFormat:@"%@; %@", style, custom];
+    return style;

 }
 
 }
 

-static void SBIconController$appendIconList$(SBIconController<WinterBoard> *self, SEL sel, SBIconList *list) {
+MSHook(void, SBStatusBarOperatorNameView$setOperatorName$fullSize$, SBStatusBarOperatorNameView *self, SEL sel, NSString *name, BOOL full) {

     if (Debug_)
     if (Debug_)

-        NSLog(@"appendIconList:%@", list);
-    return [self wb_appendIconList:list];
+        NSLog(@"setOperatorName:\"%@\" fullSize:%u", name, full);
+    return _SBStatusBarOperatorNameView$setOperatorName$fullSize$(self, sel, name, NO);
+}
+
+// XXX: replace this with [SBStatusBarTimeView tile]
+MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel, CGRect rect) {
+    id &_time(MSHookIvar<id>(self, "_time"));
+    if (_time != nil && [_time class] != [WBTimeLabel class])
+        object_setInstanceVariable(self, "_time", reinterpret_cast<void *>([[WBTimeLabel alloc] initWithTime:[_time autorelease] view:self]));
+    return _SBStatusBarTimeView$drawRect$(self, sel, rect);
+}
+
+@interface UIView (WinterBoard)
+- (bool) wb$isWBImageView;
+- (void) wb$logHierarchy;
+- (void) wb$setBackgroundColor:(UIColor *)color;
+@end
+
+@implementation UIView (WinterBoard)
+
+- (bool) wb$isWBImageView {
+    return false;
+}
+
+- (void) wb$logHierarchy {
+    WBLogHierarchy(self);
+}
+
+- (void) wb$setBackgroundColor:(UIColor *)color {
+    [self setBackgroundColor:color];
+    for (UIView *child in [self subviews])
+        [child wb$setBackgroundColor:color];
+}
+
+@end
+
+@interface WBImageView : UIImageView {
+}
+
+- (bool) wb$isWBImageView;
+- (void) wb$updateFrame;
+@end
+
+@implementation WBImageView
+
+- (bool) wb$isWBImageView {
+    return true;
+}
+
+- (void) wb$updateFrame {
+    CGRect frame([self frame]);
+    frame.origin.y = 0;
+
+    for (UIView *view(self); ; ) {
+        view = [view superview];
+        if (view == nil)
+            break;
+        frame.origin.y -= [view frame].origin.y;
+    }
+
+    [self setFrame:frame];
+}
+
+@end
+
+static void SBIconList$updateFrames$(SBIconList *self) {
+    NSArray *subviews([self subviews]);
+    WBImageView *view([subviews count] == 0 ? nil : [subviews objectAtIndex:0]);
+    if (view != nil && [view wb$isWBImageView])
+        [view wb$updateFrame];
+}
+
+MSHook(void, SBIconList$didMoveToSuperview, SBIconList *self, SEL sel) {
+    SBIconList$updateFrames$(self);
+    _SBIconList$didMoveToSuperview(self, sel);
+}
+
+MSHook(void, SBIconList$setFrame$, SBIconList *self, SEL sel, CGRect frame) {
+    SBIconList$updateFrames$(self);
+    _SBIconList$setFrame$(self, sel, frame);
+}
+
+static void $addPerPageView$(unsigned i, UIView *list) {
+    NSString *path($getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Page%u.png", i]]));
+    if (path == nil)
+        return;
+
+    NSArray *subviews([list subviews]);
+
+    WBImageView *view([subviews count] == 0 ? nil : [subviews objectAtIndex:0]);
+    if (view == nil || ![view wb$isWBImageView]) {
+        view = [[[WBImageView alloc] init] autorelease];
+        [list insertSubview:view atIndex:0];
+    }
+
+    UIImage *image([UIImage imageWithContentsOfFile:path]);
+
+    CGRect frame([view frame]);
+    frame.size = [image size];
+    [view setFrame:frame];
+
+    [view setImage:image];
+    [view wb$updateFrame];
+}
+
+static void $addPerPageViews$(NSArray *lists) {
+    for (unsigned i(0), e([lists count]); i != e; ++i)
+        $addPerPageView$(i, [lists objectAtIndex:i]);
+}
+
+MSInstanceMessageHook0(void, SBIconController, updateNumberOfRootIconLists) {
+    NSArray *&_rootIconLists(MSHookIvar<NSArray *>(self, "_rootIconLists"));
+    $addPerPageViews$(_rootIconLists);
+    return MSOldCall();
+}
+
+MSInstanceMessageHook0(void, SBIconContentView, layoutSubviews) {
+    MSOldCall();
+
+    if (SBIconController *controller = [$SBIconController sharedInstance]) {
+        UIView *&_dockContainerView(MSHookIvar<UIView *>(controller, "_dockContainerView"));
+        if (&_dockContainerView != NULL)
+            [[_dockContainerView superview] bringSubviewToFront:_dockContainerView];
+    }

 }
 
 }
 

-static id SBIconLabel$initWithSize$label$(SBIconLabel<WinterBoard> *self, SEL sel, CGSize size, NSString *label) {
-    self = [self wb_initWithSize:size label:label];
+MSHook(void, SBIconController$noteNumberOfIconListsChanged, SBIconController *self, SEL sel) {
+    SBIconModel *&_iconModel(MSHookIvar<SBIconModel *>(self, "_iconModel"));
+    $addPerPageViews$([_iconModel iconLists]);
+    return _SBIconController$noteNumberOfIconListsChanged(self, sel);
+}
+
+MSHook(id, SBIconLabel$initWithSize$label$, SBIconLabel *self, SEL sel, CGSize size, NSString *label) {
+    self = _SBIconLabel$initWithSize$label$(self, sel, size, label);

     if (self != nil)
         [self setClipsToBounds:NO];
     return self;
 }
 
     if (self != nil)
         [self setClipsToBounds:NO];
     return self;
 }
 

-static void SBIconLabel$setInDock$(SBIconLabel<WinterBoard> *self, SEL sel, BOOL docked) {
-    id label;
-    object_getInstanceVariable(self, "_label", reinterpret_cast<void **>(&label));
-    if (![Info_ boolForKey:@"UndockedIconLabels"])
+MSHook(void, SBIconLabel$setInDock$, SBIconLabel *self, SEL sel, BOOL docked) {
+    static bool gssc(false);
+    if (!gssc) {
+        BOOL (*GSSystemHasCapability)(CFStringRef) = reinterpret_cast<BOOL (*)(CFStringRef)>(dlsym(RTLD_DEFAULT, "GSSystemHasCapability"));
+        Papered_ |= GSSystemHasCapability != NULL && GSSystemHasCapability(CFSTR("homescreen-wallpaper"));
+        gssc = true;
+
+        if ([Info_ objectForKey:@"UndockedIconLabels"] == nil)
+            [Info_ setObject:[NSNumber numberWithBool:(
+                !Papered_ ||
+                [Info_ objectForKey:@"DockedIconLabelStyle"] != nil ||
+                [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil
+            )] forKey:@"UndockedIconLabels"];
+    }
+
+    id &_label(MSHookIvar<id>(self, "_label"));
+    if (![Info_ wb$boolForKey:@"UndockedIconLabels"])

         docked = true;
         docked = true;

-    if (label != nil && [label respondsToSelector:@selector(setInDock:)])
-        [label setInDock:docked];
-    return [self wb_setInDock:docked];
+
+    if (_label != nil && [_label respondsToSelector:@selector(setInDock:)])
+        [_label setInDock:docked];
+
+    _SBIconLabel$setInDock$(self, sel, docked);
+    [self setNeedsDisplay];

 }
 
 }
 

-@class WebCoreFrameBridge;
-static CGSize WebCoreFrameBridge$renderedSizeOfNode$constrainedToWidth$(WebCoreFrameBridge<WinterBoard> *self, SEL sel, id node, float width) {
+MSHook(BOOL, SBDockIconListView$shouldShowNewDock, id self, SEL sel) {
+    return SummerBoard_ && Docked_ ? NO : _SBDockIconListView$shouldShowNewDock(self, sel);
+}
+
+MSHook(void, SBDockIconListView$setFrame$, id self, SEL sel, CGRect frame) {
+    _SBDockIconListView$setFrame$(self, sel, frame);
+}
+
+// %hook -[NSBundle localizedStringForKey:value:table:] {{{
+MSInstanceMessageHook3(NSString *, NSBundle, localizedStringForKey,value,table, NSString *, key, NSString *, value, NSString *, table) {
+    NSString *identifier = [self bundleIdentifier];
+    NSLocale *locale = [NSLocale currentLocale];
+    NSString *language = [locale objectForKey:NSLocaleLanguageCode];
+    if (Debug_)
+        NSLog(@"WB:Debug:[NSBundle(%@) localizedStringForKey:\"%@\" value:\"%@\" table:\"%@\"] (%@)", identifier, key, value, table, language);
+    NSString *file = table == nil ? @"Localizable" : table;
+    NSString *name = [NSString stringWithFormat:@"%@:%@", identifier, file];
+    NSDictionary *strings;
+    if ((strings = [Strings_ objectForKey:name]) != nil) {
+        if (static_cast<id>(strings) != [NSNull null]) strings:
+            if (NSString *value = [strings objectForKey:key])
+                return value;
+    } else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings",
+        language, file
+    ], self, false, false)) {
+        if ((strings = [[NSDictionary alloc] initWithContentsOfFile:path]) != nil) {
+            [Strings_ setObject:[strings autorelease] forKey:name];
+            goto strings;
+        } else goto null;
+    } else null:
+        [Strings_ setObject:[NSNull null] forKey:name];
+    return MSOldCall(key, value, table);
+}
+// }}}
+// %hook -[WebCoreFrameBridge renderedSizeOfNode:constrainedToWidth:] {{{
+MSClassHook(WebCoreFrameBridge)
+
+MSInstanceMessageHook2(CGSize, WebCoreFrameBridge, renderedSizeOfNode,constrainedToWidth, id, node, float, width) {

     if (node == nil)
         return CGSizeZero;
     void **core(reinterpret_cast<void **>([node _node]));
     if (core == NULL || core[6] == NULL)
         return CGSizeZero;
     if (node == nil)
         return CGSizeZero;
     void **core(reinterpret_cast<void **>([node _node]));
     if (core == NULL || core[6] == NULL)
         return CGSizeZero;

-    return [self wb_renderedSizeOfNode:node constrainedToWidth:width];
+    return MSOldCall(node, width);

 }
 }

+// }}}

 
 

-static void SBIconLabel$drawRect$(SBIconLabel<WinterBoard> *self, SEL sel, CGRect rect) {
-    CGRect bounds = [self bounds];
+MSInstanceMessage1(void, SBIconLabel, drawRect, CGRect, rect) {
+    static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL);

 
 

-    BOOL docked;
-    object_getInstanceVariable(self, "_inDock", reinterpret_cast<void **>(&docked));
-    docked = (docked & 0x1) != 0;
+    int docked;
+    Ivar ivar = object_getInstanceVariable(self, "_inDock", reinterpret_cast<void **>(&docked));
+    docked = (docked & (ivar_getOffset(ivar) == ivar_getOffset(drawMoreLegibly) ? 0x2 : 0x1)) != 0;

 
 

-    NSString *label;
-    object_getInstanceVariable(self, "_label", reinterpret_cast<void **>(&label));
+    NSString *label(MSHookIvar<NSString *>(self, "_label"));

 
     NSString *style = [NSString stringWithFormat:@""
         "font-family: Helvetica; "
         "font-weight: bold; "
 
     NSString *style = [NSString stringWithFormat:@""
         "font-family: Helvetica; "
         "font-weight: bold; "

-        "font-size: 11px; "
-        "color: %@; "
-    "", docked ? @"white" : @"#b3b3b3"];
-
-    if (docked)
+        "color: %@; %@"
+    "", (docked || !SummerBoard_ ? @"white" : @"#b3b3b3"), (IsWild_
+        ? @"font-size: 12px; "
+        : @"font-size: 11px; "
+    )];
+
+    if (IsWild_)
+        style = [style stringByAppendingString:@"text-shadow: rgba(0, 0, 0, 0.5) 0px 1px 0px; "];
+    else if (docked)

         style = [style stringByAppendingString:@"text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px; "];
         style = [style stringByAppendingString:@"text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px; "];

-    float max = 75, width = [label sizeWithStyle:style forWidth:320].width;
-    if (width > max)
-        style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", ((width - max) / ([label length] - 1))]];
-    if (NSString *custom = [Info_ objectForKey:(docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle")])
-        style = [style stringByAppendingString:custom];

 
 

-    CGSize size = [label sizeWithStyle:style forWidth:bounds.size.width];
-    [label drawAtPoint:CGPointMake((bounds.size.width - size.width) / 2, 0) withStyle:style];
+    NSString *custom([Info_ objectForKey:(docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle")]);
+
+    $drawLabel$(label, [self bounds], style, custom);

 }
 
 }
 

-extern "C" void FindMappedImages(void);
-extern "C" NSData *UIImagePNGRepresentation(UIImage *);
+MSInstanceMessage0(CGImageRef, SBIconLabel, buildLabelImage) {
+    bool docked((MSHookIvar<unsigned>(self, "_inDock") & 0x2) != 0);

 
 

-static UIImage *(*_UIImageAtPath)(NSString *name, NSBundle *path);
-static CGImageRef *(*_UIImageRefAtPath)(NSString *path, bool cache, UIImageOrientation *orientation);
-static UIImage *(*_UIImageWithName)(NSString *name);
-static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain);
-static NSBundle *(*_UIKitBundle)();
-static void (*_UISharedImageInitialize)(bool);
-static int (*_UISharedImageNameGetIdentifier)(NSString *);
-static UIImage *(*_UISharedImageWithIdentifier)(int);
+    WBStringDrawingState labelState = {NULL, 0, @""
+    , docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle"};
+
+    stringDrawingState_ = &labelState;
+
+    //NSLog(@"XXX: +");
+    CGImageRef image(MSOldCall());
+    //NSLog(@"XXX: -");
+
+    stringDrawingState_ = NULL;
+    return image;
+}
+
+static bool wb$inDock(id parameters) {
+    return [$objc_getAssociatedObject(parameters, @selector(wb$inDock)) boolValue];
+}
+
+MSInstanceMessage0(NSUInteger, SBIconLabelImageParameters, hash) {
+    return MSOldCall() + (wb$inDock(self) ? 0xdeadbeef : 0xd15ea5e);
+}
+
+MSClassMessage2(id, SBIconView, _labelImageParametersForIcon,location, id, icon, int, location) {
+    if (id parameters = MSOldCall(icon, location)) {
+        $objc_setAssociatedObject(parameters, @selector(wb$inDock), [NSNumber numberWithBool:(location == 1)], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        return parameters;
+    } return nil;
+}
+
+MSClassMessage1(UIImage *, SBIconLabelImage, _drawLabelImageForParameters, id, parameters) {
+    bool docked(wb$inDock(parameters));
+
+    WBStringDrawingState labelState = {NULL, 0, @""
+    , docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle"};
+
+    stringDrawingState_ = &labelState;
+
+    //NSLog(@"XXX: +");
+    UIImage *image(MSOldCall(parameters));
+    //NSLog(@"XXX: -");
+
+    stringDrawingState_ = NULL;
+    return image;
+}
+
+// ChatKit {{{
+MSInstanceMessageHook2(id, CKBalloonView, initWithFrame,delegate, CGRect, frame, id, delegate) {
+    if ((self = MSOldCall(frame, delegate)) != nil) {
+        [self setBackgroundColor:[UIColor clearColor]];
+    } return self;
+}
+
+MSInstanceMessageHook0(BOOL, CKBalloonView, _canUseLayerBackedBalloon) {
+    return SMSBackgrounded_ ? NO : MSOldCall();
+}
+
+MSInstanceMessageHook0(void, CKTranscriptHeaderView, layoutSubviews) {
+    [self wb$setBackgroundColor:[UIColor clearColor]];
+    return MSOldCall();
+}
+
+MSInstanceMessageHook1(void, CKMessageCell, addBalloonView, CKBalloonView *, balloon) {
+    MSOldCall(balloon);
+    [balloon setBackgroundColor:[UIColor clearColor]];
+}

 
 

-static UIImage *$_UIImageWithName(NSString *name) {
-    int id(_UISharedImageNameGetIdentifier(name));
+MSInstanceMessageHook1(void, CKTranscriptCell, setBackgroundColor, UIColor *, color) {
+    MSOldCall([UIColor clearColor]);
+    [[self contentView] wb$setBackgroundColor:[UIColor clearColor]];
+}
+
+// iOS >= 5.0
+MSInstanceMessageHook2(id, CKTranscriptCell, initWithStyle,reuseIdentifier, int, style, NSString *, reuse) {
+    if ((self = MSOldCall(style, reuse)) != nil) {
+        [self setBackgroundColor:[UIColor clearColor]];
+        [[self contentView] wb$setBackgroundColor:[UIColor clearColor]];
+    } return self;
+}
+
+// iOS << 5.0
+MSInstanceMessageHook2(id, CKMessageCell, initWithStyle,reuseIdentifier, int, style, NSString *, reuse) {
+    if ((self = MSOldCall(style, reuse)) != nil) {
+        [self setBackgroundColor:[UIColor clearColor]];
+        [[self contentView] setBackgroundColor:[UIColor clearColor]];
+    } return self;
+}
+
+MSInstanceMessageHook2(id, CKTimestampView, initWithStyle,reuseIdentifier, int, style, NSString *, reuse) {
+    if ((self = MSOldCall(style, reuse)) != nil) {
+        UILabel *&_label(MSHookIvar<UILabel *>(self, "_label"));
+        [_label setBackgroundColor:[UIColor clearColor]];
+    } return self;
+}
+
+MSInstanceMessageHook1(void, CKTranscriptTableView, setSeparatorStyle, int, style) {
+    MSOldCall(UITableViewCellSeparatorStyleNone);
+}
+
+MSInstanceMessageHook2(id, CKTranscriptTableView, initWithFrame,style, CGRect, frame, int, style) {
+    if ((self = MSOldCall(frame, style)) != nil) {
+        [self setSeparatorStyle:UITableViewCellSeparatorStyleNone];
+    } return self;
+}
+
+MSInstanceMessageHook0(void, CKTranscriptController, loadView) {
+    MSOldCall();
+
+    if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil])))
+        if (UIImage *image = $getImage$(path)) {
+            SMSBackgrounded_ = true;
+
+            UIView *&_transcriptTable(MSHookIvar<UIView *>(self, "_transcriptTable"));
+            UIView *&_transcriptLayer(MSHookIvar<UIView *>(self, "_transcriptLayer"));
+            UIView *table;
+            if (&_transcriptTable != NULL)
+                table = _transcriptTable;
+            else if (&_transcriptLayer != NULL)
+                table = _transcriptLayer;
+            else
+                table = nil;
+
+            UIView *placard(table != nil ? [table superview] : MSHookIvar<UIView *>(self, "_backPlacard"));
+            UIImageView *background([[[UIImageView alloc] initWithImage:image] autorelease]);
+
+            if (table == nil)
+                [placard insertSubview:background atIndex:0];
+            else {
+                [table setBackgroundColor:[UIColor clearColor]];
+                [placard insertSubview:background belowSubview:table];
+            }
+        }
+}
+// }}}
+
+MSInstanceMessage2(UISharedArtwork *, UISharedArtwork, initWithName,inBundle, NSString *, name, NSBundle *, bundle) {
+    if ((self = MSOldCall(name, bundle)) != nil) {
+        $objc_setAssociatedObject(self, @selector(wb$bundle), bundle, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    } return self;
+}
+
+MSInstanceMessage1(UIImage *, UIImageTableArtwork, imageNamed, NSString *, name) {
+    NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle)));

     if (Debug_)
     if (Debug_)

-        NSLog(@"WB:Debug: UIImageWithName(\"%@\", %d)", name, id);
+        NSLog(@"WB:Debug:[UIImageTableArtwork[%@] imageNamed:\"%@\"]", bundle, name);
+    if (bundle == nil)
+        return MSOldCall(name);
+    UIImage *image = [UIImages_ objectForKey:name];
+    if (image != nil)
+        return reinterpret_cast<id>(image) == [NSNull null] ? MSOldCall(name) : image;
+    if (NSString *path = $pathForFile$inBundle$(name, bundle, true, true))
+        image = $getImage$(path);
+    [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:name];
+    if (image != nil)
+        return image;

 
 

-    if (id == -1)
-        return _UIImageAtPath(name, _UIKitBundle());
+    image = MSOldCall(name);
+
+    if (UIDebug_) {
+        NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]);
+        if (![Manager_ fileExistsAtPath:path])
+            [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
+    }
+
+    return image;
+}
+
+// %hook _UIImageWithName() {{{
+MSHook(UIImage *, _UIImageWithName, NSString *name) {
+    if (Debug_)
+        NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name);
+    if (name == nil)
+        return nil;
+
+    int identifier;
+    bool packed;
+
+    if (_UIPackedImageTableGetIdentifierForName != NULL)
+        packed = _UIPackedImageTableGetIdentifierForName(name, &identifier);
+    else if (_UISharedImageNameGetIdentifier != NULL) {
+        identifier = _UISharedImageNameGetIdentifier(name);
+        packed = identifier != -1;
+    } else {
+        identifier = -1;
+        packed = false;
+    }
+
+    if (Debug_)
+        NSLog(@"WB:Debug: _UISharedImageNameGetIdentifier(\"%@\") = %d", name, identifier);
+
+    if (!packed)
+        return __UIImageWithName(name);

     else {
     else {

-        NSNumber *key([NSNumber numberWithInt:id]);
-        UIImage *image = [UIImages_ objectForKey:key];
+        NSNumber *key([NSNumber numberWithInt:identifier]);
+        UIImage *image([UIImages_ objectForKey:key]);

         if (image != nil)
         if (image != nil)

-            return reinterpret_cast<id>(image) == [NSNull null] ? nil : image;
-        if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true)) {
-            image = [[$UIImage alloc] wb_initWithContentsOfFile:path];
-            if (image != nil)
-                [image autorelease];
-        }
-        if (image == nil)
-            image = _UISharedImageWithIdentifier(id);
+            return reinterpret_cast<id>(image) == [NSNull null] ? __UIImageWithName(name) : image;
+        if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true, true))
+            image = $getImage$(path);

         [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
         [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];

+        if (image != nil)
+            return image;
+
+        image = __UIImageWithName(name);
+
+        if (UIDebug_) {
+            NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]);
+            if (![Manager_ fileExistsAtPath:path])
+                [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
+        }
+

         return image;
     }
 }
         return image;
     }
 }

-
-static UIImage *$_UIImageWithNameInDomain(NSString *name, NSString *domain) {
-    NSString *key = [NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name];
-    UIImage *image = [PathImages_ objectForKey:key];
+// }}}
+// %hook _UIImageWithNameInDomain() {{{
+MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
+    NSString *key([NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]);
+    UIImage *image([PathImages_ objectForKey:key]);

     if (image != nil)
     if (image != nil)

-        return reinterpret_cast<id>(image) == [NSNull null] ? nil : image;
+        return reinterpret_cast<id>(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : image;

     if (Debug_)
         NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
     if (Debug_)
         NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);

-    if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])) {
-        image = [[$UIImage alloc] wb_initWithContentsOfFile:path];
-        if (image != nil)
-            [image autorelease];
-    }
-    if (image == nil)
-        image = _UIImageWithNameInDomain(name, domain);
+    if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])))
+        image = $getImage$(path);

     [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
     [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];

-    return image;
+    return image == nil ? __UIImageWithNameInDomain(name, domain) : image;

 }
 }

+// }}}

 
 

-template <typename Type_>
-static void WBReplace(Type_ *symbol, Type_ *replace) {
-    return WBReplace(symbol, replace, static_cast<Type_ **>(NULL));
+// %hook GSFontCreateWithName() {{{
+MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits traits, float size) {
+    if (Debug_)
+        NSLog(@"WB:Debug: GSFontCreateWithName(\"%s\", %f)", name, size);
+    if (NSString *font = [Info_ objectForKey:[NSString stringWithFormat:@"FontName-%s", name]])
+        name = [font UTF8String];
+    //if (NSString *scale = [Info_ objectForKey:[NSString stringWithFormat:@"FontScale-%s", name]])
+    //    size *= [scale floatValue];
+    return _GSFontCreateWithName(name, traits, size);

 }
 }

+// }}}

 
 #define AudioToolbox "/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox"
 #define UIKit "/System/Library/Frameworks/UIKit.framework/UIKit"
 
 
 #define AudioToolbox "/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox"
 #define UIKit "/System/Library/Frameworks/UIKit.framework/UIKit"
 

-/*static void UIWebDocumentView$setViewportSize$forDocumentTypes$(UIWebDocumentView *self, SEL sel, CGSize size, int type) {
-    NSLog(@"WB:Examine: %f:%f:%u", size.width, size.height, type);
-}*/
-
-static bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long, char *, bool &);
-
-static bool $_Z24GetFileNameForThisActionmPcRb(unsigned long a0, char *a1, bool &a2) {
-    bool value = _Z24GetFileNameForThisActionmPcRb(a0, a1, a2);
+static bool GetFileNameForThisAction$(bool value, unsigned long a0, char *a1, unsigned long a2, bool &a3) {

     if (Debug_)
     if (Debug_)

-        NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value);
+        NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u, %u) = %u", a0, value ? a1 : NULL, a2, a3, value);

 
     if (value) {
         NSString *path = [NSString stringWithUTF8String:a1];
         if ([path hasPrefix:@"/System/Library/Audio/UISounds/"]) {
             NSString *file = [path substringFromIndex:31];
 
     if (value) {
         NSString *path = [NSString stringWithUTF8String:a1];
         if ([path hasPrefix:@"/System/Library/Audio/UISounds/"]) {
             NSString *file = [path substringFromIndex:31];

-            NSLog(@"%@", file);
-            for (NSString *theme in themes_) {
+            for (NSString *theme in Themes_) {

                 NSString *path([NSString stringWithFormat:@"%@/UISounds/%@", theme, file]);
                 if ([Manager_ fileExistsAtPath:path]) {
                     strcpy(a1, [path UTF8String]);
                 NSString *path([NSString stringWithFormat:@"%@/UISounds/%@", theme, file]);
                 if ([Manager_ fileExistsAtPath:path]) {
                     strcpy(a1, [path UTF8String]);

-                    continue;
+                    break;

                 }
             }
         }
                 }
             }
         }


@@ -917,6 +2024,16 @@ static bool $_Z24GetFileNameForThisActionmPcRb(unsigned long a0, char *a1, bool
     return value;
 }
 
     return value;
 }
 

+MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a3) {
+    bool value(__Z24GetFileNameForThisActionmPcRb(a0, a1, a3));
+    return GetFileNameForThisAction$(value, a0, a1, 0, a3);
+}
+
+MSHook(bool, _Z24GetFileNameForThisActionmPcmRb, unsigned long a0, char *a1, unsigned long a2, bool &a3) {
+    bool value(__Z24GetFileNameForThisActionmPcmRb(a0, a1, a2, a3));
+    return GetFileNameForThisAction$(value, a0, a1, a2, a3);
+}
+

 static void ChangeWallpaper(
     CFNotificationCenterRef center,
     void *observer,
 static void ChangeWallpaper(
     CFNotificationCenterRef center,
     void *observer,


@@ -928,8 +2045,8 @@ static void ChangeWallpaper(
         NSLog(@"WB:Debug:ChangeWallpaper!");
 
     UIImage *image;
         NSLog(@"WB:Debug:ChangeWallpaper!");
 
     UIImage *image;

-    if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"Wallpaper.png", @"Wallpaper.jpg", nil])) {
-        image = [[$UIImage alloc] wb_initWithContentsOfFile:path];
+    if (WallpaperFile_ != nil) {
+        image = [[UIImage alloc] initWithContentsOfFile:WallpaperFile_];

         if (image != nil)
             image = [image autorelease];
     } else image = nil;
         if (image != nil)
             image = [image autorelease];
     } else image = nil;


@@ -941,157 +2058,251 @@ static void ChangeWallpaper(
 
 }
 
 
 }
 

-void WBRename(bool instance, const char *name, SEL sel, IMP imp) {
-    Class _class = objc_getClass(name);
-    if (_class == nil) {
-        if (Debug_)
-            NSLog(@"WB:Warning: cannot find class [%s]", name);
-        return;
-    }
-    if (!instance)
-        _class = object_getClass(_class);
-    MSHookMessage(_class, sel, imp, "wb_");
+MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, NSDictionary **names, void *arg2, void *arg3) {
+    NSArray *images(_CPBitmapCreateImagesFromPath(path, names, arg2, arg3));
+    if (images != NULL && *names != nil && CFGetTypeID((CFTypeRef) *names) == CFDictionaryGetTypeID()) {
+        if (NSBundle *bundle = [NSBundle wb$bundleWithFile:path]) {
+            NSMutableArray *copy([images mutableCopy]);
+            [images release];
+            images = copy;
+
+            NSString *file([path stringByResolvingSymlinksInPath]);
+            NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]);
+            if ([file hasPrefix:prefix]) {
+                NSUInteger length([prefix length]);
+                if (length != [file length]) {
+                    NSEnumerator *enumerator([*names keyEnumerator]);
+                    while (NSString *name = [enumerator nextObject]) {
+                        NSString *png([name stringByAppendingString:@".png"]);
+                        if (NSString *themed = $pathForFile$inBundle$(png, bundle, false, true)) {
+                            NSUInteger index([[*names objectForKey:name] intValue]);
+                            UIImage *image($getImage$(themed));
+                            CGImageRef cg([image CGImage]);
+                            [copy replaceObjectAtIndex:index withObject:(id)cg];
+                        }
+                    }
+                }
+            }
+        }
+    } return images;

 }
 
 }
 

-extern "C" void WBInitialize() {
-    if (dlopen(UIKit, RTLD_LAZY | RTLD_NOLOAD) == NULL)
-        return;
-    NSLog(@"WB:Notice: Installing WinterBoard...");
-
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    NSBundle *MediaPlayer = [NSBundle bundleWithPath:@"/System/Library/Frameworks/MediaPlayer.framework"];
-    if (MediaPlayer != nil)
-        [MediaPlayer load];
-
-    $MPVideoView = objc_getClass("MPVideoView");
-
-    $UIColor = objc_getClass("UIColor");
-    $UIImage = objc_getClass("UIImage");
-    $UIImageView = objc_getClass("UIImageView");
-    $UIWebDocumentView = objc_getClass("UIWebDocumentView");
-
-    struct nlist nl[12];
-    memset(nl, 0, sizeof(nl));
-
-    nl[0].n_un.n_name = (char *) "___currentContextCount";
-    nl[1].n_un.n_name = (char *) "___currentContextStack";
-    nl[2].n_un.n_name = (char *) "___mappedImages";
-    nl[3].n_un.n_name = (char *) "__UIImageAtPath";
-    nl[4].n_un.n_name = (char *) "__UIImageRefAtPath";
-    nl[5].n_un.n_name = (char *) "__UIImageWithName";
-    nl[6].n_un.n_name = (char *) "__UIImageWithNameInDomain";
-    nl[7].n_un.n_name = (char *) "__UIKitBundle";
-    nl[8].n_un.n_name = (char *) "__UISharedImageInitialize";
-    nl[9].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier";
-    nl[10].n_un.n_name = (char *) "__UISharedImageWithIdentifier";
-
-    nlist(UIKit, nl);
-
-    __currentContextCount = (unsigned *) nl[0].n_value;
-    __currentContextStack = (void ***) nl[1].n_value;
-    __mappedImages = (id *) nl[2].n_value;
-    _UIImageAtPath = (UIImage *(*)(NSString *, NSBundle *)) nl[3].n_value;
-    _UIImageRefAtPath = (CGImageRef *(*)(NSString *, bool, UIImageOrientation *)) nl[4].n_value;
-    _UIImageWithName = (UIImage *(*)(NSString *)) nl[5].n_value;
-    _UIImageWithNameInDomain = (UIImage *(*)(NSString *, NSString *)) nl[6].n_value;
-    _UIKitBundle = (NSBundle *(*)()) nl[7].n_value;
-    _UISharedImageInitialize = (void (*)(bool)) nl[8].n_value;
-    _UISharedImageNameGetIdentifier = (int (*)(NSString *)) nl[9].n_value;
-    _UISharedImageWithIdentifier = (UIImage *(*)(int)) nl[10].n_value;
-
-    MSHookFunction(_UIImageWithName, &$_UIImageWithName, &_UIImageWithName);
-    MSHookFunction(_UIImageWithNameInDomain, &$_UIImageWithNameInDomain, &_UIImageWithNameInDomain);
-
-    if (dlopen(AudioToolbox, RTLD_LAZY | RTLD_NOLOAD) != NULL) {
-        struct nlist nl[2];
-        memset(nl, 0, sizeof(nl));
-        nl[0].n_un.n_name = (char *) "__Z24GetFileNameForThisActionmPcRb";
-        nlist(AudioToolbox, nl);
-        _Z24GetFileNameForThisActionmPcRb = (bool (*)(unsigned long, char *, bool &)) nl[0].n_value;
-        MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &_Z24GetFileNameForThisActionmPcRb);
+MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) {
+    if (NSString *themed = $getTheme$($useScale$([NSArray arrayWithObject:@"SystemAppExited.png"])))
+        path = themed;
+    _BKSDisplayServicesSetSystemAppExitedImagePath(path);
+}
+
+#define WBRename(name, sel, imp) \
+    MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp, &_ ## name ## $ ## imp)
+
+template <typename Type_>
+static void msset(Type_ &function, MSImageRef image, const char *name) {
+    function = reinterpret_cast<Type_>(MSFindSymbol(image, name));
+}
+
+template <typename Type_>
+static void nlset(Type_ &function, struct nlist *nl, size_t index) {
+    struct nlist &name(nl[index]);
+    uintptr_t value(name.n_value);
+    if ((name.n_desc & N_ARM_THUMB_DEF) != 0)
+        value |= 0x00000001;
+    function = reinterpret_cast<Type_>(value);
+}
+
+template <typename Type_>
+static void dlset(Type_ &function, const char *name) {
+    function = reinterpret_cast<Type_>(dlsym(RTLD_DEFAULT, name));
+}
+
+// %hook CGImageReadCreateWithFile() {{{
+MSHook(void *, CGImageReadCreateWithFile, NSString *path, int flag) {
+    if (Debug_)
+        NSLog(@"WB:Debug: CGImageReadCreateWithFile(%@, %d)", path, flag);
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+    void *value(_CGImageReadCreateWithFile([path wb$themedPath], flag));
+    [pool release];
+    return value;
+}
+
+MSHook(void *, CGImageSourceCreateWithFile, NSString *path, NSDictionary *options) {
+    if (Debug_)
+        NSLog(@"WB:Debug: CGImageSourceCreateWithFile(%@, %@)", path, options);
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+    void *value(_CGImageSourceCreateWithFile([path wb$themedPath], options));
+    [pool release];
+    return value;
+}
+
+MSHook(void *, CGImageSourceCreateWithURL, NSURL *url, NSDictionary *options) {
+    if (Debug_)
+        NSLog(@"WB:Debug: CGImageSourceCreateWithURL(%@, %@)", url, options);
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+    if ([url isFileURL])
+        url = [NSURL fileURLWithPath:[[url path] wb$themedPath]];
+    void *value(_CGImageSourceCreateWithURL(url, options));
+    [pool release];
+    return value;
+}
+// }}}
+
+static void NSString$drawAtPoint$withStyle$(NSString *self, SEL _cmd, CGPoint point, NSString *style) {
+    WKSetCurrentGraphicsContext(UIGraphicsGetCurrentContext());
+    if (style == nil || [style length] == 0)
+        style = @"font-family: Helvetica; font-size: 12px";
+    //NSLog(@"XXX:drawP(%@ | %@)", self, [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]);
+    [[WBMarkup sharedMarkup] drawString:self atPoint:point withStyle:style];
+}
+
+static void NSString$drawInRect$withStyle$(NSString *self, SEL _cmd, CGRect rect, NSString *style) {
+    WKSetCurrentGraphicsContext(UIGraphicsGetCurrentContext());
+    if (style == nil || [style length] == 0)
+        style = @"font-family: Helvetica; font-size: 12px";
+    //NSLog(@"XXX:drawR(%@ | %@)", self, [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]);
+    return [[WBMarkup sharedMarkup] drawString:self inRect:rect withStyle:style];
+}
+
+static CGSize NSString$sizeWithStyle$forWidth$(NSString *self, SEL _cmd, NSString *style, float width) {
+    if (style == nil || [style length] == 0)
+        style = @"font-family: Helvetica; font-size: 12px";
+    CGSize size([[WBMarkup sharedMarkup] sizeOfString:self withStyle:style forWidth:width]);
+    //NSLog(@"XXX:size(%@ | %@) = [%g %g]", self, [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "], size.width, size.height);
+    return size;
+}
+
+static void SBInitialize() {
+    if (SummerBoard_) {
+        WBRename(SBApplication, pathForIcon, pathForIcon);
+        WBRename(SBApplicationIcon, icon, icon);
+        WBRename(SBApplicationIcon, generateIconImage:, generateIconImage$);

     }
 
     }
 

-    WBRename(false, "UIImage", @selector(applicationImageNamed:), (IMP) &UIImage$applicationImageNamed$);
-    WBRename(false, "UIImage", @selector(defaultDesktopImage), (IMP) &UIImage$defaultDesktopImage$);
-    WBRename(false, "UIImage", @selector(imageAtPath:), (IMP) &UIImage$imageAtPath$);
-    WBRename(false, "UIImage", @selector(imageNamed:), (IMP) &UIImage$imageNamed$);
-    WBRename(false, "UIImage", @selector(imageNamed:inBundle:), (IMP) &UIImage$imageNamed$inBundle$);
-
-    //WBRename("UINavigationBar", @selector(initWithCoder:", (IMP) &UINavigationBar$initWithCoder$);
-    //WBRename("UINavigationBarBackground", @selector(initWithFrame:withBarStyle:withTintColor:", (IMP) &UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$);
-    //WBRename(true, "SBStatusBar", @selector(initWithMode:orientation:", (IMP) &SBStatusBar$initWithMode$orientation$);
-    //WBRename(true, "UIWebDocumentView", @selector(setViewportSize:forDocumentTypes:", (IMP) &UIWebDocumentView$setViewportSize$forDocumentTypes$);
-
-    WBRename(true, "NSBundle", @selector(bundlePath), (IMP) &NSBundle$bundlePath$);
-    WBRename(true, "NSBundle", @selector(pathForResource:ofType:), (IMP) &NSBundle$pathForResource$ofType$);
-
-    WBRename(true, "UIImage", @selector(initWithContentsOfFile:), (IMP) &$initWithContentsOfFile$);
-    WBRename(true, "UIImage", @selector(initWithContentsOfFile:cache:), (IMP) &UIImage$initWithContentsOfFile$cache$);
-    WBRename(true, "UINavigationBar", @selector(setBarStyle:), (IMP) &UINavigationBar$setBarStyle$);
-    WBRename(true, "UIToolbar", @selector(setBarStyle:), (IMP) &UIToolbar$setBarStyle$);
-
-    WBRename(true, "WebCoreFrameBridge", @selector(renderedSizeOfNode:constrainedToWidth:), (IMP) &WebCoreFrameBridge$renderedSizeOfNode$constrainedToWidth$);
-
-    WBRename(true, "SBApplication", @selector(pathForIcon), (IMP) &SBApplication$pathForIcon);
-    WBRename(true, "SBApplicationIcon", @selector(icon), (IMP) &SBApplicationIcon$icon);
-    WBRename(true, "SBBookmarkIcon", @selector(icon), (IMP) &SBBookmarkIcon$icon);
-    WBRename(true, "SBButtonBar", @selector(didMoveToSuperview), (IMP) &$didMoveToSuperview);
-    WBRename(true, "SBCalendarIconContentsView", @selector(drawRect:), (IMP) &SBCalendarIconContentsView$drawRect$);
-    WBRename(true, "SBContentLayer", @selector(initWithSize:), (IMP) &SBContentLayer$initWithSize$);
-    WBRename(true, "SBIconLabel", @selector(initWithSize:label:), (IMP) &SBIconLabel$initWithSize$label$);
-    WBRename(true, "SBIconLabel", @selector(setInDock:), (IMP) &SBIconLabel$setInDock$);
-    WBRename(true, "SBIconLabel", @selector(drawRect:), (IMP) &SBIconLabel$drawRect$);
-    WBRename(true, "SBSlidingAlertDisplay", @selector(updateDesktopImage:), (IMP) &SBSlidingAlertDisplay$updateDesktopImage$);
-    WBRename(true, "SBStatusBarContentsView", @selector(didMoveToSuperview), (IMP) &$didMoveToSuperview);
-    WBRename(true, "SBStatusBarContentsView", @selector(initWithStatusBar:mode:), (IMP) &SBStatusBarContentsView$initWithStatusBar$mode$);
-    WBRename(true, "SBStatusBarController", @selector(setStatusBarMode:orientation:duration:fenceID:animation:), (IMP) &SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$);
-    WBRename(true, "SBStatusBarTimeView", @selector(drawRect:), (IMP) &SBStatusBarTimeView$drawRect$);
-    WBRename(true, "SBIconController", @selector(appendIconList:), (IMP) &SBIconController$appendIconList$);
-
-    _UISharedImageInitialize(false);
-
-    English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
-    if (English_ != nil)
-        English_ = [English_ retain];
+    WBRename(SBBookmarkIcon, icon, icon);
+    WBRename(SBButtonBar, didMoveToSuperview, didMoveToSuperview);
+    WBRename(SBCalendarIconContentsView, drawRect:, drawRect$);
+    WBRename(SBIconBadge, initWithBadge:, initWithBadge$);
+    WBRename(SBIconController, noteNumberOfIconListsChanged, noteNumberOfIconListsChanged);
+
+    WBRename(SBWidgetApplicationIcon, icon, icon);
+
+    WBRename(SBDockIconListView, setFrame:, setFrame$);
+    MSHookMessage(object_getClass($SBDockIconListView), @selector(shouldShowNewDock), &$SBDockIconListView$shouldShowNewDock, &_SBDockIconListView$shouldShowNewDock);
+
+    if (kCFCoreFoundationVersionNumber < 600 || SummerBoard_)
+        WBRename(SBIconLabel, drawRect:, drawRect$);
+    else if (kCFCoreFoundationVersionNumber < 700) {
+        WBRename(SBIconLabel, buildLabelImage, buildLabelImage);
+    } else {
+        WBRename(SBIconLabelImageParameters, hash, hash);
+        WBRename($SBIconView, _labelImageParametersForIcon:location:, _labelImageParametersForIcon$location$);
+        WBRename($SBIconLabelImage, _drawLabelImageForParameters:, _drawLabelImageForParameters$);
+    }
+
+    WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$);
+    WBRename(SBIconLabel, setInDock:, setInDock$);
+
+    WBRename(SBIconList, didMoveToSuperview, didMoveToSuperview);
+    WBRename(SBIconList, setFrame:, setFrame$);
+
+    WBRename(SBIconModel, cacheImageForIcon:, cacheImageForIcon$);
+    WBRename(SBIconModel, cacheImagesForIcon:, cacheImagesForIcon$);
+    WBRename(SBIconModel, getCachedImagedForIcon:, getCachedImagedForIcon$);
+    WBRename(SBIconModel, getCachedImagedForIcon:smallIcon:, getCachedImagedForIcon$smallIcon$);
+
+    WBRename(SBSearchView, initWithFrame:, initWithFrame$);
+    WBRename(SBSearchTableViewCell, drawRect:, drawRect$);
+    WBRename(SBSearchTableViewCell, initWithStyle:reuseIdentifier:, initWithStyle$reuseIdentifier$);
+
+    //WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$);
+
+    WBRename(SBAwayView, updateDesktopImage:, updateDesktopImage$);
+    if (kCFCoreFoundationVersionNumber >= 700)
+        WBRename(SBAwayView, _addSubview:positioned:relativeTo:, _addSubview$positioned$relativeTo$);
+
+    WBRename(SBStatusBarContentsView, didMoveToSuperview, didMoveToSuperview);
+    //WBRename(SBStatusBarContentsView, initWithStatusBar:mode:, initWithStatusBar$mode$);
+    //WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:animation:, setStatusBarMode$orientation$duration$animation$);
+    WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:fenceID:animation:, setStatusBarMode$orientation$duration$fenceID$animation$);
+    WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:fenceID:animation:startTime:, setStatusBarMode$orientation$duration$fenceID$animation$startTime$);
+    WBRename(SBStatusBarOperatorNameView, operatorNameStyle, operatorNameStyle);
+    WBRename(SBStatusBarOperatorNameView, setOperatorName:fullSize:, setOperatorName$fullSize$);
+    WBRename(SBStatusBarTimeView, drawRect:, drawRect$);
+
+    if (SummerBoard_)
+        English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
+}
+
+/*MSHook(int, open, const char *path, int oflag, mode_t mode) {
+    int fd(_open(path, oflag, mode));
+
+    static bool no(false);
+    if (no) return fd;
+    no = true;
+
+    if (strstr(path, "/icon") != NULL)
+        MSHookProcess(-1, "");
+
+    if (fd == -1 && errno == EFAULT)
+        NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd);
+    else
+        NSLog(@"open(\"%s\", %#x, %#o) = %d\n", path, oflag, mode, fd);
+
+    no = false;
+    return fd;
+}*/
+
+MSInitialize {
+    $objc_setAssociatedObject = reinterpret_cast<void (*)(id, void *, id value, objc_AssociationPolicy)>(dlsym(RTLD_DEFAULT, "objc_setAssociatedObject"));
+    $objc_getAssociatedObject = reinterpret_cast<id (*)(id, void *)>(dlsym(RTLD_DEFAULT, "objc_getAssociatedObject"));
+    $objc_removeAssociatedObjects = reinterpret_cast<void (*)(id)>(dlsym(RTLD_DEFAULT, "objc_removeAssociatedObjects"));
+
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+
+    NSString *identifier([[NSBundle mainBundle] bundleIdentifier]);
+    SpringBoard_ = [identifier isEqualToString:@"com.apple.springboard"];

 
     Manager_ = [[NSFileManager defaultManager] retain];
 
     Manager_ = [[NSFileManager defaultManager] retain];

-    UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:16];
-    PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16];
-    Files_ = [[NSMutableDictionary alloc] initWithCapacity:16];
+    Themes_ = [[NSMutableArray alloc] initWithCapacity:8];

 
 

-    themes_ = [[NSMutableArray alloc] initWithCapacity:8];
+    dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics");

 
 

-    if (NSDictionary *settings = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) {
-        [settings autorelease];
+    // Load Settings.plist {{{
+    if (NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) {
+        if (NSNumber *value = [settings objectForKey:@"SummerBoard"])
+            SummerBoard_ = [value boolValue];
+        else
+            SummerBoard_ = true;

 
 

-        if (NSNumber *debug = [settings objectForKey:@"Debug"])
-            Debug_ = [debug boolValue];
+        if (NSNumber *value = [settings objectForKey:@"Debug"])
+            Debug_ = [value boolValue];
+        if (NSNumber *value = [settings objectForKey:@"RecordUI"])
+            UIDebug_ = [value boolValue];

 
 

-        NSArray *themes = [settings objectForKey:@"Themes"];
+        NSArray *themes([settings objectForKey:@"Themes"]);

         if (themes == nil)
             if (NSString *theme = [settings objectForKey:@"Theme"])
                 themes = [NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys:
                     theme, @"Name",
                     [NSNumber numberWithBool:true], @"Active",
                 nil]];
         if (themes == nil)
             if (NSString *theme = [settings objectForKey:@"Theme"])
                 themes = [NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys:
                     theme, @"Name",
                     [NSNumber numberWithBool:true], @"Active",
                 nil]];

+

         if (themes != nil)
             for (NSDictionary *theme in themes) {
         if (themes != nil)
             for (NSDictionary *theme in themes) {

-                NSNumber *active = [theme objectForKey:@"Active"];
+                NSNumber *active([theme objectForKey:@"Active"]);

                 if (![active boolValue])
                     continue;
 
                 if (![active boolValue])
                     continue;
 

-                NSString *name = [theme objectForKey:@"Name"];
+                NSString *name([theme objectForKey:@"Name"]);

                 if (name == nil)
                     continue;
 
                 if (name == nil)
                     continue;
 

-                NSString *theme = nil;
+                NSString *theme(nil);

 
                 #define testForTheme(format...) \
                     if (theme == nil) { \
                         NSString *path = [NSString stringWithFormat:format]; \
                         if ([Manager_ fileExistsAtPath:path]) { \
 
                 #define testForTheme(format...) \
                     if (theme == nil) { \
                         NSString *path = [NSString stringWithFormat:format]; \
                         if ([Manager_ fileExistsAtPath:path]) { \

-                            [themes_ addObject:path]; \
+                            [Themes_ addObject:path]; \

                             continue; \
                         } \
                     }
                             continue; \
                         } \
                     }


@@ -1099,32 +2310,134 @@ extern "C" void WBInitialize() {
                 testForTheme(@"/Library/Themes/%@.theme", name)
                 testForTheme(@"/Library/Themes/%@", name)
                 testForTheme(@"%@/Library/SummerBoard/Themes/%@", NSHomeDirectory(), name)
                 testForTheme(@"/Library/Themes/%@.theme", name)
                 testForTheme(@"/Library/Themes/%@", name)
                 testForTheme(@"%@/Library/SummerBoard/Themes/%@", NSHomeDirectory(), name)

+

             }
     }
             }
     }

-
+    // }}}
+    // Merge Info.plist {{{

     Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
 
     Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
 

-    for (NSString *theme in themes_)
-        if (NSDictionary *info = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]])
+    for (NSString *theme in Themes_)
+        if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]])

             for (NSString *key in [info allKeys])
                 if ([Info_ objectForKey:key] == nil)
                     [Info_ setObject:[info objectForKey:key] forKey:key];
             for (NSString *key in [info allKeys])
                 if ([Info_ objectForKey:key] == nil)
                     [Info_ setObject:[info objectForKey:key] forKey:key];

+    // }}}
+
+    // AppSupport {{{
+    if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport")) {
+        NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, NSDictionary **, void *, void *);
+        msset(CPBitmapCreateImagesFromPath, image, "_CPBitmapCreateImagesFromPath");
+        MSHookFunction(CPBitmapCreateImagesFromPath, MSHake(CPBitmapCreateImagesFromPath));
+    }
+    // }}}
+    // AudioToolbox {{{
+    if (MSImageRef image = MSGetImageByName(AudioToolbox)) {
+        bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long, char *, bool &);
+        msset(_Z24GetFileNameForThisActionmPcRb, image, "__Z24GetFileNameForThisActionmPcRb");
+        MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb);
+
+        bool (*_Z24GetFileNameForThisActionmPcmRb)(unsigned long, char *, unsigned long, bool &);
+        msset(_Z24GetFileNameForThisActionmPcmRb, image, "__Z24GetFileNameForThisActionmPcmRb");
+        MSHookFunction(_Z24GetFileNameForThisActionmPcmRb, &$_Z24GetFileNameForThisActionmPcmRb, &__Z24GetFileNameForThisActionmPcmRb);
+    }
+    // }}}
+    // BackBoardServices {{{
+    if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/BackBoardServices.framework/BackBoardServices")) {
+        void (*BKSDisplayServicesSetSystemAppExitedImagePath)(NSString *path);
+        msset(BKSDisplayServicesSetSystemAppExitedImagePath, image, "_BKSDisplayServicesSetSystemAppExitedImagePath");
+        MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath));
+    }
+    // }}}
+    // GraphicsServices {{{
+    if (true) {
+        MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName);
+    }
+    // }}}
+    // ImageIO {{{
+    MSImageRef imageio = MSGetImageByName("/System/Library/Frameworks/ImageIO.framework/ImageIO");
+    if (imageio == NULL)
+        imageio = MSGetImageByName("/System/Library/PrivateFrameworks/ImageIO.framework/ImageIO");
+    if (MSImageRef image = imageio) {
+        void *(*CGImageReadCreateWithFile)(NSString *, int);
+        msset(CGImageReadCreateWithFile, image, "_CGImageReadCreateWithFile");
+        MSHookFunction(CGImageReadCreateWithFile, MSHake(CGImageReadCreateWithFile));
+
+        if (CGImageReadCreateWithFile == NULL) {
+            void *(*CGImageSourceCreateWithFile)(NSString *, NSDictionary *);
+            msset(CGImageSourceCreateWithFile, image, "_CGImageSourceCreateWithFile");
+            MSHookFunction(CGImageSourceCreateWithFile, MSHake(CGImageSourceCreateWithFile));
+
+            void *(*CGImageSourceCreateWithURL)(NSURL *, NSDictionary *);
+            msset(CGImageSourceCreateWithURL, image, "_CGImageSourceCreateWithURL");
+            MSHookFunction(CGImageSourceCreateWithURL, MSHake(CGImageSourceCreateWithURL));
+        }
+    }
+    // }}}
+    // SpringBoard {{{
+    if (SpringBoard_) {
+        Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper@2x.png", @"Wallpaper@2x.jpg", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain];
+        Papered_ = $getTheme$(Wallpapers_) != nil;
+        Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]) != nil;

 
 

-    if (objc_getClass("SpringBoard") != nil)

         CFNotificationCenterAddObserver(
             CFNotificationCenterGetDarwinNotifyCenter(),
             NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0
         );
 
         CFNotificationCenterAddObserver(
             CFNotificationCenterGetDarwinNotifyCenter(),
             NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0
         );
 

-    if ([Info_ objectForKey:@"UndockedIconLabels"] == nil)
-        [Info_ setObject:[NSNumber numberWithBool:(
-            [Info_ objectForKey:@"DockedIconLabelStyle"] != nil ||
-            [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil
-        )] forKey:@"UndockedIconLabels"];
+        if ($getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"]) != nil) {
+            NSBundle *MediaPlayer([NSBundle bundleWithPath:@"/System/Library/Frameworks/MediaPlayer.framework"]);
+            if (MediaPlayer != nil)
+                [MediaPlayer load];

 
 

-    if (![Info_ boolForKey:@"UndockedIconLabels"])
-    if (Debug_)
-        NSLog(@"WB:Debug:Info = %@", [Info_ description]);
+            $MPMoviePlayerController = objc_getClass("MPMoviePlayerController");
+            $MPVideoView = objc_getClass("MPVideoView");
+        }
+
+        SBInitialize();
+    }
+    // }}}
+    // UIKit {{{
+    if ([NSBundle bundleWithIdentifier:@"com.apple.UIKit"] != nil) {
+        class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16");
+        class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v28@0:4{CGRect={CGSize=ff}{CGSize=ff}}8@24");
+        class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=ff}16@0:4@8f12");
+
+        if (kCFCoreFoundationVersionNumber > 700) { // XXX: iOS 6.x
+            WBRename(UISharedArtwork, initWithName:inBundle:, initWithName$inBundle$);
+            WBRename(UIImageTableArtwork, imageNamed:, imageNamed$);
+        } else {
+            struct nlist nl[6];
+            memset(nl, 0, sizeof(nl));
+            nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName";
+            nl[1].n_un.n_name = (char *) "__UIImageWithNameInDomain";
+            nl[2].n_un.n_name = (char *) "__UIKitBundle";
+            nl[3].n_un.n_name = (char *) "__UIPackedImageTableGetIdentifierForName";
+            nl[4].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier";
+            nlist(UIKit, nl);
+
+            nlset(_UIApplicationImageWithName, nl, 0);
+            nlset(_UIImageWithNameInDomain, nl, 1);
+            nlset(_UIKitBundle, nl, 2);
+            nlset(_UIPackedImageTableGetIdentifierForName, nl, 3);
+            nlset(_UISharedImageNameGetIdentifier, nl, 4);
+
+            MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName);
+            MSHookFunction(_UIImageWithName, &$_UIImageWithName, &__UIImageWithName);
+            MSHookFunction(_UIImageWithNameInDomain, &$_UIImageWithNameInDomain, &__UIImageWithNameInDomain);
+        }
+    }
+    // }}}
+
+    //MSHookFunction(reinterpret_cast<int (*)(const char *, int, mode_t)>(&open), MSHake(open));
+
+    if (UIDebug_ && ![Manager_ fileExistsAtPath:@"/tmp/UIImages"]) {
+        NSError *error(nil);
+        if (![Manager_ createDirectoryAtPath:@"/tmp/UIImages" withIntermediateDirectories:NO attributes:[NSDictionary dictionaryWithObjectsAndKeys:
+            [NSNumber numberWithShort:0777], NSFilePosixPermissions,
+        nil] error:&error])
+            NSLog(@"WB:Error: cannot create /tmp/UIImages (%@)", error);
+    }

 
     [pool release];
 }
 
     [pool release];
 }