]> git.saurik.com Git - winterboard.git/blobdiff - Library.mm
@thekirbylover fix for @TCcentex Facebook icon bug.
[winterboard.git] / Library.mm
index b19eecd8a2cb3a33c3cadfc19f646a8837eebcad..f661bc035b8d3976d49b3d048ab777a696cb850d 100644 (file)
@@ -1,5 +1,5 @@
 /* WinterBoard - Theme Manager for the iPhone
 /* WinterBoard - Theme Manager for the iPhone
- * Copyright (C) 2008-2010  Jay Freeman (saurik)
+ * Copyright (C) 2008-2011  Jay Freeman (saurik)
 */
 
 /*
 */
 
 /*
@@ -47,7 +47,7 @@ bool _itv;
         _itv = true; \
         _ltv = _ctv; \
     } \
         _itv = true; \
         _ltv = _ctv; \
     } \
-    fprintf(stderr, "%lu.%.6u[%f]:_trace()@%s:%u[%s]\n", \
+    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__\
         _ctv.tv_sec, _ctv.tv_usec, \
         (_ctv.tv_sec - _ltv.tv_sec) + (_ctv.tv_usec - _ltv.tv_usec) / 1000000.0, \
         __FILE__, __LINE__, __FUNCTION__\
@@ -60,6 +60,7 @@ bool _itv;
 #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 <Celestial/AVController.h>
 #import <Celestial/AVItem.h>
 
 #import <Celestial/AVController.h>
 #import <Celestial/AVItem.h>
@@ -100,50 +101,97 @@ bool _itv;
 
 #import <ChatKit/CKMessageCell.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;
 @protocol WinterBoard
 - (void *) _node;
 @end
 
 Class $MPMoviePlayerController;
 Class $MPVideoView;
-Class $WebCoreFrameBridge;
-
-Class $NSBundle;
-
-Class $UIImage;
-Class $UINavigationBar;
-Class $UIToolbar;
-
-Class $CKMessageCell;
-Class $CKTimestampView;
-Class $CKTranscriptController;
-Class $CKTranscriptTableView;
-
-Class $SBApplication;
-Class $SBApplicationIcon;
-Class $SBAwayView;
-Class $SBBookmarkIcon;
-Class $SBButtonBar;
-Class $SBCalendarIconContentsView;
-Class $SBIcon;
-Class $SBIconBadge;
-Class $SBIconController;
-Class $SBIconLabel;
-Class $SBIconList;
-Class $SBIconModel;
-//Class $SBImageCache;
-Class $SBSearchView;
-Class $SBSearchTableViewCell;
-Class $SBStatusBarContentsView;
-Class $SBStatusBarController;
-Class $SBStatusBarOperatorNameView;
-Class $SBStatusBarTimeView;
-Class $SBUIController;
-Class $SBWidgetApplicationIcon;
+
+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 IsWild_;
+static bool Four_($SBDockIconListView != nil);
+
+@interface NSObject (wb$SBIconAccessoryImage)
++ (Class) _imageClassForIcon:(SBIcon *)icon location:(int)location;
+@end
 
 @interface NSDictionary (WinterBoard)
 - (UIColor *) wb$colorForKey:(NSString *)key;
 
 @interface NSDictionary (WinterBoard)
 - (UIColor *) wb$colorForKey:(NSString *)key;
@@ -173,69 +221,154 @@ static BOOL (*_GSFontGetUseLegacyFontMetrics)();
     (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics())
 
 static bool Debug_ = false;
     (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics())
 
 static bool Debug_ = false;
+static bool UIDebug_ = false;
 static bool Engineer_ = false;
 static bool Engineer_ = false;
-static bool SummerBoard_ = true;
+static bool SummerBoard_ = false;
 static bool SpringBoard_;
 
 static UIImage *(*_UIApplicationImageWithName)(NSString *name);
 static bool SpringBoard_;
 
 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 UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain);
 static NSBundle *(*_UIKitBundle)();
+static bool (*_UIPackedImageTableGetIdentifierForName)(NSString *, int *);
 static int (*_UISharedImageNameGetIdentifier)(NSString *);
 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 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, bool parent = false) {
-    if (!parent)
-        if (NSString *path = [Themed_ objectForKey:files])
+// $getTheme$() {{{
+static NSMutableDictionary *Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128];
+
+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 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 (Scale_ == 1)
+        return files;
+
+    NSString *idiom(IsWild_ ? @"ipad" : @"iphone");
+
+    NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 4)]);
+
+    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]];
+            }
+
+            [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
+
+            [scaled addObject:file];
+
+            if ([base hasSuffix:[NSString stringWithFormat:@"~%@", idiom]])
+                [scaled addObject:[[base substringWithRange:NSMakeRange(0, [base length] - 1 - [idiom length])] stringByAppendingPathExtension:extension]];
+        }
+    }
+
+    return scaled;
+}
+
+static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) {
+    // XXX: this is not reasonable; OMG
+    id key(files);
+
+    @synchronized (Themed_) {
+        if (NSString *path = [Themed_ objectForKey:key])
             return reinterpret_cast<id>(path) == [NSNull null] ? nil : path;
             return reinterpret_cast<id>(path) == [NSNull null] ? nil : path;
+    }
 
     if (Debug_)
         NSLog(@"WB:Debug: %@", [files description]);
 
     NSString *path;
 
 
     if (Debug_)
         NSLog(@"WB:Debug: %@", [files description]);
 
     NSString *path;
 
-    for (NSString *theme in themes_)
+    for (NSString *theme in Themes_)
         for (NSString *file in files) {
             path = [NSString stringWithFormat:@"%@/%@", theme, file];
             if ([Manager_ fileExistsAtPath:path]) {
         for (NSString *file in files) {
             path = [NSString stringWithFormat:@"%@/%@", theme, file];
             if ([Manager_ fileExistsAtPath:path]) {
-                path = parent ? theme : path;
+                if ([[Manager_ pathContentOfSymbolicLinkAtPath:path] isEqualToString:@"/"])
+                    path = nil;
                 goto set;
             }
         }
 
     path = nil;
   set:
                 goto set;
             }
         }
 
     path = nil;
   set:
-    if (!parent)
-        [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast<id>(path)) forKey:files];
+
+    @synchronized (Themed_) {
+        [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast<id>(path)) forKey:key];
+    }
+
     return path;
 }
     return path;
 }
-
-static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui) {
+// }}}
+// $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]];
     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])
+    if (NSString *folder = [[bundle bundlePath] lastPathComponent]) {
         [names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
         [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) \
     if (ui)
         [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];
 
     #define remapResourceName(oldname, newname) \
-        else if ([file isEqualToString:oldname]) \
+        else if ([file isEqualToString:(oldname)]) \
             [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \
 
     bool summer(SpringBoard_ && SummerBoard_);
             [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \
 
     bool summer(SpringBoard_ && SummerBoard_);
@@ -245,18 +378,23 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u
         [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]];
         [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")
     else if (!summer);
         remapResourceName(@"FSO_BG.png", @"StatusBar")
-        remapResourceName(@"SBDockBG.png", @"Dock")
+        remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock")
         remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
 
         remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
 
-    if (NSString *path = $getTheme$(names))
+    [names addObject:[NSString stringWithFormat:@"Fallback/%@", file]];
+
+    if (NSString *path = $getTheme$($useScale$(names, use)))
         return path;
 
     return nil;
 }
         return path;
 
     return nil;
 }
+// }}}
 
 
-static NSString *$pathForIcon$(SBApplication *self) {
+static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
     NSString *identifier = [self bundleIdentifier];
     NSString *path = [self path];
     NSString *folder = [path lastPathComponent];
     NSString *identifier = [self bundleIdentifier];
     NSString *path = [self path];
     NSString *folder = [path lastPathComponent];
@@ -276,7 +414,7 @@ static NSString *$pathForIcon$(SBApplication *self) {
 
     #define testForIcon(Name) \
         if (NSString *name = Name) \
 
     #define testForIcon(Name) \
         if (NSString *name = Name) \
-            [names addObject:[NSString stringWithFormat:@"Icons/%@.png", name]];
+            [names addObject:[NSString stringWithFormat:@"Icons%@/%@.png", suffix, name]];
 
     if (![didentifier isEqualToString:identifier])
         testForIcon(didentifier);
 
     if (![didentifier isEqualToString:identifier])
         testForIcon(didentifier);
@@ -302,6 +440,7 @@ static NSString *$pathForIcon$(SBApplication *self) {
     return nil;
 }
 
     return nil;
 }
 
+// -[NSBundle wb$bundleWithFile] {{{
 @interface NSBundle (WinterBoard)
 + (NSBundle *) wb$bundleWithFile:(NSString *)path;
 @end
 @interface NSBundle (WinterBoard)
 + (NSBundle *) wb$bundleWithFile:(NSString *)path;
 @end
@@ -330,7 +469,8 @@ static NSString *$pathForIcon$(SBApplication *self) {
 }
 
 @end
 }
 
 @end
-
+// }}}
+// -[NSString wb$themedPath] {{{
 @interface NSString (WinterBoard)
 - (NSString *) wb$themedPath;
 @end
 @interface NSString (WinterBoard)
 - (NSString *) wb$themedPath;
 @end
@@ -338,6 +478,9 @@ static NSString *$pathForIcon$(SBApplication *self) {
 @implementation NSString (WinterBoard)
 
 - (NSString *) wb$themedPath {
 @implementation NSString (WinterBoard)
 
 - (NSString *) wb$themedPath {
+    if ([self hasPrefix:@"/Library/Themes/"])
+        return self;
+
     if (Debug_)
         NSLog(@"WB:Debug:Bypass(\"%@\")", self);
 
     if (Debug_)
         NSLog(@"WB:Debug:Bypass(\"%@\")", self);
 
@@ -347,7 +490,7 @@ static NSString *$pathForIcon$(SBApplication *self) {
         if ([file hasPrefix:prefix]) {
             NSUInteger length([prefix length]);
             if (length != [file length])
         if ([file hasPrefix:prefix]) {
             NSUInteger length([prefix length]);
             if (length != [file length])
-                if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false))
+                if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false, false))
                     return path;
         }
     }
                     return path;
         }
     }
@@ -356,6 +499,7 @@ static NSString *$pathForIcon$(SBApplication *self) {
 }
 
 @end
 }
 
 @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 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);
@@ -472,10 +616,20 @@ MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) {
 
 MSHook(UIImage *, SBApplicationIcon$generateIconImage$, SBApplicationIcon *self, SEL sel, int type) {
     if (type == 2)
 
 MSHook(UIImage *, SBApplicationIcon$generateIconImage$, SBApplicationIcon *self, SEL sel, int type) {
     if (type == 2)
-        if (![Info_ wb$boolForKey:@"ComposeStoreIcons"])
+        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 (NSString *path = $pathForIcon$([self application]))
-                if (UIImage *image = [UIImage imageWithContentsOfFile:path])
-                    return [image _imageScaledToProportion:1.2 interpolationQuality:5];
+                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);
 }
 
     return _SBApplicationIcon$generateIconImage$(self, sel, type);
 }
 
@@ -513,49 +667,11 @@ static UIImage *CachedImageAtPath(NSString *path) {
     return image;
 }
 
     return image;
 }
 
-MSHook(CGImageRef, _UIImageRefAtPath, NSString *name, bool cache, UIImageOrientation *orientation) {
-    if (Debug_)
-        NSLog(@"WB:Debug: _UIImageRefAtPath(\"%@\", %s)", name, cache ? "true" : "false");
-
-    NSString *themed([name wb$themedPath]);
-
-    if (false && SpringBoard_ && SummerBoard_ && themed == name) {
-        if ([name isEqualToString:@"/System/Library/CoreServices/SpringBoard.app/SBDockBGT-Portrait.png"])
-            if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Dock.png"])) {
-                UIImage *image([UIImage imageWithContentsOfFile:path]);
-                CGImageRef ref([[image _imageScaledToProportion:2.4 interpolationQuality:5] imageRef]);
-                CGImageRetain(ref);
-                return ref;
-            }
-    }
-
-    return __UIImageRefAtPath(themed, cache, orientation);
-}
-
-/*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;
-    }
-}*/
-
 MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) {
     NSBundle *bundle = [NSBundle mainBundle];
     if (Debug_)
         NSLog(@"WB:Debug: _UIApplicationImageWithName(\"%@\", %@)", name, bundle);
 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))
