]> git.saurik.com Git - winterboard.git/blobdiff - Library.mm
projects / winterboard.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed lock widget overlaps.
[winterboard.git] / Library.mm
diff --git a/Library.mm b/Library.mm
index c26a44ad833721303b8518030223b366ce95ec8d..2a4483a42e548240f3e2377ed76c5918ff073cc0 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -38,48 +38,79 @@
 #define _trace() NSLog(@"WB:_trace(%u)", __LINE__);
 #define _transient
 
 #define _trace() NSLog(@"WB:_trace(%u)", __LINE__);
 #define _transient
 
-#include <objc/runtime.h>
-#include <objc/message.h>
-
-extern "C" {
-    #include <mach-o/nlist.h>
-}
-
+#import <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
 
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
 
-#import <UIKit/UIColor.h>
-#import <UIKit/UIFont.h>
-#import <UIKit/UIImage.h>
-#import <UIKit/UIImageView.h>
-#import <UIKit/UINavigationBarBackground.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>
+#include <substrate.h>
 
 
-#import <UIKit/UIImage-UIImageDeprecated.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/SBButtonBar.h>
+#import <SpringBoard/SBCalendarIconContentsView.h>
 #import <SpringBoard/SBContentLayer.h>
 #import <SpringBoard/SBContentLayer.h>
+#import <SpringBoard/SBIconController.h>
 #import <SpringBoard/SBIconLabel.h>
 #import <SpringBoard/SBIconLabel.h>
+#import <SpringBoard/SBIconList.h>
+#import <SpringBoard/SBIconModel.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>
 
+extern "C" void __clear_cache (char *beg, char *end);
+
+@protocol WinterBoard
+- (void *) _node;
+@end
+
+Class $MPMoviePlayerController;
+Class $MPVideoView;
+Class $WebCoreFrameBridge;
+
+Class $NSBundle;
+
+Class $UIImage;
+Class $UINavigationBar;
+Class $UIToolbar;
+
+Class $SBApplication;
+Class $SBApplicationIcon;
+Class $SBAwayView;
+Class $SBBookmarkIcon;
+Class $SBButtonBar;
+Class $SBCalendarIconContentsView;
+Class $SBContentLayer;
+Class $SBIconBadge;
+Class $SBIconController;
+Class $SBIconLabel;
+Class $SBIconList;
+Class $SBIconModel;
+Class $SBStatusBarContentsView;
+Class $SBStatusBarController;
+Class $SBStatusBarOperatorNameView;
+Class $SBStatusBarTimeView;
+Class $SBWidgetApplicationIcon;
+
 @interface NSDictionary (WinterBoard)
 - (UIColor *) colorForKey:(NSString *)key;
 - (BOOL) boolForKey:(NSString *)key;
 @interface NSDictionary (WinterBoard)
 - (UIColor *) colorForKey:(NSString *)key;
 - (BOOL) boolForKey:(NSString *)key;
@@ -98,7 +129,7 @@ extern "C" {
 - (BOOL) boolForKey:(NSString *)key {
     if (NSString *value = [self objectForKey:key])
         return [value boolValue];
 - (BOOL) boolForKey:(NSString *)key {
     if (NSString *value = [self objectForKey:key])
         return [value boolValue];
-    return NO;
+    return false;
 }
 
 @end
 }
 
 @end
@@ -106,228 +137,379 @@ extern "C" {
 bool Debug_ = false;
 bool Engineer_ = false;
 
 bool Debug_ = false;
 bool Engineer_ = false;
 
-/* WinterBoard Backend {{{ */
-#define WBPrefix "wb_"
+static UIImage *(*_UIApplicationImageWithName)(NSString *name);
+static UIImage *(*_UIImageAtPath)(NSString *name, NSBundle *path);
+static CGImageRef (*_UIImageRefAtPath)(NSString *name, bool cache, UIImageOrientation *orientation);
+static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain);
+static NSBundle *(*_UIKitBundle)();
+static void (*_UISharedImageInitialize)(bool);
+static int (*_UISharedImageNameGetIdentifier)(NSString *);
+static UIImage *(*_UISharedImageWithIdentifier)(int);
+
+static NSMutableDictionary *UIImages_;
+static NSMutableDictionary *PathImages_;
+static NSMutableDictionary *Cache_;
+static NSMutableDictionary *Strings_;
+static NSMutableDictionary *Themed_;
+static NSMutableDictionary *Bundles_;
+
+static NSFileManager *Manager_;
+static NSDictionary *English_;
+static NSMutableDictionary *Info_;
+static NSMutableArray *themes_;
+
+static NSString *$getTheme$(NSArray *files, bool parent = false) {
+    if (!parent)
+        if (NSString *path = [Themed_ objectForKey:files])
+            return reinterpret_cast<id>(path) == [NSNull null] ? nil : path;
+
+    if (Debug_)
+        NSLog(@"WB:Debug: %@", [files description]);
+
+    NSString *path;
+
+    for (NSString *theme in themes_)
+        for (NSString *file in files) {
+            path = [NSString stringWithFormat:@"%@/%@", theme, file];
+            if ([Manager_ fileExistsAtPath:path]) {
+                path = parent ? theme : path;
+                goto set;
+            }
+        }
 
 
-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);
+    path = nil;
+  set:
+    if (!parent)
+        [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast<id>(path)) forKey:files];
+    return path;
 }
 
 }
 
-void WBRename(bool instance, const char *classname, const char *oldname, IMP newimp) {
-    Class _class = objc_getClass(classname);
-    if (_class == nil) {
-        if (Debug_)
-            NSLog(@"WB:Warning: cannot find class [%s]", classname);
-        return;
+static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui) {
+    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]];
+    if (ui)
+        [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];
+
+    #define remapResourceName(oldname, newname) \
+        else if ([file isEqualToString:oldname]) \
+            [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \
+
+    if (identifier == nil);
+    else if ([identifier isEqualToString:@"com.apple.calculator"])
+        [names addObject:[NSString stringWithFormat:@"Files/Applications/Calculator.app/%@", file]];
+    else if (![identifier isEqualToString:@"com.apple.springboard"]);
+        remapResourceName(@"FSO_BG.png", @"StatusBar")
+        remapResourceName(@"SBDockBG.png", @"Dock")
+        remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
+
+    if (NSString *path = $getTheme$(names))
+        return path;
+    return nil;
+}
+
+static NSString *$pathForIcon$(SBApplication *self) {
+    NSString *identifier = [self bundleIdentifier];
+    NSString *path = [self path];
+    NSString *folder = [path lastPathComponent];
+    NSString *dname = [self displayName];
+    NSString *didentifier = [self displayIdentifier];
+
+    if (Debug_)
+        NSLog(@"WB:Debug: [SBApplication(%@:%@:%@:%@) pathForIcon]", identifier, folder, dname, didentifier);
+
+    NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
+
+    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", name]];
+
+    testForIcon(identifier);
+    testForIcon(dname);
+
+    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 (!instance)
-        _class = object_getClass(_class);
-    Method method = class_getInstanceMethod(_class, sel_getUid(oldname));
-    if (method == nil) {
+
+    if (NSString *path = $getTheme$(names))
+        return path;
+    return nil;
+}
+
+@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_)
         if (Debug_)
-            NSLog(@"WB:Warning: cannot find method [%s %s]", classname, oldname);
-        return;
+            NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle);
+        [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast<id>(bundle)) forKey:path];
     }
     }