+    if (NSString *path = $pathForFile$inBundle$(name, bundle, false, false))
         return CachedImageAtPath(path);
     return __UIApplicationImageWithName(name);
 }
         return CachedImageAtPath(path);
     return __UIApplicationImageWithName(name);
 }
@@ -578,28 +694,261 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) {
             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)); \
     }
 
-MSHook(NSString *, NSBundle$pathForResource$ofType$, NSBundle *self, SEL sel, NSString *resource, NSString *type) {
+// %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);
     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))
+    if (NSString *path = $pathForFile$inBundle$(file, self, false, false))
         return path;
         return path;
-    return _NSBundle$pathForResource$ofType$(self, sel, resource, type);
+    return MSOldCall(resource, type);
 }
 }
+// }}}
 
 
-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);
+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;
+        }
+
+        style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", spacing]];
+    }
+
+    if (ellipsis)
+        label = [label stringByAppendingString:@"..."];
+
+    if (custom != nil)
+        style = [style stringByAppendingString:custom];
+
+    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];
+}
+
+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];
+}
+
+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 *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;
+}
+
+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;
+}
+
+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];
+}
+
+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];
+}
+
+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;
+}
+
+MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, NSString *, text) {
+    WBStringDrawingState badgeState = {NULL, -1, @""
+    , @"BadgeStyle"};
+
+    stringDrawingState_ = &badgeState;
+
+    UIImage *image(MSOldCall(text));
+
+    stringDrawingState_ = NULL;
+    return image;
+}
+
+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;
+}
+
+MSInstanceMessageHook1(UIImage *, UIStatusBarTimeItemView, contentsImageForStyle, int, style) {
+    WBStringDrawingState timeState = {NULL, 0, @""
+    , @"TimeStyle"};
+
+    stringDrawingState_ = &timeState;
+
+    UIImage *image(MSOldCall(style));
+
+    stringDrawingState_ = NULL;
+    return image;
 }
 
 MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *self, SEL sel, CGRect rect) {
 }
 
 MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *self, SEL sel, CGRect rect) {
@@ -611,7 +960,7 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s
 
     CFDateRef now(CFDateCreate(NULL, CFAbsoluteTimeGetCurrent()));
 
 
     CFDateRef now(CFDateCreate(NULL, CFAbsoluteTimeGetCurrent()));
 
-    CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NUMBER_FORMAT" value:@"" table:@"SpringBoard"]);
+    CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NUMBER_FORMAT" value:@"d" table:@"SpringBoard"]);
     CFStringRef date(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
     CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NAME_FORMAT" value:@"cccc" table:@"SpringBoard"]);
     CFStringRef day(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
     CFStringRef date(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
     CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NAME_FORMAT" value:@"cccc" table:@"SpringBoard"]);
     CFStringRef day(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
@@ -650,59 +999,54 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s
     CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)];
     CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)];
 
     CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)];
     CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)];
 
-    unsigned base(IsWild_ ? 89 : 70);
+    unsigned base0(IsWild_ ? 89 : 70);
     if ($GSFontGetUseLegacyFontMetrics())
     if ($GSFontGetUseLegacyFontMetrics())
-        base = base + 1;
+        base0 = base0 + 1;
+    unsigned base1(IsWild_ ? 18 : 16);
+
+    if (Four_) {
+        ++base0;
+        ++base1;
+    }
 
     [(NSString *)date drawAtPoint:CGPointMake(
 
     [(NSString *)date drawAtPoint:CGPointMake(
-        (width + 1 - datesize.width) / 2, (base - 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 + 1 - daysize.width) / 2, ((IsWild_ ? 18 : 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_ wb$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;
-}*/
-
-MSHook(void, UIToolbar$setBarStyle$, UIToolbar *self, SEL sel, int style) {
+MSInstanceMessageHook1(void, UIToolbar, setBarStyle, int, style) {
     $setBarStyle$_(@"Toolbar", style);
     $setBarStyle$_(@"Toolbar", style);
-    return _UIToolbar$setBarStyle$(self, sel, style);
+    return MSOldCall(style);
 }
 
 }
 
-MSHook(void, UINavigationBar$setBarStyle$, UINavigationBar *self, SEL sel, int style) {
+MSInstanceMessageHook1(void, UINavigationBar, setBarStyle, int, style) {
     $setBarStyle$_(@"NavigationBar", style);
     $setBarStyle$_(@"NavigationBar", style);
-    return _UINavigationBar$setBarStyle$(self, sel, style);
+    return MSOldCall(style);
 }
 }
+// }}}
 
 MSHook(void, SBButtonBar$didMoveToSuperview, UIView *self, SEL sel) {
     [[self superview] setBackgroundColor:[UIColor clearColor]];
 
 MSHook(void, SBButtonBar$didMoveToSuperview, UIView *self, SEL sel) {
     [[self superview] setBackgroundColor:[UIColor clearColor]];
@@ -714,16 +1058,10 @@ MSHook(void, SBStatusBarContentsView$didMoveToSuperview, UIView *self, SEL sel)
     _SBStatusBarContentsView$didMoveToSuperview(self, sel);
 }
 
     _SBStatusBarContentsView$didMoveToSuperview(self, sel);
 }
 
-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 NSArray *Wallpapers_;
 static bool Papered_;
 static NSArray *Wallpapers_;
 static bool Papered_;
+static bool Docked_;
+static bool SMSBackgrounded_;
 static NSString *WallpaperFile_;
 static UIImageView *WallpaperImage_;
 static UIWebDocumentView *WallpaperPage_;
 static NSString *WallpaperFile_;
 static UIImageView *WallpaperImage_;
 static UIWebDocumentView *WallpaperPage_;
@@ -735,16 +1073,73 @@ static NSURL *WallpaperURL_;
         object = nil; \
     } while (false)
 
         object = nil; \
     } while (false)
 
-MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
-    self = _SBUIController$init(self, sel);
+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 UIImage *$getDefaultDesktopImage$() {
+    if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"LockBackground.png", @"LockBackground.jpg", nil])))
+        return $getImage$(path);
+    return nil;
+}
+
+MSClassMessageHook0(UIImage *, UIImage, defaultDesktopImage) {
+    return $getDefaultDesktopImage$() ?: MSOldCall();
+}
+
+MSInstanceMessageHook0(UIImage *, SBSlidingAlertDisplay, _defaultDesktopImage) {
+    return $getDefaultDesktopImage$() ?: MSOldCall();
+}
+
+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;
+            }
+
+            break;
+        }
+
+    MSOldCall();
+}
+
+// %hook -[SBUIController init] {{{
+MSInstanceMessageHook0(id, SBUIController, init) {
+    self = MSOldCall();
     if (self == nil)
         return nil;
 
     if (self == nil)
         return nil;
 
-    UIDevice *device([UIDevice currentDevice]);
-    IsWild_ = [device respondsToSelector:@selector(isWildcat)] && [device isWildcat];
+    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 (Papered_) {
-        UIWindow *&_wallpaperView(MSHookIvar<UIWindow *>(self, "_wallpaperView"));
+        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;
+    }
+
+    if (Debug_)
+        NSLog(@"WB:Debug:Info = %@", [Info_ description]);
+
+    if (paper != nil) {
+        UIImageView *&_wallpaperView(MSHookIvar<UIImageView *>(self, "_wallpaperView"));
         if (&_wallpaperView != NULL) {
             [_wallpaperView removeFromSuperview];
             [_wallpaperView release];
         if (&_wallpaperView != NULL) {
             [_wallpaperView removeFromSuperview];
             [_wallpaperView release];
@@ -752,24 +1147,34 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
         }
     }
 
         }
     }
 