-    size_t namelen = strlen(oldname);
-    char newname[sizeof(WBPrefix) + namelen];
-    memcpy(newname, WBPrefix, sizeof(WBPrefix) - 1);
-    memcpy(newname + sizeof(WBPrefix) - 1, oldname, namelen + 1);
-    const char *type = method_getTypeEncoding(method);
-    if (!class_addMethod(_class, sel_registerName(newname), method_getImplementation(method), type))
-        NSLog(@"WB:Error: failed to rename [%s %s]", classname, oldname);
-    unsigned int count;
-    Method *methods = class_copyMethodList(_class, &count);
-    for (unsigned int index(0); index != count; ++index)
-        if (methods[index] == method)
-            goto found;
-    if (newimp != NULL)
-        if (!class_addMethod(_class, sel_getUid(oldname), newimp, type))
-            NSLog(@"WB:Error: failed to rename [%s %s]", classname, oldname);
-    goto done;
-  found:
-    if (newimp != NULL)
-        method_setImplementation(method, newimp);
-  done:
-    free(methods);
+
+    return bundle;
 }
 }
-/* }}} */
 
 
-@protocol WinterBoard
-- (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;
-- (id) wb_initWithStatusBar:(id)bar mode:(int)mode;
-- (id) wb_initWithMode:(int)mode orientation:(int)orientation;
-- (void) wb_setStatusBarMode:(int)mode orientation:(int)orientation duration:(float)duration fenceID:(int)id animation:(int)animation;
 @end
 
 @end
 
-NSMutableDictionary **ImageMap_;
-NSMutableSet *UIImages_;
-
-NSFileManager *Manager_;
-NSDictionary *English_;
-NSMutableDictionary *Info_;
-NSMutableArray *themes_;
+@interface NSString (WinterBoard)
+- (NSString *) wb$themedPath;
+@end
 
 
-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];
+@implementation NSString (WinterBoard)
 
 
-        if (Debug_) {
-            NSLog(@"WB:Debug: [SBApplication(%@:%@:%@:%@) pathForIcon]", identifier, folder, dname, didentifier);
+- (NSString *) wb$themedPath {
+    if (Debug_)
+        NSLog(@"WB:Debug:Bypass(\"%@\")", self);
+
+    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))
+                    return path;
         }
         }
+    }
 
 
-        #define testForIcon(Name) \
-            if (NSString *name = Name) { \
-                NSString *path = [NSString stringWithFormat:@"%@/Icons/%@.png", theme, name]; \
-                if ([Manager_ fileExistsAtPath:path]) \
-                    return path; \
-            }
+    return self;
+}
 
 
-        if (identifier != nil) {
-            NSString *path = [NSString stringWithFormat:@"%@/Bundles/%@/icon.png", theme, identifier];
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
-        }
+@end
 
 
-        if (folder != nil) {
-            NSString *path = [NSString stringWithFormat:@"%@/Folders/%@/icon.png", theme, folder];
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
-        }
+MSHook(void, SBIconModel$cacheImageForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) {
+    _SBIconModel$cacheImageForIcon$(self, sel, icon);
+    NSString *key([icon displayIdentifier]);
 
 
-        testForIcon(identifier);
-        testForIcon(dname);
+    if (UIImage *image = [icon icon]) {
+        CGColorSpaceRef space(CGColorSpaceCreateDeviceRGB());
+        CGRect rect = {CGPointMake(1, 1), [image size]};
+        CGSize size = {rect.size.width + 2, rect.size.height + 2};
 
 
-        if (didentifier != nil) {
-            testForIcon([English_ objectForKey:didentifier]);
+        CGContextRef context(CGBitmapContextCreate(NULL, size.width, size.height, 8, 4 * size.width, space, kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst));
+        CGColorSpaceRelease(space);
 
 
-            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]]);
-        }
+        CGContextDrawImage(context, rect, [image CGImage]);
+        CGImageRef ref(CGBitmapContextCreateImage(context));
+        CGContextRelease(context);
+
+        UIImage *image([UIImage imageWithCGImage:ref]);
+        CGImageRelease(ref);
+
+        [Cache_ setObject:image forKey:key];
     }
     }
+}
 
 
-    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 *SBApplicationIcon$icon(SBApplicationIcon<WinterBoard> *self, SEL sel) {
+MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) {
     if (![Info_ boolForKey:@"ComposeStoreIcons"])
         if (NSString *path = $pathForIcon$([self application]))
             return [UIImage imageWithContentsOfFile:path];
     if (![Info_ boolForKey:@"ComposeStoreIcons"])
         if (NSString *path = $pathForIcon$([self application]))
             return [UIImage imageWithContentsOfFile:path];
-    return [self wb_icon];
+    return _SBApplicationIcon$icon(self, sel);
 }
 
 }
 
-static NSString *SBApplication$pathForIcon(SBApplication<WinterBoard> *self, SEL sel) {
-    if (NSString *path = $pathForIcon$(self))
-        return path;
-    return [self wb_pathForIcon];
+MSHook(UIImage *, SBWidgetApplicationIcon$icon, SBWidgetApplicationIcon *self, SEL sel) {
+    if (Debug_)
+        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);
 }
 
 }
 
-static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle) {
-    for (NSString *theme in themes_) {
-        NSString *identifier = [bundle bundleIdentifier];
-
-        if (identifier != nil) {
-            NSString *path = [NSString stringWithFormat:@"%@/Bundles/%@/%@", theme, identifier, file];
-            if (Debug_)
-                NSLog(@"WB:Debug:%@", path);
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
-        }
-
-        if (NSString *folder = [[bundle bundlePath] lastPathComponent]) {
-            NSString *path = [NSString stringWithFormat:@"%@/Folders/%@/%@", theme, folder, file];
-            if (Debug_)
-                NSLog(@"WB:Debug:%@", path);
-            if ([Manager_ fileExistsAtPath:path])
-                return path;
-        }
-
-        #define remapResourceName(oldname, newname) \
-            else if ([file isEqualToString:oldname]) { \
-                NSString *path = [NSString stringWithFormat:@"%@/%@.png", theme, newname]; \
-                if (Debug_) \
-                    NSLog(@"WB:Debug:%@", path); \
-                if ([Manager_ fileExistsAtPath:path]) \
-                    return path; \
-            }
+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);
+}
 
 
-        if (identifier == nil || ![identifier isEqualToString:@"com.apple.springboard"]);
-            remapResourceName(@"FSO_BG.png", @"StatusBar")
-            remapResourceName(@"SBDockBG.png", @"Dock")
-            remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
-    }
+MSHook(NSString *, SBApplication$pathForIcon, SBApplication *self, SEL sel) {
+    if (NSString *path = $pathForIcon$(self))
+        return path;
+    return _SBApplication$pathForIcon(self, sel);
+}
 
 
-    return nil;
+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 UIImage *UIImage$imageNamed$inBundle$(Class<WinterBoard> self, SEL sel, NSString *name, NSBundle *bundle) {
+MSHook(CGImageRef, _UIImageRefAtPath, NSString *name, bool cache, UIImageOrientation *orientation) {
     if (Debug_)
     if (Debug_)
-        NSLog(@"WB:Debug: [UIImage(%@) imageNamed:\"%@\"]", [bundle bundleIdentifier], name);
-    if (NSString *path = $pathForFile$inBundle$(name, bundle))
-        return [UIImage imageWithContentsOfFile:path];
-    return [self wb_imageNamed:name inBundle:bundle];
+        NSLog(@"WB:Debug: _UIImageRefAtPath(\"%@\", %s)", name, cache ? "true" : "false");
+    return __UIImageRefAtPath([name wb$themedPath], cache, orientation);
 }
 
 }
 