-    UIWindow *&_window(MSHookIvar<UIWindow *>(self, "_window"));
     UIView *&_contentLayer(MSHookIvar<UIView *>(self, "_contentLayer"));
     UIView *&_contentView(MSHookIvar<UIView *>(self, "_contentView"));
 
     UIView *&_contentLayer(MSHookIvar<UIView *>(self, "_contentLayer"));
     UIView *&_contentView(MSHookIvar<UIView *>(self, "_contentView"));
 
-    UIView *layer;
+    UIView **player;
     if (&_contentLayer != NULL)
     if (&_contentLayer != NULL)
-        layer = _contentLayer;
+        player = &_contentLayer;
     else if (&_contentView != NULL)
     else if (&_contentView != NULL)
-        layer = _contentView;
+        player = &_contentView;
     else
     else
-        layer = nil;
+        player = NULL;
+    UIView *layer(player == NULL ? nil : *player);
 
 
-    UIView *content([[[UIView alloc] initWithFrame:[layer frame]] autorelease]);
+    UIWindow *window([[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]);
+    UIView *content([[[UIView alloc] initWithFrame:[window frame]] autorelease]);
+    [window setContentView:content];
+
+    UIWindow *&_window(MSHookIvar<UIWindow *>(self, "_window"));
+    [window setBackgroundColor:[_window backgroundColor]];
+    [_window setBackgroundColor:[UIColor clearColor]];
+
+    [window setLevel:-1000];
+    [window setHidden:NO];
+
+    /*if (player != NULL)
+        *player = content;*/
 
     [content setBackgroundColor:[layer backgroundColor]];
     [layer setBackgroundColor:[UIColor clearColor]];
 
     [content setBackgroundColor:[layer backgroundColor]];
     [layer setBackgroundColor:[UIColor clearColor]];
-    [layer setFrame:[content bounds]];
-    [_window setContentView:content];
 
     UIView *indirect;
     if (!SummerBoard_ || !IsWild_)
 
     UIView *indirect;
     if (!SummerBoard_ || !IsWild_)
@@ -787,9 +1192,10 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
     _release(WallpaperPage_);
     _release(WallpaperURL_);
 
     _release(WallpaperPage_);
     _release(WallpaperURL_);
 
-    if (NSString *theme = $getTheme$(Wallpapers_, true)) {
-        NSString *mp4 = [theme stringByAppendingPathComponent:@"Wallpaper.mp4"];
-        if ([Manager_ fileExistsAtPath:mp4]) {
+    if (paper != nil) {
+        NSArray *themes([NSArray arrayWithObject:paper]);
+
+        if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"], themes)) {
 #if UseAVController
             NSError *error;
 
 #if UseAVController
             NSError *error;
 
@@ -804,18 +1210,18 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
             UIView *video([[[UIView alloc] initWithFrame:[indirect bounds]] autorelease]);
             [controller_ setLayer:[video _layer]];
 
             UIView *video([[[UIView alloc] initWithFrame:[indirect bounds]] autorelease]);
             [controller_ setLayer:[video _layer]];
 
-            AVItem *item([[[AVItem alloc] initWithPath:mp4 error:&error] autorelease]);
+            AVItem *item([[[AVItem alloc] initWithPath:path error:&error] autorelease]);
             [queue appendItem:item error:&error];
 
             [controller_ play:&error];
 #elif UseMPMoviePlayerController
             [queue appendItem:item error:&error];
 
             [controller_ play:&error];
 #elif UseMPMoviePlayerController
-            NSURL *url([NSURL fileURLWithPath:mp4]);
+            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];
             MPMoviePlayerController *controller = [[$MPMoviePlayerController alloc] initWithContentURL:url];
            controller.movieControlMode = MPMovieControlModeHidden;
            [controller play];
 #else
             MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[indirect bounds]] autorelease];
-            [video setMovieWithPath:mp4];
+            [video setMovieWithPath:path];
             [video setRepeatMode:1];
             [video setRepeatGap:-1];
             [video playFromBeginning];;
             [video setRepeatMode:1];
             [video setRepeatGap:-1];
             [video playFromBeginning];;
@@ -824,40 +1230,24 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
             [indirect addSubview:video];
         }
 
             [indirect addSubview:video];
         }
 
-        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];
-            if (NSNumber *number = [Info_ objectForKey:@"WallpaperAlpha"])
-                [WallpaperImage_ setAlpha:[number floatValue]];
-            [indirect addSubview:WallpaperImage_];
+        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_];
+            }
         }
 
         }
 
-        NSString *html = [theme stringByAppendingPathComponent:@"Wallpaper.html"];
-        if ([Manager_ fileExistsAtPath:html]) {
+        if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Wallpaper.html"], themes)) {
             CGRect bounds = [indirect bounds];
 
             CGRect bounds = [indirect bounds];
 
-            UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
+            UIWebDocumentView *view([[[$UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
             [view setAutoresizes:true];
 
             WallpaperPage_ = [view retain];
             [view setAutoresizes:true];
 
             WallpaperPage_ = [view retain];
-            WallpaperURL_ = [[NSURL fileURLWithPath:html] retain];
+            WallpaperURL_ = [[NSURL fileURLWithPath:path] retain];
 
             [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
 
 
             [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
 
@@ -870,13 +1260,13 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
         }
     }
 
         }
     }
 
-    for (size_t i(0), e([themes_ count]); i != e; ++i) {
-        NSString *theme = [themes_ objectAtIndex:(e - i - 1)];
+    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];
 
         NSString *html = [theme stringByAppendingPathComponent:@"Widget.html"];
         if ([Manager_ fileExistsAtPath:html]) {
             CGRect bounds = [indirect bounds];
 
-            UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
+            UIWebDocumentView *view([[[$UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
             [view setAutoresizes:true];
 
             NSURL *url = [NSURL fileURLWithPath:html];
             [view setAutoresizes:true];
 
             NSURL *url = [NSURL fileURLWithPath:html];
@@ -891,10 +1281,9 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
         }
     }
 
         }
     }
 
-    [content addSubview:layer];
-
     return self;
 }
     return self;
 }
+// }}}
 
 MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage *image) {
     NSString *path = $getTheme$([NSArray arrayWithObject:@"LockBackground.html"]);
 
 MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage *image) {
     NSString *path = $getTheme$([NSArray arrayWithObject:@"LockBackground.html"]);
@@ -908,7 +1297,7 @@ MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage
     if (path != nil) {
         CGRect bounds = [self bounds];
 
     if (path != nil) {
         CGRect bounds = [self bounds];
 
-        UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
+        UIWebDocumentView *view([[[$UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
         [view setAutoresizes:true];
 
         if (WallpaperPage_ != nil)
         [view setAutoresizes:true];
 
         if (WallpaperPage_ != nil)
@@ -925,9 +1314,23 @@ MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage
         [view setBackgroundColor:[UIColor clearColor]];
 
         [self insertSubview:view aboveSubview:_backgroundView];
         [view setBackgroundColor:[UIColor clearColor]];
 
         [self insertSubview:view aboveSubview:_backgroundView];
+
+        if ($objc_setAssociatedObject != NULL)
+            $objc_setAssociatedObject(self, @selector(wb$widgetView), view, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     }
 }
 
     }
 }
 
+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" CGColorRef CGGStateGetSystemColor(void *);
 extern "C" CGColorRef CGGStateGetFillColor(void *);
 extern "C" CGColorRef CGGStateGetStrokeColor(void *);
@@ -962,7 +1365,7 @@ extern "C" NSString *UIStyleStringFromColor(CGColorRef);*/
 
 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"]) {
         BOOL &_mode(MSHookIvar<BOOL>(view_, "_mode"));;
 
     if (NSString *custom = [Info_ objectForKey:@"TimeStyle"]) {
         BOOL &_mode(MSHookIvar<BOOL>(view_, "_mode"));;
 
@@ -1009,7 +1412,7 @@ WBDelegate(time_)
 
 WBDelegate(badge_)
 
 
 WBDelegate(badge_)
 
-- (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:@"BadgeStyle"]) {
         [badge_ drawAtPoint:point withStyle:[NSString stringWithFormat:@""
             "font-family: Helvetica; "
     if (NSString *custom = [Info_ objectForKey:@"BadgeStyle"]) {
         [badge_ drawAtPoint:point withStyle:[NSString stringWithFormat:@""
             "font-family: Helvetica; "
@@ -1027,11 +1430,40 @@ WBDelegate(badge_)
 @end
 /* }}} */
 
 @end
 /* }}} */
 
-MSHook(void, SBIcon$setAlpha$, SBIcon *self, SEL sel, float alpha) {
+// 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];
     if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
         alpha = [number floatValue];
-    return _SBIcon$setAlpha$(self, sel, alpha);
+    return MSOldCall(alpha);
 }
 }
+// }}}
 
 MSHook(id, SBIconBadge$initWithBadge$, SBIconBadge *self, SEL sel, NSString *badge) {
     if ((self = _SBIconBadge$initWithBadge$(self, sel, badge)) != nil) {
 
 MSHook(id, SBIconBadge$initWithBadge$, SBIconBadge *self, SEL sel, NSString *badge) {
     if ((self = _SBIconBadge$initWithBadge$(self, sel, badge)) != nil) {
@@ -1101,6 +1533,7 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel,
 @interface UIView (WinterBoard)
 - (bool) wb$isWBImageView;
 - (void) wb$logHierarchy;
 @interface UIView (WinterBoard)
 - (bool) wb$isWBImageView;
 - (void) wb$logHierarchy;
+- (void) wb$setBackgroundColor:(UIColor *)color;
 @end
 
 @implementation UIView (WinterBoard)
 @end
 
 @implementation UIView (WinterBoard)
@@ -1113,6 +1546,12 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel,
     WBLogHierarchy(self);
 }
 
     WBLogHierarchy(self);
 }
 
+- (void) wb$setBackgroundColor:(UIColor *)color {
+    [self setBackgroundColor:color];
+    for (UIView *child in [self subviews])
+        [child wb$setBackgroundColor:color];
+}
+
 @end
 
 @interface WBImageView : UIImageView {
 @end
 
 @interface WBImageView : UIImageView {
@@ -1144,39 +1583,70 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel,
 
 @end
 
 
 @end
 
-MSHook(void, SBIconList$setFrame$, SBIconList *self, SEL sel, CGRect frame) {
+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];
     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);
 }
 
     _SBIconList$setFrame$(self, sel, frame);
 }
 
-MSHook(void, SBIconController$noteNumberOfIconListsChanged, SBIconController *self, SEL sel) {
-    SBIconModel *&_iconModel(MSHookIvar<SBIconModel *>(self, "_iconModel"));
-    NSArray *lists([_iconModel iconLists]);
+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)
     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];
-            }
+        $addPerPageView$(i, [lists objectAtIndex:i]);
+}
 
 
-            UIImage *image([UIImage imageWithContentsOfFile:path]);
+MSInstanceMessageHook0(void, SBIconController, updateNumberOfRootIconLists) {
+    NSArray *&_rootIconLists(MSHookIvar<NSArray *>(self, "_rootIconLists"));
+    $addPerPageViews$(_rootIconLists);
+    return MSOldCall();
+}
 
 
-            CGRect frame([view frame]);
-            frame.size = [image size];
-            [view setFrame:frame];
+MSInstanceMessageHook0(void, SBIconContentView, layoutSubviews) {
+    MSOldCall();
 
 
-            [view setImage:image];
-            [view wb$updateFrame];
-        }
+    if (SBIconController *controller = [$SBIconController sharedInstance]) {
+        UIView *&_dockContainerView(MSHookIvar<UIView *>(controller, "_dockContainerView"));
+        if (&_dockContainerView != NULL)
+            [[_dockContainerView superview] bringSubviewToFront:_dockContainerView];
+    }
+}
 
 
+MSHook(void, SBIconController$noteNumberOfIconListsChanged, SBIconController *self, SEL sel) {
+    SBIconModel *&_iconModel(MSHookIvar<SBIconModel *>(self, "_iconModel"));
+    $addPerPageViews$([_iconModel iconLists]);
     return _SBIconController$noteNumberOfIconListsChanged(self, sel);
 }
 
     return _SBIconController$noteNumberOfIconListsChanged(self, sel);
 }
 
@@ -1188,15 +1658,41 @@ MSHook(id, SBIconLabel$initWithSize$label$, SBIconLabel *self, SEL sel, CGSize s
 }
 
 MSHook(void, SBIconLabel$setInDock$, SBIconLabel *self, SEL sel, BOOL docked) {
 }
 
 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;
     id &_label(MSHookIvar<id>(self, "_label"));
     if (![Info_ wb$boolForKey:@"UndockedIconLabels"])
         docked = true;
+
     if (_label != nil && [_label respondsToSelector:@selector(setInDock:)])
         [_label setInDock:docked];
     if (_label != nil && [_label respondsToSelector:@selector(setInDock:)])
         [_label setInDock:docked];
-    return _SBIconLabel$setInDock$(self, sel, docked);
+
+    _SBIconLabel$setInDock$(self, sel, docked);
+    [self setNeedsDisplay];
+}
+
+MSHook(BOOL, SBDockIconListView$shouldShowNewDock, id self, SEL sel) {
+    return SummerBoard_ && Docked_ ? NO : _SBDockIconListView$shouldShowNewDock(self, sel);
 }
 
 }
 
-MSHook(NSString *, NSBundle$localizedStringForKey$value$table$, NSBundle *self, SEL sel, NSString *key, NSString *value, NSString *table) {
+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];
     NSString *identifier = [self bundleIdentifier];
     NSLocale *locale = [NSLocale currentLocale];
     NSString *language = [locale objectForKey:NSLocaleLanguageCode];
@@ -1211,29 +1707,30 @@ MSHook(NSString *, NSBundle$localizedStringForKey$value$table$, NSBundle *self,
                 return value;
     } else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings",
         language, file
                 return value;
     } else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings",
         language, file
-    ], self, false)) {
+    ], 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];
         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);