-static UIImage *UIImage$imageNamed$(Class<WinterBoard> self, SEL sel, NSString *name) {
-    return UIImage$imageNamed$inBundle$(self, sel, name, [NSBundle mainBundle]);
-}
+/*MSHook(UIImage *, _UIImageAtPath, NSString *name, NSBundle *bundle) {
+    if (bundle == nil)
+        return __UIImageAtPath(name, nil);
+    else {
+        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: _UIImageAtPath(\"%@\", %@)", name, bundle);
+        if (NSString *path = $pathForFile$inBundle$(name, bundle, false))
+            image = CachedImageAtPath(path);
+        if (image == nil)
+            image = __UIImageAtPath(name, bundle);
+        [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
+        return image;
+    }
+}*/
 
 
-static UIImage *UIImage$applicationImageNamed$(Class<WinterBoard> self, SEL sel, NSString *name) {
+MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) {
     NSBundle *bundle = [NSBundle mainBundle];
     if (Debug_)
     NSBundle *bundle = [NSBundle mainBundle];
     if (Debug_)
-        NSLog(@"WB:Debug: [UIImage(%@) applicationImageNamed:\"%@\"]", [bundle bundleIdentifier], name);
-    if (NSString *path = $pathForFile$inBundle$(name, bundle))
-        return [UIImage imageWithContentsOfFile:path];
-    return [self wb_applicationImageNamed:name];
+        NSLog(@"WB:Debug: _UIApplicationImageWithName(\"%@\", %@)", name, bundle);
+    if (NSString *path = $pathForFile$inBundle$(name, bundle, false))
+        return CachedImageAtPath(path);
+    return __UIApplicationImageWithName(name);
 }
 
 }
 
-static NSString *NSBundle$pathForResource$ofType$(NSBundle<WinterBoard> *self, SEL sel, NSString *resource, NSString *type) {
+#define WBDelegate(delegate) \
+    - (NSMethodSignature*) methodSignatureForSelector:(SEL)sel { \
+        if (Engineer_) \
+            NSLog(@"WB:MS:%s:(%s)", class_getName([self class]), sel_getName(sel)); \
+        if (NSMethodSignature *sig = [delegate methodSignatureForSelector:sel]) \
+            return sig; \
+        NSLog(@"WB:Error: [%s methodSignatureForSelector:(%s)]", class_getName([self class]), sel_getName(sel)); \
+        return nil; \
+    } \
+\
+    - (void) forwardInvocation:(NSInvocation*)inv { \
+        SEL sel = [inv selector]; \
+        if ([delegate respondsToSelector:sel]) \
+            [inv invokeWithTarget:delegate]; \
+        else \
+            NSLog(@"WB:Error: [%s forwardInvocation:(%s)]", class_getName([self class]), sel_getName(sel)); \
+    }
+
+MSHook(NSString *, NSBundle$pathForResource$ofType$, NSBundle *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);
     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))
+    if (NSString *path = $pathForFile$inBundle$(file, self, false))
         return path;
         return path;
-    return [self wb_pathForResource:resource ofType:type];
+    return _NSBundle$pathForResource$ofType$(self, sel, resource, type);
 }
 
 }
 
-bool UINavigationBar$setBarStyle$_(SBAppWindow<WinterBoard> *self) {
-    if (NSNumber *number = [Info_ objectForKey:@"NavigationBarStyle"]) {
-        [self wb_setBarStyle:[number intValue]];
-        return true;
+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];
+        if (Debug_)
+            NSLog(@"WB:Debug:%@Style=%d", name, style);
     }
     }
+}
 
 
-    return false;
+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()));
+
+    CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NUMBER_FORMAT" value:@"" table:@"SpringBoard"]);
+    CFStringRef date(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
+    CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NAME_FORMAT" value:@"" table:@"SpringBoard"]);
+    CFStringRef day(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
+
+    CFRelease(now);
+
+    CFRelease(formatter);
+
+    NSString *datestyle(@""
+        "font-family: Helvetica; "
+        "font-weight: bold; "
+        "font-size: 39px; "
+        "color: #333333; "
+        "alpha: 1.0; "
+    "");
+
+    NSString *daystyle(@""
+        "font-family: Helvetica; "
+        "font-weight: bold; "
+        "font-size: 9px; "
+        "color: white; "
+        "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px; "
+    "");
+
+    if (NSString *style = [Info_ objectForKey:@"CalendarIconDateStyle"])
+        datestyle = [datestyle stringByAppendingString:style];
+    if (NSString *style = [Info_ objectForKey:@"CalendarIconDayStyle"])
+        daystyle = [daystyle stringByAppendingString:style];
+
+    float width([self bounds].size.width);
+    float leeway(10);
+    CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)];
+    CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)];
+
+    [(NSString *)date drawAtPoint:CGPointMake(
+        (width + 1 - datesize.width) / 2, (71 - datesize.height) / 2
+    ) withStyle:datestyle];
+
+    [(NSString *)day drawAtPoint:CGPointMake(
+        (width + 1 - daysize.width) / 2, (16 - daysize.height) / 2
+    ) withStyle:daystyle];
+
+    CFRelease(date);
+    CFRelease(day);
 }
 
 }
 
-/*id UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$(UINavigationBarBackground<WinterBoard> *self, SEL sel, CGRect frame, int style, UIColor *tint) {
+/*static id UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$(UINavigationBarBackground<WinterBoard> *self, SEL sel, CGRect frame, int style, UIColor *tint) {
     _trace();
 
     if (NSNumber *number = [Info_ objectForKey:@"NavigationBarStyle"])
     _trace();
 
     if (NSNumber *number = [Info_ objectForKey:@"NavigationBarStyle"])
@@ -336,109 +518,215 @@ bool UINavigationBar$setBarStyle$_(SBAppWindow<WinterBoard> *self) {
     if (UIColor *color = [Info_ colorForKey:@"NavigationBarTint"])
         tint = color;
 
     if (UIColor *color = [Info_ colorForKey:@"NavigationBarTint"])
         tint = color;
 
-    return [self wb_initWithFrame:frame withBarStyle:style withTintColor:tint];
+    return [self wb$initWithFrame:frame withBarStyle:style withTintColor:tint];
 }*/
 
 }*/
 
-/*id UINavigationBar$initWithCoder$(SBAppWindow<WinterBoard> *self, SEL sel, CGRect frame, NSCoder *coder) {
-    self = [self wb_initWithCoder:coder];
+/*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 (self == nil)
         return nil;
     UINavigationBar$setBarStyle$_(self);
     return self;
 }
 
-id UINavigationBar$initWithFrame$(SBAppWindow<WinterBoard> *self, SEL sel, CGRect frame) {
-    self = [self wb_initWithFrame:frame];
+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;
 }*/
 
     if (self == nil)
         return nil;
     UINavigationBar$setBarStyle$_(self);
     return self;
 }*/
 
-static void UINavigationBar$setBarStyle$(SBAppWindow<WinterBoard> *self, SEL sel, int style) {
-    if (UINavigationBar$setBarStyle$_(self))
-        return;
-    return [self wb_setBarStyle:style];
+MSHook(void, UIToolbar$setBarStyle$, UIToolbar *self, SEL sel, int style) {
+    $setBarStyle$_(@"Toolbar", style);
+    return _UIToolbar$setBarStyle$(self, sel, style);
 }
 
 }
 
-static void $didMoveToSuperview(SBButtonBar<WinterBoard> *self, SEL sel) {
+MSHook(void, UINavigationBar$setBarStyle$, UINavigationBar *self, SEL sel, int style) {
+    $setBarStyle$_(@"NavigationBar", style);
+    return _UINavigationBar$setBarStyle$(self, sel, style);
+}
+
+MSHook(void, SBButtonBar$didMoveToSuperview, UIView *self, SEL sel) {
     [[self superview] setBackgroundColor:[UIColor clearColor]];
     [[self superview] setBackgroundColor:[UIColor clearColor]];
-    [self wb_didMoveToSuperview];
+    _SBButtonBar$didMoveToSuperview(self, sel);
 }
 
 }
 
-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;
-        }
+MSHook(void, SBStatusBarContentsView$didMoveToSuperview, UIView *self, SEL sel) {
+    [[self superview] setBackgroundColor:[UIColor clearColor]];
+    _SBStatusBarContentsView$didMoveToSuperview(self, sel);
+}
 
 
-    return nil;
+MSHook(UIImage *, UIImage$defaultDesktopImage, UIImage *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 _UIImage$defaultDesktopImage(self, sel);
 }
 
 }
 
-static id SBContentLayer$initWithSize$(SBContentLayer<WinterBoard> *self, SEL sel, CGSize size) {
-    self = [self wb_initWithSize:size];
+static NSArray *Wallpapers_;
+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)
+
+MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize size) {
+    self = _SBContentLayer$initWithSize$(self, sel, size);
     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];;
-    }
+    _release(WallpaperFile_);
+    _release(WallpaperImage_);
+    _release(WallpaperPage_);
+    _release(WallpaperURL_);
+
+    if (NSString *theme = $getTheme$(Wallpapers_, true)) {
+        NSString *mp4 = [theme stringByAppendingPathComponent:@"Wallpaper.mp4"];
+        if ([Manager_ fileExistsAtPath:mp4]) {
+#if UseAVController
+            NSError *error;
+
+            static AVController *controller_(nil);
+            if (controller_ == nil) {
+                AVQueue *queue([AVQueue avQueue]);
+                controller_ = [[AVController avControllerWithQueue:queue error:&error] retain];
+            }
 
 
-    if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"Wallpaper.png", @"Wallpaper.jpg", nil]))
-        if (UIImage *image = [[[UIImage alloc] initWithContentsOfFile:path] autorelease])
-            [self addSubview:[[[UIImageView alloc] initWithImage:image] autorelease]];
+            AVQueue *queue([controller_ queue]);
+
+            UIView *video([[[UIView alloc] initWithFrame:[self bounds]] autorelease]);
+            [controller_ setLayer:[video _layer]];
+
+            AVItem *item([[[AVItem alloc] initWithPath:mp4 error:&error] autorelease]);
+            [queue appendItem:item error:&error];
+
+            [controller_ play:&error];
+#elif UseMPMoviePlayerController
+            NSURL *url([NSURL fileURLWithPath:mp4]);
+            MPMoviePlayerController *controller = [[MPMoviePlayerController alloc] initWithContentURL:url];
+           controller.movieControlMode = MPMovieControlModeHidden;
+           [controller play];
+#else
+            MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[self bounds]] autorelease];
+            [video setMovieWithPath:mp4];
+            [video setRepeatMode:1];
+            [video setRepeatGap:-1];
+            [video playFromBeginning];;
+#endif
+
+            [self addSubview:video];
+        }
 
 
-    if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Wallpaper.html"])) {
-        CGRect bounds = [self bounds];
+        NSString *png = [theme stringByAppendingPathComponent:@"Wallpaper.png"];
+        NSString *jpg = [theme stringByAppendingPathComponent:@"Wallpaper.jpg"];
+
+        NSString *path;
+        if ([Manager_ fileExistsAtPath:png])
+            path = png;
+        else if ([Manager_ fileExistsAtPath:jpg])
+            path = jpg;
+        else path = nil;
+
+        UIImage *image;
+        if (path != nil) {
+            image = [[UIImage alloc] initWithContentsOfFile:path];
+            if (image != nil)
+                image = [image autorelease];
+        } else image = nil;
+
+        if (image != nil) {
+            WallpaperFile_ = [path retain];
+            WallpaperImage_ = [[UIImageView alloc] initWithImage:image];
+            [self addSubview:WallpaperImage_];
+        }
 
 
-        UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
-        [view setAutoresizes:YES];
+        NSString *html = [theme stringByAppendingPathComponent:@"Wallpaper.html"];
+        if ([Manager_ fileExistsAtPath:html]) {
+            CGRect bounds = [self bounds];
 
 
-        [view loadRequest:[NSURLRequest requestWithURL:[NSURL fileURLWithPath:path]]];
+            UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
+            [view setAutoresizes:true];
 
 
-        [[view webView] setDrawsBackground:NO];
-        [view setBackgroundColor:[UIColor clearColor]];
+            WallpaperPage_ = [view retain];
+            WallpaperURL_ = [[NSURL fileURLWithPath:html] retain];
 
 
-        [self addSubview:view];
+            [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
+
+            [[view webView] setDrawsBackground:false];
+            [view setBackgroundColor:[UIColor clearColor]];
+
+            [self 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 = [self bounds];
+
+            UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
+            [view setAutoresizes:true];
+
+            NSURL *url = [NSURL fileURLWithPath:html];
+            [view loadRequest:[NSURLRequest requestWithURL:url]];
+
+            [[view webView] setDrawsBackground:false];
+            [view setBackgroundColor:[UIColor clearColor]];
+
+            [self addSubview:view];
+        }
     }
 
     return self;
 }
 
     }
 
     return self;
 }
 