+    return MSOldCall(key, value, table);
 }
 }
+// }}}
+// %hook -[WebCoreFrameBridge renderedSizeOfNode:constrainedToWidth:] {{{
+MSClassHook(WebCoreFrameBridge)
 
 
-@class WebCoreFrameBridge;
-MSHook(CGSize, WebCoreFrameBridge$renderedSizeOfNode$constrainedToWidth$, WebCoreFrameBridge *self, SEL sel, id node, float width) {
+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 _WebCoreFrameBridge$renderedSizeOfNode$constrainedToWidth$(self, sel, node, width);
+    return MSOldCall(node, width);
 }
 }
+// }}}
 
 
-MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) {
-    CGRect bounds = [self bounds];
-
+MSInstanceMessage1(void, SBIconLabel, drawRect, CGRect, rect) {
     static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL);
 
     int docked;
     static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL);
 
     int docked;
@@ -1256,69 +1753,123 @@ MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) {
     else if (docked)
         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; "];
 
-    bool ellipsis(false);
-    float max = 75, width;
-  width:
-    width = [(ellipsis ? [label stringByAppendingString:@"..."] : label) sizeWithStyle:style forWidth:320].width;
+    NSString *custom([Info_ objectForKey:(docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle")]);
 
 
-    if (width > max) {
-        size_t length([label length]);
-        float spacing((width - max) / (length - 1));
+    $drawLabel$(label, [self bounds], style, custom);
+}
 
 
-        if (spacing > 1.25) {
-            ellipsis = true;
-            label = [label substringToIndex:(length - 1)];
-            goto width;
-        }
+MSInstanceMessage0(CGImageRef, SBIconLabel, buildLabelImage) {
+    bool docked((MSHookIvar<unsigned>(self, "_inDock") & 0x2) != 0);
 
 
-        style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", spacing]];
-    }
+    WBStringDrawingState labelState = {NULL, 0, @""
+    , docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle"};
 
 
-    if (ellipsis)
-        label = [label stringByAppendingString:@"..."];
+    stringDrawingState_ = &labelState;
 
 
-    if (NSString *custom = [Info_ objectForKey:(docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle")])
-        style = [style stringByAppendingString:custom];
+    //NSLog(@"XXX: +");
+    CGImageRef image(MSOldCall());
+    //NSLog(@"XXX: -");
 
 
-    CGSize size = [label sizeWithStyle:style forWidth:bounds.size.width];
-    [label drawAtPoint:CGPointMake((bounds.size.width - size.width) / 2, 0) withStyle:style];
+    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;
 }
 
 }
 
-MSHook(void, CKMessageCell$addBalloonView$, id self, SEL sel, CKBalloonView *balloon) {
-    _CKMessageCell$addBalloonView$(self, sel, balloon);
+// 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]];
 }
 
     [balloon setBackgroundColor:[UIColor clearColor]];
 }
 
-MSHook(id, CKMessageCell$initWithStyle$reuseIdentifier$, id self, SEL sel, int style, NSString *reuse) {
-    if ((self = _CKMessageCell$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) {
+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;
 }
 
         [[self contentView] setBackgroundColor:[UIColor clearColor]];
     } return self;
 }
 
-MSHook(id, CKTimestampView$initWithStyle$reuseIdentifier$, id self, SEL sel, int style, NSString *reuse) {
-    if ((self = _CKTimestampView$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) {
+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;
 }
 
         UILabel *&_label(MSHookIvar<UILabel *>(self, "_label"));
         [_label setBackgroundColor:[UIColor clearColor]];
     } return self;
 }
 
-MSHook(void, CKTranscriptTableView$setSeparatorStyle$, id self, SEL sel, int style) {
-    _CKTranscriptTableView$setSeparatorStyle$(self, sel, UITableViewCellSeparatorStyleNone);
+MSInstanceMessageHook1(void, CKTranscriptTableView, setSeparatorStyle, int, style) {
+    MSOldCall(UITableViewCellSeparatorStyleNone);
 }
 
 }
 
-MSHook(id, CKTranscriptTableView$initWithFrame$style$, id self, SEL sel, CGRect frame, int style) {
-    _trace();
-    if ((self = _CKTranscriptTableView$initWithFrame$style$(self, sel, frame, style)) != nil) {
+MSInstanceMessageHook2(id, CKTranscriptTableView, initWithFrame,style, CGRect, frame, int, style) {
+    if ((self = MSOldCall(frame, style)) != nil) {
         [self setSeparatorStyle:UITableViewCellSeparatorStyleNone];
     } return self;
 }
 
         [self setSeparatorStyle:UITableViewCellSeparatorStyleNone];
     } return self;
 }
 
-MSHook(void, TranscriptController$loadView, mSMSMessageTranscriptController *self, SEL sel) {
-    _TranscriptController$loadView(self, sel);
+MSInstanceMessageHook0(void, CKTranscriptController, loadView) {
+    MSOldCall();
 
 
-    if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil]))
-        if (UIImage *image = [[UIImage alloc] initWithContentsOfFile:path]) {
-            [image autorelease];
+    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 *&_transcriptTable(MSHookIvar<UIView *>(self, "_transcriptTable"));
             UIView *&_transcriptLayer(MSHookIvar<UIView *>(self, "_transcriptLayer"));
@@ -1341,29 +1892,89 @@ MSHook(void, TranscriptController$loadView, mSMSMessageTranscriptController *sel
             }
         }
 }
             }
         }
 }
+// }}}
+
+MSInstanceMessage2(UIImageTableArtwork *, UIImageTableArtwork, 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;
+}
+
+MSInstanceMessage2(UIImage *, UIImageTableArtwork, imageNamed,device, NSString *, name, int, device) {
+    NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle)));
+    if (Debug_)
+        NSLog(@"WB:Debug:[UIImageTableArtwork[%@] imageNamed:\"%@\" device:%i]", bundle, name, device);
+    if (bundle == nil)
+        return MSOldCall(name, device);
+    UIImage *image = [UIImages_ objectForKey:name];
+    if (image != nil)
+        return reinterpret_cast<id>(image) == [NSNull null] ? MSOldCall(name, device) : 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;
+
+    image = MSOldCall(name, device);
+
+    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) {
 MSHook(UIImage *, _UIImageWithName, NSString *name) {
-    int id(_UISharedImageNameGetIdentifier(name));
     if (Debug_)
     if (Debug_)
-        NSLog(@"WB:Debug: _UIImageWithName(\"%@\": %d)", name, id);
+        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 (id == -1)
-        return _UIImageAtPath(name, _UIKitBundle());
+    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] ? _UISharedImageWithIdentifier(id) : image;
-        if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true)) {
-            image = [[UIImage alloc] initWithContentsOfFile:path cache:true];
-            if (image != nil)
-                [image autorelease];
-        }
+            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];
-        return image == nil ? _UISharedImageWithIdentifier(id) : image;
+        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;
     }
 }
     }
 }