-#define WBDelegate(delegate) \
-    - (NSMethodSignature*) methodSignatureForSelector:(SEL)sel { \
-        if (Engineer_) \
-            NSLog(@"WB:MS:%s:(%s)", class_getName([self class]), sel_getName(sel)); \
-        if (NSMethodSignature *sig = [delegate methodSignatureForSelector:sel]) \
-            return sig; \
-        NSLog(@"WB:Error: [%s methodSignatureForSelector:(%s)]", class_getName([self class]), sel_getName(sel)); \
-        return nil; \
-    } \
-\
-    - (void) forwardInvocation:(NSInvocation*)inv { \
-        SEL sel = [inv selector]; \
-        if ([delegate respondsToSelector:sel]) \
-            [inv invokeWithTarget:delegate]; \
-        else \
-            NSLog(@"WB:Error: [%s forwardInvocation:(%s)]", class_getName([self class]), sel_getName(sel)); \
-    }
+MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage *image) {
+    NSString *path = $getTheme$([NSArray arrayWithObject:@"LockBackground.html"]);
+    UIView *&_backgroundView(MSHookIvar<UIView *>(self, "_backgroundView"));
+
+    if (path != nil && _backgroundView != nil)
+        path = nil;
+
+    _SBAwayView$updateDesktopImage$(self, sel, image);
+
+    if (path != nil) {
+        CGRect bounds = [self bounds];
+
+        UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
+        [view setAutoresizes:true];
+
+        if (WallpaperPage_ != nil)
+            [WallpaperPage_ release];
+        WallpaperPage_ = [view retain];
 
 
-static unsigned *ContextCount_;
-static void ***ContextStack_;
+        if (WallpaperURL_ != nil)
+            [WallpaperURL_ release];
+        WallpaperURL_ = [[NSURL fileURLWithPath:path] retain];
 
 
-extern "C" CGColorRef CGGStateGetSystemColor(void *);
+        [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
+
+        [[view webView] setDrawsBackground:false];
+        [view setBackgroundColor:[UIColor clearColor]];
+
+        [self insertSubview:view aboveSubview:_backgroundView];
+    }
+}
+
+/*extern "C" CGColorRef CGGStateGetSystemColor(void *);
 extern "C" CGColorRef CGGStateGetFillColor(void *);
 extern "C" CGColorRef CGGStateGetStrokeColor(void *);
 extern "C" CGColorRef CGGStateGetFillColor(void *);
 extern "C" CGColorRef CGGStateGetStrokeColor(void *);
-extern "C" NSString *UIStyleStringFromColor(CGColorRef);
+extern "C" NSString *UIStyleStringFromColor(CGColorRef);*/
 
 
-@interface WBTime : NSProxy {
+/* WBTimeLabel {{{ */
+@interface WBTimeLabel : NSProxy {
     NSString *time_;
     _transient SBStatusBarTimeView *view_;
 }
     NSString *time_;
     _transient SBStatusBarTimeView *view_;
 }
@@ -447,7 +735,7 @@ extern "C" NSString *UIStyleStringFromColor(CGColorRef);
 
 @end
 
 
 @end
 
-@implementation WBTime
+@implementation WBTimeLabel
 
 - (void) dealloc {
     [time_ release];
 
 - (void) dealloc {
     [time_ release];
@@ -464,15 +752,14 @@ WBDelegate(time_)
 
 - (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode {
     if (NSString *custom = [Info_ objectForKey:@"TimeStyle"]) {
 
 - (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode {
     if (NSString *custom = [Info_ objectForKey:@"TimeStyle"]) {
-        BOOL mode;
-        object_getInstanceVariable(view_, "_mode", (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;
     }
@@ -481,182 +768,469 @@ WBDelegate(time_)
 }
 
 @end
 }
 
 @end
-
-@interface WBIconLabel : NSProxy {
-    NSString *string_;
-    BOOL docked_;
+/* }}} */
+/* WBBadgeLabel {{{ */
+@interface WBBadgeLabel : NSProxy {
+    NSString *badge_;
 }
 
 }
 
-- (id) initWithString:(NSString *)string;
+- (id) initWithBadge:(NSString *)badge;
 
 @end
 
 
 @end
 
-@implementation WBIconLabel
+@implementation WBBadgeLabel
 
 - (void) dealloc {
 
 - (void) dealloc {
-    [string_ release];
+    [badge_ release];
     [super dealloc];
 }
 
     [super dealloc];
 }
 
-- (id) initWithString:(NSString *)string {
-    string_ = [string retain];
+- (id) initWithBadge:(NSString *)badge {
+    badge_ = [badge retain];
     return self;
 }
 
     return self;
 }
 
-WBDelegate(string_)
+WBDelegate(badge_)
 
 
-- (NSString *) _iconLabelStyle {
-    NSString *key = docked_ ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle";
-    NSString *style = [Info_ objectForKey:key];
-    return style;
-}
-
-- (CGSize) drawInRect:(CGRect)rect withFont:(UIFont *)font lineBreakMode:(int)mode alignment:(int)alignment {
-    if (NSString *custom = [self _iconLabelStyle]) {
-        NSString *style = [NSString stringWithFormat:@""
+- (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode {
+    if (NSString *custom = [Info_ objectForKey:@"BadgeStyle"]) {
+        [badge_ drawAtPoint:point withStyle:[NSString stringWithFormat:@""
             "font-family: Helvetica; "
             "font-weight: bold; "
             "font-family: Helvetica; "
             "font-weight: bold; "
-            "font-size: 11px; "
-            "text-align: center; "
-            "color: %@; "
-        "%@", docked_ ? @"white" : @"#b3b3b3", custom];
+            "font-size: 17px; "
+            "color: white; "
+        "%@", custom]];
 
 
-        if (Debug_)
-            NSLog(@"WB:Debug:style = %@", style);
-        [string_ drawInRect:rect withStyle:style];
         return CGSizeZero;
     }
 
         return CGSizeZero;
     }
 
-    return [string_ drawInRect:rect withFont:font lineBreakMode:mode alignment:alignment];
+    return [badge_ drawAtPoint:point forWidth:width withFont:font lineBreakMode:mode];
 }
 
 }
 
-- (void) drawInRect:(CGRect)rect withStyle:(NSString *)style {
-    if (NSString *custom = [self _iconLabelStyle]) {
-        NSString *combined = [NSString stringWithFormat:@"%@; %@", style, custom];
-        if (Debug_)
-            NSLog(@"WB:Debug:combined = %@", combined);
-        return [string_ drawInRect:rect withStyle:combined];
-    }
-    return [string_ drawInRect:rect withStyle:style];
+@end
+/* }}} */
+
+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;
 }
 
 }
 
-- (BOOL) respondsToSelector:(SEL)sel {
-    return
-        sel == @selector(setInDock:)
-    ? YES : [super respondsToSelector:sel];
+MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, float duration, int id, int animation) {
+    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 _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$(self, sel, mode, orientation, duration, id, animation);
+}
+
+MSHook(id, SBStatusBarContentsView$initWithStatusBar$mode$, SBStatusBarContentsView *self, SEL sel, id bar, int mode) {
+    if (NSNumber *number = [Info_ objectForKey:@"StatusBarContentsMode"])
+        mode = [number intValue];
+    return _SBStatusBarContentsView$initWithStatusBar$mode$(self, sel, bar, mode);
 }
 
 }
 
-- (void) setInDock:(BOOL)docked {
-    docked_ = docked;
+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;
+}
+
+MSHook(void, SBStatusBarOperatorNameView$setOperatorName$fullSize$, SBStatusBarOperatorNameView *self, SEL sel, NSString *name, BOOL full) {
+    if (Debug_)
+        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;
 @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) {
-    if (NSNumber *number = [Info_ objectForKey:@"StatusBarMode"])
-        mode = [number intValue];
-    return [self wb_setStatusBarMode:mode orientation:orientation duration:duration fenceID:id animation:animation];
+@implementation UIView (WinterBoard)
+
+- (bool) wb$isWBImageView {
+    return false;
 }
 
 }
 
-/*static id SBStatusBar$initWithMode$orientation$(SBStatusBar<WinterBoard> *self, SEL sel, int mode, int orientation) {
-    return [self wb_initWithMode:mode orientation:orientation];
-}*/
+@end
 
 
-static id SBStatusBarContentsView$initWithStatusBar$mode$(SBStatusBarContentsView<WinterBoard> *self, SEL sel, id bar, int mode) {
-    if (NSNumber *number = [Info_ objectForKey:@"StatusBarContentsMode"])
-        mode = [number intValue];
-    return [self wb_initWithStatusBar:bar mode:mode];
+@interface WBImageView : UIImageView {
 }
 
 }
 
-static void SBStatusBarTimeView$drawRect$(SBStatusBarTimeView<WinterBoard> *self, SEL sel, CGRect rect) {
-    id time;
-    object_getInstanceVariable(self, "_time", (void **) &time);
-    if (time != nil && [time class] != [WBTime class])
-        object_setInstanceVariable(self, "_time", (void *) [[WBTime alloc] initWithTime:[time autorelease] view:self]);
-    return [self wb_drawRect:rect];
+- (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];
 }
 
 }
 
-static void SBIconLabel$setInDock$(SBIconLabel<WinterBoard> *self, SEL sel, BOOL docked) {
-    id label;
-    object_getInstanceVariable(self, "_label", (void **) &label);
+@end
+
+MSHook(void, SBIconList$setFrame$, SBIconList *self, SEL sel, CGRect frame) {
+    NSArray *subviews([self subviews]);
+    WBImageView *view([subviews count] == 0 ? nil : [subviews objectAtIndex:0]);
+    if (view != nil && [view wb$isWBImageView])
+        [view wb$updateFrame];
+    _SBIconList$setFrame$(self, sel, frame);
+}
+
+MSHook(void, SBIconController$noteNumberOfIconListsChanged, SBIconController *self, SEL sel) {
+    SBIconModel *&_iconModel(MSHookIvar<SBIconModel *>(self, "_iconModel"));
+    NSArray *lists([_iconModel iconLists]);
+
+    for (unsigned i(0), e([lists count]); i != e; ++i)
+        if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Page%u.png", i]])) {
+            SBIconList *list([lists objectAtIndex:i]);
+            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]);
+            [view setImage:image];
+            [view wb$updateFrame];
+        }
+
+    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;
+}
+
+MSHook(void, SBIconLabel$setInDock$, SBIconLabel *self, SEL sel, BOOL docked) {
+    id &_label(MSHookIvar<id>(self, "_label"));
     if (![Info_ boolForKey:@"UndockedIconLabels"])
     if (![Info_ boolForKey:@"UndockedIconLabels"])
-        docked = YES;
-    if (label != nil && [label respondsToSelector:@selector(setInDock:)])
-        [label setInDock:docked];
-    return [self wb_setInDock:docked];
+        docked = true;
+    if (_label != nil && [_label respondsToSelector:@selector(setInDock:)])
+        [_label setInDock:docked];
+    return _SBIconLabel$setInDock$(self, sel, docked);
+}
+
+MSHook(NSString *, NSBundle$localizedStringForKey$value$table$, NSBundle *self, SEL sel, 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)) {
+        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 _NSBundle$localizedStringForKey$value$table$(self, sel, key, value, table);
 }
 
 }
 
-static id SBIconLabel$initWithSize$label$(SBIconLabel<WinterBoard> *self, SEL sel, CGSize size, NSString *label) {
-    // XXX: technically I'm misusing self here
-    return [self wb_initWithSize:size label:[[[WBIconLabel alloc] initWithString:label] autorelease]];
-    //return [self wb_initWithSize:size label:label];
+@class WebCoreFrameBridge;
+MSHook(CGSize, WebCoreFrameBridge$renderedSizeOfNode$constrainedToWidth$, WebCoreFrameBridge *self, SEL sel, id node, float width) {
+    if (node == nil)
+        return CGSizeZero;
+    void **core(reinterpret_cast<void **>([node _node]));
+    if (core == NULL || core[6] == NULL)
+        return CGSizeZero;
+    return _WebCoreFrameBridge$renderedSizeOfNode$constrainedToWidth$(self, sel, node, width);
 }
 
 }
 
-extern "C" void FindMappedImages(void);
-extern "C" NSData *UIImagePNGRepresentation(UIImage *);
+MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) {
+    CGRect bounds = [self bounds];
 
 
-static void (*__UISharedImageInitialize)(bool);
+    static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL);
 
 
-extern "C" void WBInitialize() {
-    NSLog(@"WB:Notice: Installing WinterBoard...");
+    BOOL docked;
+    Ivar ivar = object_getInstanceVariable(self, "_inDock", reinterpret_cast<void **>(&docked));
+    docked = (docked & (ivar_getOffset(ivar) == ivar_getOffset(drawMoreLegibly) ? 0x2 : 0x1)) != 0;
+
+    NSString *label(MSHookIvar<NSString *>(self, "_label"));
+
+    NSString *style = [NSString stringWithFormat:@""
+        "font-family: Helvetica; "
+        "font-weight: bold; "
+        "font-size: 11px; "
+        "color: %@; "
+    "", docked ? @"white" : @"#b3b3b3"];
+
+    if (docked)
+        style = [style stringByAppendingString:@"text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px; "];
+
+    bool ellipsis(false);
+    float max = 75, 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;
+        }
+
+        style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", spacing]];
+    }
+
+    if (ellipsis)
+        label = [label stringByAppendingString:@"..."];
+
+    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];
+}
+
+MSHook(void, mSMSMessageTranscriptController$loadView, mSMSMessageTranscriptController *self, SEL sel) {
+    _mSMSMessageTranscriptController$loadView(self, sel);
+
+    if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil]))
+        if (UIImage *image = [[UIImage alloc] initWithContentsOfFile:path]) {
+            [image autorelease];
+            UIView *&_transcriptLayer(MSHookIvar<UIView *>(self, "_transcriptLayer"));
+            UIView *parent([_transcriptLayer superview]);
+            UIImageView *background([[[UIImageView alloc] initWithImage:image] autorelease]);
+            [parent insertSubview:background belowSubview:_transcriptLayer];
+            [_transcriptLayer setBackgroundColor:[UIColor clearColor]];
+        }
+}
+
+MSHook(UIImage *, _UIImageWithName, NSString *name) {
+    int id(_UISharedImageNameGetIdentifier(name));
+    if (Debug_)
+        NSLog(@"WB:Debug: _UIImageWithName(\"%@\", %d)", name, id);
+
+    if (id == -1)
+        return _UIImageAtPath(name, _UIKitBundle());
+    else {
+        NSNumber *key([NSNumber numberWithInt:id]);
+        UIImage *image = [UIImages_ objectForKey:key];
+        if (image != nil)
+            return reinterpret_cast<id>(image) == [NSNull null] ? nil : image;
+        if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true)) {
+            image = [[UIImage alloc] initWithContentsOfFile:path cache:true];
+            if (image != nil)
+                [image autorelease];
+        }
+        if (image == nil)
+            image = _UISharedImageWithIdentifier(id);
+        [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
+        return image;
+    }
+}
+
+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)
+        return reinterpret_cast<id>(image) == [NSNull null] ? nil : image;
+    if (Debug_)
+        NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
+    if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])) {
+        image = [[UIImage alloc] initWithContentsOfFile:path];
+        if (image != nil)
+            [image autorelease];
+    }
+    if (image == nil)
+        image = __UIImageWithNameInDomain(name, domain);
+    [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
+    return image;
+}
+
+MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits traits, float size) {
+    if (NSString *font = [Info_ objectForKey:[NSString stringWithFormat:@"FontName-%s", name]])
+        name = [font UTF8String];
+    return _GSFontCreateWithName(name, traits, size);
+}
+
+#define AudioToolbox "/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox"
+#define UIKit "/System/Library/Frameworks/UIKit.framework/UIKit"
 
 
+bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long a0, char *a1, bool &a2);
+
+MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a2) {
+    bool value = __Z24GetFileNameForThisActionmPcRb(a0, a1, a2);
+    if (Debug_)
+        NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value);
+
+    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_) {
+                NSString *path([NSString stringWithFormat:@"%@/UISounds/%@", theme, file]);
+                if ([Manager_ fileExistsAtPath:path]) {
+                    strcpy(a1, [path UTF8String]);
+                    continue;
+                }
+            }
+        }
+    }
+    return value;
+}
+
+static void ChangeWallpaper(
+    CFNotificationCenterRef center,
+    void *observer,
+    CFStringRef name,
+    const void *object,
+    CFDictionaryRef info
+) {
+    if (Debug_)
+        NSLog(@"WB:Debug:ChangeWallpaper!");
+
+    UIImage *image;
+    if (WallpaperFile_ != nil) {
+        image = [[UIImage alloc] initWithContentsOfFile:WallpaperFile_];
+        if (image != nil)
+            image = [image autorelease];
+    } else image = nil;
+
+    if (WallpaperImage_ != nil)
+        [WallpaperImage_ setImage:image];
+    if (WallpaperPage_ != nil)
+        [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
+
+}
+
+#define WBRename(name, sel, imp) \
+    _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp)
+
+extern "C" void WBInitialize() {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-    struct nlist nl[5];
+    NSString *identifier([[NSBundle mainBundle] bundleIdentifier]);
+
+    NSLog(@"WB:Notice: WinterBoard");
+
+    struct nlist nl[9];
     memset(nl, 0, sizeof(nl));
 
     memset(nl, 0, sizeof(nl));
 
-    nl[0].n_un.n_name = (char *) "___mappedImages";
-    nl[1].n_un.n_name = (char *) "__UISharedImageInitialize";
-    nl[2].n_un.n_name = (char *) "___currentContextCount";
-    nl[3].n_un.n_name = (char *) "___currentContextStack";
+    nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName";
+    nl[1].n_un.n_name = (char *) "__UIImageAtPath";
+    nl[2].n_un.n_name = (char *) "__UIImageRefAtPath";
+    nl[3].n_un.n_name = (char *) "__UIImageWithNameInDomain";
+    nl[4].n_un.n_name = (char *) "__UIKitBundle";
+    nl[5].n_un.n_name = (char *) "__UISharedImageInitialize";
+    nl[6].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier";
+    nl[7].n_un.n_name = (char *) "__UISharedImageWithIdentifier";
+
+    nlist(UIKit, nl);
+
+    _UIApplicationImageWithName = (UIImage *(*)(NSString *)) nl[0].n_value;
+    _UIImageAtPath = (UIImage *(*)(NSString *, NSBundle *)) nl[1].n_value;
+    _UIImageRefAtPath = (CGImageRef (*)(NSString *, bool, UIImageOrientation *)) nl[2].n_value;
+    _UIImageWithNameInDomain = (UIImage *(*)(NSString *, NSString *)) nl[3].n_value;
+    _UIKitBundle = (NSBundle *(*)()) nl[4].n_value;
+    _UISharedImageInitialize = (void (*)(bool)) nl[5].n_value;
+    _UISharedImageNameGetIdentifier = (int (*)(NSString *)) nl[6].n_value;
+    _UISharedImageWithIdentifier = (UIImage *(*)(int)) nl[7].n_value;
+
+    MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName);
+    MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath);
+    MSHookFunction(_UIImageWithName, &$_UIImageWithName, &__UIImageWithName);
+    MSHookFunction(_UIImageWithNameInDomain, &$_UIImageWithNameInDomain, &__UIImageWithNameInDomain);
+
+    MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName);
+
+    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);
+    }
+
+    $NSBundle = objc_getClass("NSBundle");
+
+    _NSBundle$localizedStringForKey$value$table$ = MSHookMessage($NSBundle, @selector(localizedStringForKey:value:table:), &$NSBundle$localizedStringForKey$value$table$);
+    _NSBundle$pathForResource$ofType$ = MSHookMessage($NSBundle, @selector(pathForResource:ofType:), &$NSBundle$pathForResource$ofType$);
 
 
-    nlist("/System/Library/Frameworks/UIKit.framework/UIKit", nl);
+    $UIImage = objc_getClass("UIImage");
+    $UINavigationBar = objc_getClass("UINavigationBar");
+    $UIToolbar = objc_getClass("UIToolbar");
 
 
-    ImageMap_ = (id *) nl[0].n_value;
-    __UISharedImageInitialize = (void (*)(bool)) nl[1].n_value;
-    ContextCount_ = (unsigned *) nl[2].n_value;
-    ContextStack_ = (void ***) nl[3].n_value;
+    _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage);
 
 
-    __UISharedImageInitialize(false);
+    //WBRename("UINavigationBar", @selector(initWithCoder:", (IMP) &UINavigationBar$initWithCoder$);
+    //WBRename("UINavigationBarBackground", @selector(initWithFrame:withBarStyle:withTintColor:", (IMP) &UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$);
 
 
-    English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
-    if (English_ != nil)
-        English_ = [English_ retain];
+    _UINavigationBar$setBarStyle$ = MSHookMessage($UINavigationBar, @selector(setBarStyle:), &$UINavigationBar$setBarStyle$);
+    _UIToolbar$setBarStyle$ = MSHookMessage($UIToolbar, @selector(setBarStyle:), &$UIToolbar$setBarStyle$);
+
+    _UISharedImageInitialize(false);
 
     Manager_ = [[NSFileManager defaultManager] retain];
 
     Manager_ = [[NSFileManager defaultManager] retain];
-    UIImages_ = [[NSMutableSet alloc] initWithCapacity:16];
-
-    //WBRename("UINavigationBar", "initWithCoder:", (IMP) &UINavigationBar$initWithCoder$);
-    WBRename(true, "UINavigationBar", "setBarStyle:", (IMP) &UINavigationBar$setBarStyle$);
-    //WBRename("UINavigationBarBackground", "initWithFrame:withBarStyle:withTintColor:", (IMP) &UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$);
-
-    WBRename(false, "UIImage", "imageNamed:inBundle:", (IMP) &UIImage$imageNamed$inBundle$);
-    WBRename(false, "UIImage", "imageNamed:", (IMP) &UIImage$imageNamed$);
-    WBRename(false, "UIImage", "applicationImageNamed:", (IMP) &UIImage$applicationImageNamed$);
-    WBRename(true, "SBApplicationIcon", "icon", (IMP) &SBApplicationIcon$icon);
-    WBRename(true, "SBApplication", "pathForIcon", (IMP) &SBApplication$pathForIcon);
-    WBRename(true, "NSBundle", "pathForResource:ofType:", (IMP) &NSBundle$pathForResource$ofType$);
-    WBRename(true, "SBContentLayer", "initWithSize:", (IMP) &SBContentLayer$initWithSize$);
-    WBRename(true, "SBStatusBarContentsView", "initWithStatusBar:mode:", (IMP) &SBStatusBarContentsView$initWithStatusBar$mode$);
-    //WBRename(true, "SBStatusBar", "initWithMode:orientation:", (IMP) &SBStatusBar$initWithMode$orientation$);
-    WBRename(true, "SBStatusBarContentsView", "didMoveToSuperview", (IMP) &$didMoveToSuperview);
-    WBRename(true, "SBButtonBar", "didMoveToSuperview", (IMP) &$didMoveToSuperview);
-    WBRename(true, "SBIconLabel", "setInDock:", (IMP) &SBIconLabel$setInDock$);
-    WBRename(true, "SBIconLabel", "initWithSize:label:", (IMP) &SBIconLabel$initWithSize$label$);
-    WBRename(true, "SBStatusBarTimeView", "drawRect:", (IMP) &SBStatusBarTimeView$drawRect$);
-    WBRename(true, "SBStatusBarController", "setStatusBarMode:orientation:duration:fenceID:animation:", (IMP) &SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$);
+    UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:16];
+    PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16];
+    Strings_ = [[NSMutableDictionary alloc] initWithCapacity:0];
+    Bundles_ = [[NSMutableDictionary alloc] initWithCapacity:2];
+    Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128];
 
     themes_ = [[NSMutableArray alloc] initWithCapacity:8];
 
     if (NSDictionary *settings = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) {
         [settings autorelease];
 
 
     themes_ = [[NSMutableArray alloc] initWithCapacity:8];
 
     if (NSDictionary *settings = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) {
         [settings autorelease];
 
+        if (NSNumber *debug = [settings objectForKey:@"Debug"])
+            Debug_ = [debug boolValue];
+
         NSArray *themes = [settings objectForKey:@"Themes"];
         if (themes == nil)
             if (NSString *theme = [settings objectForKey:@"Theme"])
                 themes = [NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys:
                     theme, @"Name",
         NSArray *themes = [settings objectForKey:@"Themes"];
         if (themes == nil)
             if (NSString *theme = [settings objectForKey:@"Theme"])
                 themes = [NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys:
                     theme, @"Name",
-                    [NSNumber numberWithBool:YES], @"Active",
+                    [NSNumber numberWithBool:true], @"Active",
                 nil]];
         if (themes != nil)
             for (NSDictionary *theme in themes) {
                 nil]];
         if (themes != nil)
             for (NSDictionary *theme in themes) {
@@ -670,62 +1244,109 @@ extern "C" void WBInitialize() {
 
                 NSString *theme = nil;
 
 
                 NSString *theme = nil;
 
-                if (theme == nil) {
-                    NSString *path = [NSString stringWithFormat:@"/Library/Themes/%@.theme", name];
-                    if ([Manager_ fileExistsAtPath:path]) {
-                        [themes_ addObject:path];
-                        continue;
+                #define testForTheme(format...) \
+                    if (theme == nil) { \
+                        NSString *path = [NSString stringWithFormat:format]; \
+                        if ([Manager_ fileExistsAtPath:path]) { \
+                            [themes_ addObject:path]; \
+                            continue; \
+                        } \
                     }
                     }
-                }
 
 
-                if (theme == nil) {
-                    NSString *path = [NSString stringWithFormat:@"/Library/Themes/%@", name];
-                    if ([Manager_ fileExistsAtPath:path]) {
-                        [themes_ addObject:path];
-                        continue;
-                    }
-                }
-
-                if (theme == nil) {
-                    NSString *path = [NSString stringWithFormat:@"%@/Library/SummerBoard/Themes/%@", NSHomeDirectory(), name];
-                    if ([Manager_ fileExistsAtPath:path]) {
-                        [themes_ addObject:path];
-                        continue;
-                    }
-                }
+                testForTheme(@"/Library/Themes/%@.theme", name)
+                testForTheme(@"/Library/Themes/%@", name)
+                testForTheme(@"%@/Library/SummerBoard/Themes/%@", NSHomeDirectory(), name)
             }
     }
 
     Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
 
             }
     }
 
     Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
 