-
+// }}}
+// %hook _UIImageWithNameInDomain() {{{
 MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
     NSString *key([NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]);
     UIImage *image([PathImages_ objectForKey:key]);
 MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
     NSString *key([NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]);
     UIImage *image([PathImages_ objectForKey:key]);
@@ -1371,15 +1982,14 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
         return reinterpret_cast<id>(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : image;
     if (Debug_)
         NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
         return reinterpret_cast<id>(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : 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 (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];
     return image == nil ? __UIImageWithNameInDomain(name, domain) : image;
 }
     [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
     return image == nil ? __UIImageWithNameInDomain(name, domain) : image;
 }
+// }}}
 
 
+// %hook GSFontCreateWithName() {{{
 MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits traits, float size) {
     if (Debug_)
         NSLog(@"WB:Debug: GSFontCreateWithName(\"%s\", %f)", name, size);
 MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits traits, float size) {
     if (Debug_)
         NSLog(@"WB:Debug: GSFontCreateWithName(\"%s\", %f)", name, size);
@@ -1389,28 +1999,24 @@ MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits t
     //    size *= [scale floatValue];
     return _GSFontCreateWithName(name, traits, size);
 }
     //    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"
 
-bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long a0, char *a1, bool &a2);
-
-MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a2) {
-    if (Debug_)
-        NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %p, %u)", a0, a1, 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];
-            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;
                 }
             }
         }
                 }
             }
         }
@@ -1418,6 +2024,16 @@ MSHook(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,
@@ -1442,8 +2058,48 @@ static void ChangeWallpaper(
 
 }
 
 
 }
 
+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;
+}
+
+MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) {
+    if (NSString *themed = $getTheme$($useScale$([NSArray arrayWithObject:@"SystemAppExited.png"])))
+        path = themed;
+    _BKSDisplayServicesSetSystemAppExitedImagePath(path);
+}
+
 #define WBRename(name, sel, imp) \
 #define WBRename(name, sel, imp) \
-    _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## 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) {
 
 template <typename Type_>
 static void nlset(Type_ &function, struct nlist *nl, size_t index) {
@@ -1459,82 +2115,168 @@ static void dlset(Type_ &function, const char *name) {
     function = reinterpret_cast<Type_>(dlsym(RTLD_DEFAULT, name));
 }
 
     function = reinterpret_cast<Type_>(dlsym(RTLD_DEFAULT, name));
 }
 
-extern "C" void WBInitialize() {
+// %hook CGImageReadCreateWithFile() {{{
+MSHook(void *, CGImageReadCreateWithFile, NSString *path, int flag) {
+    if (Debug_)
+        NSLog(@"WB:Debug: CGImageReadCreateWithFile(%@, %d)", path, flag);
     NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
     NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+    void *value(_CGImageReadCreateWithFile([path wb$themedPath], flag));
+    [pool release];
+    return value;
+}
 
 
-    NSString *identifier([[NSBundle mainBundle] bundleIdentifier]);
+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;
+}
 
 
-    NSLog(@"WB:Notice: WinterBoard");
+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;
+}
+// }}}
 
 
-    dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics");
+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];
+}
 
 
-    struct nlist nl[8];
-
-    memset(nl, 0, sizeof(nl));
-    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 *) "__UISharedImageNameGetIdentifier";
-    nl[6].n_un.n_name = (char *) "__UISharedImageWithIdentifier";
-    nlist(UIKit, nl);
-
-    nlset(_UIApplicationImageWithName, nl, 0);
-    nlset(_UIImageAtPath, nl, 1);
-    nlset(_UIImageRefAtPath, nl, 2);
-    nlset(_UIImageWithNameInDomain, nl, 3);
-    nlset(_UIKitBundle, nl, 4);
-    nlset(_UISharedImageNameGetIdentifier, nl, 5);
-    nlset(_UISharedImageWithIdentifier, nl, 6);
-
-    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);
-        nlset(_Z24GetFileNameForThisActionmPcRb, nl, 0);
-        MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb);
+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(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$);
     }
 
     }
 
-    $NSBundle = objc_getClass("NSBundle");
+    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$);
 
 
-    _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$);
+    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$);
 
 
-    $UIImage = objc_getClass("UIImage");
-    $UINavigationBar = objc_getClass("UINavigationBar");
-    $UIToolbar = objc_getClass("UIToolbar");
+    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;
+}*/
 
 
-    _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage);
+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"));
 
 
-    //WBRename("UINavigationBar", @selector(initWithCoder:), (IMP) &UINavigationBar$initWithCoder$);
-    //WBRename("UINavigationBarBackground", @selector(initWithFrame:withBarStyle:withTintColor:), (IMP) &UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$);
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
 
 
-    _UINavigationBar$setBarStyle$ = MSHookMessage($UINavigationBar, @selector(setBarStyle:), &$UINavigationBar$setBarStyle$);
-    _UIToolbar$setBarStyle$ = MSHookMessage($UIToolbar, @selector(setBarStyle:), &$UIToolbar$setBarStyle$);
+    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];
-    Strings_ = [[NSMutableDictionary alloc] initWithCapacity:0];
-    Bundles_ = [[NSMutableDictionary alloc] initWithCapacity:2];
-    Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128];
+    Themes_ = [[NSMutableArray alloc] initWithCapacity:8];
 
 
-    themes_ = [[NSMutableArray alloc] initWithCapacity:8];
+    dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics");
 
 
+    // 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];
     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 *value = [settings objectForKey:@"Debug"])
             Debug_ = [value boolValue];
         if (NSNumber *value = [settings objectForKey:@"Debug"])
             Debug_ = [value boolValue];
+        if (NSNumber *value = [settings objectForKey:@"RecordUI"])
+            UIDebug_ = [value boolValue];
 
         NSArray *themes([settings objectForKey:@"Themes"]);
         if (themes == nil)
 
         NSArray *themes([settings objectForKey:@"Themes"]);
         if (themes == nil)
@@ -1560,7 +2302,7 @@ extern "C" void WBInitialize() {
                     if (theme == nil) { \
                         NSString *path = [NSString stringWithFormat:format]; \
                         if ([Manager_ fileExistsAtPath:path]) { \
                     if (theme == nil) { \
                         NSString *path = [NSString stringWithFormat:format]; \
                         if ([Manager_ fileExistsAtPath:path]) { \
-                            [themes_ addObject:path]; \
+                            [Themes_ addObject:path]; \
                             continue; \
                         } \
                     }
                             continue; \
                         } \
                     }
@@ -1571,44 +2313,77 @@ extern "C" void WBInitialize() {
 
             }
     }
 
             }
     }