-    for (NSString *theme in themes_) {
-        NSString *folder = [NSString stringWithFormat:@"%@/UIImages", theme];
-        if (NSArray *images = [Manager_ contentsOfDirectoryAtPath:folder error:NULL])
-            for (int i(0), e = [images count]; i != e; ++i) {
-                NSString *name = [images objectAtIndex:i];
-                if (![name hasSuffix:@".png"])
-                    continue;
-                if ([UIImages_ containsObject:name])
-                    continue;
-                NSString *path = [NSString stringWithFormat:@"%@/%@", folder, name];
-                UIImage *image = [UIImage imageWithContentsOfFile:path];
-                [*ImageMap_ setObject:(id)[image imageRef] forKey:name];
-                [UIImages_ addObject:name];
-            }
-
+    for (NSString *theme in themes_)
         if (NSDictionary *info = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]])
             for (NSString *key in [info allKeys])
                 if ([Info_ objectForKey:key] == nil)
                     [Info_ setObject:[info objectForKey:key] forKey:key];
         if (NSDictionary *info = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]])
             for (NSString *key in [info allKeys])
                 if ([Info_ objectForKey:key] == nil)
                     [Info_ setObject:[info objectForKey:key] forKey:key];
+
+    if ([identifier isEqualToString:@"com.apple.MobileSMS"]) {
+        Class mSMSMessageTranscriptController = objc_getClass("mSMSMessageTranscriptController");
+        _mSMSMessageTranscriptController$loadView = MSHookMessage(mSMSMessageTranscriptController, @selector(loadView), &$mSMSMessageTranscriptController$loadView);
+    } else if ([identifier isEqualToString:@"com.apple.springboard"]) {
+        CFNotificationCenterAddObserver(
+            CFNotificationCenterGetDarwinNotifyCenter(),
+            NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0
+        );
+
+        NSBundle *MediaPlayer = [NSBundle bundleWithPath:@"/System/Library/Frameworks/MediaPlayer.framework"];
+        if (MediaPlayer != nil)
+            [MediaPlayer load];
+
+        $MPMoviePlayerController = objc_getClass("MPMoviePlayerController");
+        $MPVideoView = objc_getClass("MPVideoView");
+        $WebCoreFrameBridge = objc_getClass("WebCoreFrameBridge");
+
+        $SBApplication = objc_getClass("SBApplication");
+        $SBApplicationIcon = objc_getClass("SBApplicationIcon");
+        $SBAwayView = objc_getClass("SBAwayView");
+        $SBBookmarkIcon = objc_getClass("SBBookmarkIcon");
+        $SBButtonBar = objc_getClass("SBButtonBar");
+        $SBCalendarIconContentsView = objc_getClass("SBCalendarIconContentsView");
+        $SBContentLayer = objc_getClass("SBContentLayer");
+        $SBIconBadge = objc_getClass("SBIconBadge");
+        $SBIconController = objc_getClass("SBIconController");
+        $SBIconLabel = objc_getClass("SBIconLabel");
+        $SBIconList = objc_getClass("SBIconList");
+        $SBIconModel = objc_getClass("SBIconModel");
+        $SBStatusBarContentsView = objc_getClass("SBStatusBarContentsView");
+        $SBStatusBarController = objc_getClass("SBStatusBarController");
+        $SBStatusBarOperatorNameView = objc_getClass("SBStatusBarOperatorNameView");
+        $SBStatusBarTimeView = objc_getClass("SBStatusBarTimeView");
+        $SBWidgetApplicationIcon = objc_getClass("SBWidgetApplicationIcon");
+
+        WBRename(WebCoreFrameBridge, renderedSizeOfNode:constrainedToWidth:, renderedSizeOfNode$constrainedToWidth$);
+
+        WBRename(SBApplication, pathForIcon, pathForIcon);
+        WBRename(SBApplicationIcon, icon, icon);
+        WBRename(SBBookmarkIcon, icon, icon);
+        WBRename(SBButtonBar, didMoveToSuperview, didMoveToSuperview);
+        WBRename(SBCalendarIconContentsView, drawRect:, drawRect$);
+        WBRename(SBContentLayer, initWithSize:, initWithSize$);
+        WBRename(SBIconBadge, initWithBadge:, initWithBadge$);
+        WBRename(SBIconController, noteNumberOfIconListsChanged, noteNumberOfIconListsChanged);
+        WBRename(SBWidgetApplicationIcon, icon, icon);
+
+        WBRename(SBIconLabel, drawRect:, drawRect$);
+        WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$);
+        WBRename(SBIconLabel, setInDock:, setInDock$);
+
+        WBRename(SBIconList, setFrame:, setFrame$);
+
+        WBRename(SBIconModel, cacheImageForIcon:, cacheImageForIcon$);
+        WBRename(SBIconModel, getCachedImagedForIcon:, getCachedImagedForIcon$);
+
+        WBRename(SBAwayView, updateDesktopImage:, updateDesktopImage$);
+        WBRename(SBStatusBarContentsView, didMoveToSuperview, didMoveToSuperview);
+        WBRename(SBStatusBarContentsView, initWithStatusBar:mode:, initWithStatusBar$mode$);
+        WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:fenceID:animation:, setStatusBarMode$orientation$duration$fenceID$animation$);
+        WBRename(SBStatusBarOperatorNameView, operatorNameStyle, operatorNameStyle);
+        WBRename(SBStatusBarOperatorNameView, setOperatorName:fullSize:, setOperatorName$fullSize$);
+        WBRename(SBStatusBarTimeView, drawRect:, drawRect$);
+
+        English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
+        if (English_ != nil)
+            English_ = [English_ retain];
+
+        Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64];
     }
 
     }
 
+    Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain];
+
     if ([Info_ objectForKey:@"UndockedIconLabels"] == nil)
         [Info_ setObject:[NSNumber numberWithBool:(
     if ([Info_ objectForKey:@"UndockedIconLabels"] == nil)
         [Info_ setObject:[NSNumber numberWithBool:(
+            $getTheme$(Wallpapers_) == nil ||
             [Info_ objectForKey:@"DockedIconLabelStyle"] != nil ||
             [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil
         )] forKey:@"UndockedIconLabels"];
 
             [Info_ objectForKey:@"DockedIconLabelStyle"] != nil ||
             [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil
         )] forKey:@"UndockedIconLabels"];
 
-    if (![Info_ boolForKey:@"UndockedIconLabels"])
     if (Debug_)
         NSLog(@"WB:Debug:Info = %@", [Info_ description]);
 
     if (Debug_)
         NSLog(@"WB:Debug:Info = %@", [Info_ description]);
 
WinterBoard