-
+    // }}}
+    // Merge Info.plist {{{
     Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
 
     Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
 
-    for (NSString *theme in themes_)
+    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];
         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];
+    // }}}
 
 
-    bool sms($getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil]) != nil);
-
-    SpringBoard_ = [identifier isEqualToString:@"com.apple.springboard"];
-
-    if ([NSBundle bundleWithIdentifier:@"com.apple.chatkit"])
-        if (sms) {
-            $CKMessageCell = objc_getClass("CKMessageCell");
-            _CKMessageCell$addBalloonView$ = MSHookMessage($CKMessageCell, @selector(addBalloonView:), &$CKMessageCell$addBalloonView$);
-            _CKMessageCell$initWithStyle$reuseIdentifier$ = MSHookMessage($CKMessageCell, @selector(initWithStyle:reuseIdentifier:), &$CKMessageCell$initWithStyle$reuseIdentifier$);
+    // 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);
 
 
-            $CKTranscriptTableView = objc_getClass("CKTranscriptTableView");
-            _CKTranscriptTableView$setSeparatorStyle$ = MSHookMessage($CKTranscriptTableView, @selector(setSeparatorStyle:), &$CKTranscriptTableView$setSeparatorStyle$);
-            _CKTranscriptTableView$initWithFrame$style$ = MSHookMessage($CKTranscriptTableView, @selector(initWithFrame:style:), &$CKTranscriptTableView$initWithFrame$style$);
+        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) = NULL;
+        if (kCFCoreFoundationVersionNumber > 700) // XXX: iOS 6.x
+            CGImageReadCreateWithFile = NULL;
+        else {
+            msset(CGImageReadCreateWithFile, image, "_CGImageReadCreateWithFile");
+            MSHookFunction(CGImageReadCreateWithFile, MSHake(CGImageReadCreateWithFile));
+        }
 
 
-            $CKTimestampView = objc_getClass("CKTimestampView");
-            _CKTimestampView$initWithStyle$reuseIdentifier$ = MSHookMessage($CKTimestampView, @selector(initWithStyle:reuseIdentifier:), &$CKTimestampView$initWithStyle$reuseIdentifier$);
+        if (CGImageReadCreateWithFile == NULL) {
+            void *(*CGImageSourceCreateWithFile)(NSString *, NSDictionary *);
+            msset(CGImageSourceCreateWithFile, image, "_CGImageSourceCreateWithFile");
+            MSHookFunction(CGImageSourceCreateWithFile, MSHake(CGImageSourceCreateWithFile));
 
 
-            $CKTranscriptController = objc_getClass("CKTranscriptController");
-            _TranscriptController$loadView = MSHookMessage($CKTranscriptController, @selector(loadView), &$TranscriptController$loadView);
+            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 ([identifier isEqualToString:@"com.apple.MobileSMS"]) {
-        if (sms) {
-            if (_TranscriptController$loadView == NULL) {
-                Class mSMSMessageTranscriptController = objc_getClass("mSMSMessageTranscriptController");
-                _TranscriptController$loadView = MSHookMessage(mSMSMessageTranscriptController, @selector(loadView), &$TranscriptController$loadView);
-            }
-        }
-    } else if (SpringBoard_) {
         CFNotificationCenterAddObserver(
             CFNotificationCenterGetDarwinNotifyCenter(),
             NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0
         CFNotificationCenterAddObserver(
             CFNotificationCenterGetDarwinNotifyCenter(),
             NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0
@@ -1623,92 +2398,50 @@ extern "C" void WBInitialize() {
             $MPVideoView = objc_getClass("MPVideoView");
         }
 
             $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");
-        $SBIcon = objc_getClass("SBIcon");
-        $SBIconBadge = objc_getClass("SBIconBadge");
-        $SBIconController = objc_getClass("SBIconController");
-        $SBIconLabel = objc_getClass("SBIconLabel");
-        $SBIconList = objc_getClass("SBIconList");
-        $SBIconModel = objc_getClass("SBIconModel");
-        //$SBImageCache = objc_getClass("SBImageCache");
-        $SBSearchView = objc_getClass("SBSearchView");
-        $SBSearchTableViewCell = objc_getClass("SBSearchTableViewCell");
-        $SBStatusBarContentsView = objc_getClass("SBStatusBarContentsView");
-        $SBStatusBarController = objc_getClass("SBStatusBarController");
-        $SBStatusBarOperatorNameView = objc_getClass("SBStatusBarOperatorNameView");
-        $SBStatusBarTimeView = objc_getClass("SBStatusBarTimeView");
-        $SBUIController = objc_getClass("SBUIController");
-        $SBWidgetApplicationIcon = objc_getClass("SBWidgetApplicationIcon");
-
-        WBRename(WebCoreFrameBridge, renderedSizeOfNode:constrainedToWidth:, renderedSizeOfNode$constrainedToWidth$);
-
-        if (SummerBoard_) {
-            WBRename(SBApplication, pathForIcon, pathForIcon);
-            WBRename(SBApplicationIcon, icon, icon);
-            WBRename(SBApplicationIcon, generateIconImage:, generateIconImage$);
+        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(UIImageTableArtwork, initWithName:inBundle:, initWithName$inBundle$);
+            WBRename(UIImageTableArtwork, imageNamed:device:, imageNamed$device$);
+        } 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);
         }
         }
-
-        WBRename(SBBookmarkIcon, icon, icon);
-        WBRename(SBButtonBar, didMoveToSuperview, didMoveToSuperview);
-        WBRename(SBCalendarIconContentsView, drawRect:, drawRect$);
-        WBRename(SBIcon, setAlpha:, setAlpha$);
-        WBRename(SBIconBadge, initWithBadge:, initWithBadge$);
-        WBRename(SBIconController, noteNumberOfIconListsChanged, noteNumberOfIconListsChanged);
-        WBRename(SBUIController, init, init);
-        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, 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$);
-        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"];
-
-        Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64];
     }
     }
+    // }}}
 
 
-    Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain];
-    Papered_ = $getTheme$(Wallpapers_) != nil;
-
-    if ([Info_ objectForKey:@"UndockedIconLabels"] == nil)
-        [Info_ setObject:[NSNumber numberWithBool:(
-            !Papered_ ||
-            [Info_ objectForKey:@"DockedIconLabelStyle"] != nil ||
-            [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil
-        )] forKey:@"UndockedIconLabels"];
+    //MSHookFunction(reinterpret_cast<int (*)(const char *, int, mode_t)>(&open), MSHake(open));
 
 
-    if (Debug_)
-        NSLog(@"WB:Debug:Info = %@", [Info_ description]);
+    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];
 }