]> git.saurik.com Git - cydia.git/blobdiff - Cydia.mm
URL Authentication.
[cydia.git] / Cydia.mm
index 8b38b7ff6dd3c9623685b8c3620dd8c86924d8e3..ddfe6aa43eba3cf7b41f700bf5dc9eca391cd641 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
 */
 
 /* #include Directives {{{ */
+#import "UICaboodle.h"
+
 #include <objc/objc.h>
 #include <objc/runtime.h>
 
 #include <CoreGraphics/CoreGraphics.h>
 #include <GraphicsServices/GraphicsServices.h>
 #include <Foundation/Foundation.h>
-#include <UIKit/UIKit.h>
-#include <WebCore/DOMHTML.h>
 
-#import "BrowserView.h"
-#import "ResetView.h"
-#import "UICaboodle.h"
+#import <QuartzCore/CALayer.h>
+
+#import <UIKit/UIKit.h>
+
+// XXX: remove
+#import <MessageUI/MailComposeController.h>
+
+#import <WebCore/WebScriptObject.h>
+//#include <WebCore/DOMHTML.h>
 
 #include <WebKit/WebFrame.h>
+#include <WebKit/WebPolicyDelegate.h>
 #include <WebKit/WebView.h>
 
+#import <WebKit/WebView-WebPrivate.h>
+
 #include <sstream>
 #include <string>
 
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
+#include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/sha1.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/sptr.h>
+#include <apt-pkg/strutl.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/sysctl.h>
+
 #include <notify.h>
+#include <dlfcn.h>
 
 extern "C" {
 #include <mach-o/nlist.h>
@@ -83,56 +99,278 @@ extern "C" {
 
 #include <errno.h>
 #include <pcre.h>
+
+#import "BrowserView.h"
+#import "ResetView.h"
+/* }}} */
+
+//#define _finline __attribute__((force_inline))
+#define _finline inline
+
+struct timeval _ltv;
+bool _itv;
+
+#define _limit(count) do { \
+    static size_t _count(0); \
+    if (++_count == count) \
+        exit(0); \
+} while (false)
+
+static uint64_t profile_;
+
+#define _timestamp ({ \
+    struct timeval tv; \
+    gettimeofday(&tv, NULL); \
+    tv.tv_sec * 1000000 + tv.tv_usec; \
+})
+
+/* Objective-C Handle<> {{{ */
+template <typename Type_>
+class _H {
+    typedef _H<Type_> This_;
+
+  private:
+    Type_ *value_;
+
+    _finline void Retain_() {
+        if (value_ != nil)
+            [value_ retain];
+    }
+
+    _finline void Clear_() {
+        if (value_ != nil)
+            [value_ release];
+    }
+
+  public:
+    _finline _H(Type_ *value = NULL, bool mended = false) :
+        value_(value)
+    {
+        if (!mended)
+            Retain_();
+    }
+
+    _finline ~_H() {
+        Clear_();
+    }
+
+    _finline This_ &operator =(Type_ *value) {
+        if (value_ != value) {
+            Clear_();
+            value_ = value;
+            Retain_();
+        } return this;
+    }
+};
 /* }}} */
 
+#define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
+
+void NSLogPoint(const char *fix, const CGPoint &point) {
+    NSLog(@"%s(%g,%g)", fix, point.x, point.y);
+}
+
+void NSLogRect(const char *fix, const CGRect &rect) {
+    NSLog(@"%s(%g,%g)+(%g,%g)", fix, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+}
+
+static const NSStringCompareOptions CompareOptions_ = NSCaseInsensitiveSearch | NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSForcedOrderingSearch;
+
 /* iPhoneOS 2.0 Compatibility {{{ */
 #ifdef __OBJC2__
-@interface UICGColor : NSObject {
+@interface UITextView (iPhoneOS)
+- (void) setTextSize:(float)size;
+@end
+
+@implementation UITextView (iPhoneOS)
+
+- (void) setTextSize:(float)size {
+    [self setFont:[[self font] fontWithSize:size]];
 }
 
-- (id) initWithCGColor:(CGColorRef)color;
+@end
+#endif
+/* }}} */
+
+extern NSString * const kCAFilterNearest;
+
+/* Information Dictionaries {{{ */
+@interface NSMutableArray (Cydia)
+- (void) addInfoDictionary:(NSDictionary *)info;
 @end
 
-@interface UIFont {
+@implementation NSMutableArray (Cydia)
+
+- (void) addInfoDictionary:(NSDictionary *)info {
+    [self addObject:info];
 }
 
-- (UIFont *) fontWithSize:(CGFloat)size;
 @end
 
-@interface NSObject (iPhoneOS)
-- (CGColorRef) cgColor;
-- (CGColorRef) CGColor;
-- (void) set;
+@interface NSMutableDictionary (Cydia)
+- (void) addInfoDictionary:(NSDictionary *)info;
 @end
 
-@implementation NSObject (iPhoneOS)
+@implementation NSMutableDictionary (Cydia)
 
-- (CGColorRef) cgColor {
-    return [self CGColor];
+- (void) addInfoDictionary:(NSDictionary *)info {
+    NSString *bundle = [info objectForKey:@"CFBundleIdentifier"];
+    [self setObject:info forKey:bundle];
 }
 
-- (CGColorRef) CGColor {
-    return (CGColorRef) self;
+@end
+/* }}} */
+/* Pop Transitions {{{ */
+@interface PopTransitionView : UITransitionView {
 }
 
-- (void) set {
-    [[[[objc_getClass("UICGColor") alloc] initWithCGColor:[self CGColor]] autorelease] set];
+@end
+
+@implementation PopTransitionView
+
+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
+    if (from != nil && to == nil)
+        [self removeFromSuperview];
 }
 
 @end
 
-@interface UITextView (iPhoneOS)
-- (void) setTextSize:(float)size;
+@interface UIView (PopUpView)
+- (void) popFromSuperviewAnimated:(BOOL)animated;
+- (void) popSubview:(UIView *)view;
 @end
 
-@implementation UITextView (iPhoneOS)
+@implementation UIView (PopUpView)
 
-- (void) setTextSize:(float)size {
-    [self setFont:[[self font] fontWithSize:size]];
+- (void) popFromSuperviewAnimated:(BOOL)animated {
+    [[self superview] transition:(animated ? UITransitionPushFromTop : UITransitionNone) toView:nil];
+}
+
+- (void) popSubview:(UIView *)view {
+    UITransitionView *transition([[[PopTransitionView alloc] initWithFrame:[self bounds]] autorelease]);
+    [transition setDelegate:transition];
+    [self addSubview:transition];
+
+    UIView *blank = [[[UIView alloc] initWithFrame:[transition bounds]] autorelease];
+    [transition transition:UITransitionNone toView:blank];
+    [transition transition:UITransitionPushFromBottom toView:view];
+}
+
+@end
+/* }}} */
+
+#define lprintf(args...) fprintf(stderr, args)
+
+#define ForRelease 0
+#define ForSaurik 1 && !ForRelease
+#define RecycleWebViews 0
+#define AlwaysReload 0 && !ForRelease
+
+/* Radix Sort {{{ */
+@interface NSMutableArray (Radix)
+- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object;
+@end
+
+@implementation NSMutableArray (Radix)
+
+- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object {
+    NSInvocation *invocation([NSInvocation invocationWithMethodSignature:[NSMethodSignature signatureWithObjCTypes:"L12@0:4@8"]]);
+    [invocation setSelector:selector];
+    [invocation setArgument:&object atIndex:2];
+
+    size_t count([self count]);
+
+    struct RadixItem {
+        size_t index;
+        uint32_t key;
+    } *swap(new RadixItem[count * 2]), *lhs(swap), *rhs(swap + count);
+
+    for (size_t i(0); i != count; ++i) {
+        RadixItem &item(lhs[i]);
+        item.index = i;
+
+        id object([self objectAtIndex:i]);
+        [invocation setTarget:object];
+
+        [invocation invoke];
+        [invocation getReturnValue:&item.key];
+    }
+
+    static const size_t width = 32;
+    static const size_t bits = 11;
+    static const size_t slots = 1 << bits;
+    static const size_t passes = (width + (bits - 1)) / bits;
+
+    size_t *hist(new size_t[slots]);
+
+    for (size_t pass(0); pass != passes; ++pass) {
+        memset(hist, 0, sizeof(size_t) * slots);
+
+        for (size_t i(0); i != count; ++i) {
+            uint32_t key(lhs[i].key);
+            key >>= pass * bits;
+            key &= _not(uint32_t) >> width - bits;
+            ++hist[key];
+        }
+
+        size_t offset(0);
+        for (size_t i(0); i != slots; ++i) {
+            size_t local(offset);
+            offset += hist[i];
+            hist[i] = local;
+        }
+
+        for (size_t i(0); i != count; ++i) {
+            uint32_t key(lhs[i].key);
+            key >>= pass * bits;
+            key &= _not(uint32_t) >> width - bits;
+            rhs[hist[key]++] = lhs[i];
+        }
+
+        RadixItem *tmp(lhs);
+        lhs = rhs;
+        rhs = tmp;
+    }
+
+    delete [] hist;
+
+    NSMutableArray *values([NSMutableArray arrayWithCapacity:count]);
+    for (size_t i(0); i != count; ++i)
+        [values addObject:[self objectAtIndex:lhs[i].index]];
+    [self setArray:values];
+
+    delete [] swap;
+}
+
+@end
+/* }}} */
+
+/* Apple Bug Fixes {{{ */
+@implementation UIWebDocumentView (Cydia)
+
+- (void) _setScrollerOffset:(CGPoint)offset {
+    UIScroller *scroller([self _scroller]);
+
+    CGSize size([scroller contentSize]);
+    CGSize bounds([scroller bounds].size);
+
+    CGPoint max;
+    max.x = size.width - bounds.width;
+    max.y = size.height - bounds.height;
+
+    // wtf Apple?!
+    if (max.x < 0)
+        max.x = 0;
+    if (max.y < 0)
+        max.y = 0;
+
+    offset.x = offset.x < 0 ? 0 : offset.x > max.x ? max.x : offset.x;
+    offset.y = offset.y < 0 ? 0 : offset.y > max.y ? max.y : offset.y;
+
+    [scroller setOffset:offset];
 }
 
 @end
-#endif
 /* }}} */
 
 typedef enum {
@@ -157,10 +395,7 @@ typedef enum {
 @implementation NSString (Cydia)
 
 + (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length {
-    char data[length + 1];
-    memcpy(data, bytes, length);
-    data[length] = '\0';
-    return [NSString stringWithUTF8String:data];
+    return [[[NSString alloc] initWithBytes:bytes length:length encoding:NSUTF8StringEncoding] autorelease];
 }
 
 - (NSComparisonResult) compareByPath:(NSString *)other {
@@ -213,7 +448,7 @@ class Pcre {
         code_ = pcre_compile(regex, 0, &error, &offset, NULL);
 
         if (code_ == NULL) {
-            fprintf(stderr, "%d:%s\n", offset, error);
+            lprintf("%d:%s\n", offset, error);
             _assert(false);
         }
 
@@ -242,15 +477,13 @@ class Pcre {
 };
 /* }}} */
 /* Mime Addresses {{{ */
-Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
-
 @interface Address : NSObject {
     NSString *name_;
-    NSString *email_;
+    NSString *address_;
 }
 
 - (NSString *) name;
-- (NSString *) email;
+- (NSString *) address;
 
 + (Address *) addressWithString:(NSString *)string;
 - (Address *) initWithString:(NSString *)string;
@@ -260,8 +493,8 @@ Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
 
 - (void) dealloc {
     [name_ release];
-    if (email_ != nil)
-        [email_ release];
+    if (address_ != nil)
+        [address_ release];
     [super dealloc];
 }
 
@@ -269,30 +502,39 @@ Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
     return name_;
 }
 
-- (NSString *) email {
-    return email_;
+- (NSString *) address {
+    return address_;
 }
 
 + (Address *) addressWithString:(NSString *)string {
     return [[[Address alloc] initWithString:string] autorelease];
 }
 
++ (NSArray *) _attributeKeys {
+    return [NSArray arrayWithObjects:@"address", @"name", nil];
+}
+
+- (NSArray *) attributeKeys {
+    return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
 - (Address *) initWithString:(NSString *)string {
     if ((self = [super init]) != nil) {
         const char *data = [string UTF8String];
         size_t size = [string length];
 
-        if (email_r(data, size)) {
-            name_ = [email_r[1] retain];
-            email_ = [email_r[2] retain];
-        } else {
-            name_ = [[NSString alloc]
-                initWithBytes:data
-                length:size
-                encoding:kCFStringEncodingUTF8
-            ];
+        static Pcre address_r("^\"?(.*)\"? <([^>]*)>$");
 
-            email_ = nil;
+        if (address_r(data, size)) {
+            name_ = [address_r[1] retain];
+            address_ = [address_r[2] retain];
+        } else {
+            name_ = [string retain];
+            address_ = nil;
         }
     } return self;
 }
@@ -335,91 +577,49 @@ class CGColor {
         return color_;
     }
 };
-
-class GSFont {
-  private:
-    GSFontRef font_;
-
-  public:
-    ~GSFont() {
-        CFRelease(font_);
-    }
-};
 /* }}} */
-/* Right Alignment {{{ */
-@interface UIRightTextLabel : UITextLabel {
-    float       _savedRightEdgeX;
-    BOOL        _sizedtofit_flag;
-}
-
-- (void) setFrame:(CGRect)frame;
-- (void) setText:(NSString *)text;
-- (void) realignText;
-@end
-
-@implementation UIRightTextLabel
-
-- (void) setFrame:(CGRect)frame {
-    [super setFrame:frame];
-    if (_sizedtofit_flag == NO) {
-        _savedRightEdgeX = frame.origin.x;
-        [self realignText];
-    }
-}
 
-- (void) setText:(NSString *)text {
-    [super setText:text];
-    [self realignText];
-}
-
-- (void) realignText {
-    CGRect oldFrame = [self frame];
-
-    _sizedtofit_flag = YES;
-    [self sizeToFit]; // shrink down size so I can right align it
-
-    CGRect newFrame = [self frame];
-
-    oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width;
-    oldFrame.size.width = newFrame.size.width;
-    [super setFrame:oldFrame];
-    _sizedtofit_flag = NO;
-}
-
-@end
-/* }}} */
+extern "C" void UISetColor(CGColorRef color);
 
 /* Random Global Variables {{{ */
 static const int PulseInterval_ = 50000;
 static const int ButtonBarHeight_ = 48;
-static const float KeyboardTime_ = 0.4f;
-static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist";
+static const float KeyboardTime_ = 0.3f;
 
-#ifndef Cydia_
-#define Cydia_ ""
-#endif
+#define SpringBoard_ "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist"
+#define SandboxTemplate_ "/usr/share/sandbox/SandboxTemplate.sb"
 
+static CGColor Blue_;
 static CGColor Blueish_;
 static CGColor Black_;
-static CGColor Clear_;
-static CGColor Red_;
+static CGColor Off_;
 static CGColor White_;
+static CGColor Gray_;
 
+static NSString *App_;
 static NSString *Home_;
 static BOOL Sounds_Keyboard_;
 
 static BOOL Advanced_;
+#if !ForSaurik
 static BOOL Loaded_;
+#endif
 static BOOL Ignored_;
 
-const char *Firmware_ = NULL;
-const char *Machine_ = NULL;
-const char *SerialNumber_ = NULL;
+static UIFont *Font12_;
+static UIFont *Font12Bold_;
+static UIFont *Font14_;
+static UIFont *Font18Bold_;
+static UIFont *Font22Bold_;
+
+static const char *Machine_ = NULL;
+static const NSString *UniqueID_ = NULL;
 
 unsigned Major_;
 unsigned Minor_;
 unsigned BugFix_;
 
+CFLocaleRef Locale_;
 CGColorSpaceRef space_;
 
 #define FW_LEAST(major, minor, bugfix) \
@@ -430,23 +630,30 @@ CGColorSpaceRef space_;
 bool bootstrap_;
 bool reload_;
 
+static NSDictionary *SectionMap_;
 static NSMutableDictionary *Metadata_;
-static NSMutableDictionary *Packages_;
+static _transient NSMutableDictionary *Settings_;
+static _transient NSString *Role_;
+static _transient NSMutableDictionary *Packages_;
+static _transient NSMutableDictionary *Sections_;
+static _transient NSMutableDictionary *Sources_;
 static bool Changed_;
 static NSDate *now_;
 
+#if RecycleWebViews
+static NSMutableArray *Documents_;
+#endif
+
 NSString *GetLastUpdate() {
     NSDate *update = [Metadata_ objectForKey:@"LastUpdate"];
 
     if (update == nil)
         return @"Never or Unknown";
 
-    CFLocaleRef locale = CFLocaleCopyCurrent();
-    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
     CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
 
     CFRelease(formatter);
-    CFRelease(locale);
 
     return [(NSString *) formatted autorelease];
 }
@@ -457,6 +664,10 @@ inline float Interpolate(float begin, float end, float fraction) {
 }
 
 NSString *SizeString(double size) {
+    bool negative = size < 0;
+    if (negative)
+        size = -size;
+
     unsigned power = 0;
     while (size > 1024) {
         size /= 1024;
@@ -465,7 +676,7 @@ NSString *SizeString(double size) {
 
     static const char *powers_[] = {"B", "kB", "MB", "GB"};
 
-    return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
+    return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]];
 }
 
 NSString *StripVersion(NSString *version) {
@@ -475,41 +686,32 @@ NSString *StripVersion(NSString *version) {
     return version;
 }
 
-static const float TextViewOffset_ = 22;
-
-UITextView *GetTextView(NSString *value, float left, bool html) {
-    UITextView *text([[[UITextView alloc] initWithFrame:CGRectMake(left, 3, 310 - left, 1000)] autorelease]);
-    [text setEditable:NO];
-    [text setTextSize:16];
-    /*if (html)
-        [text setHTML:value];
-    else*/
-        [text setText:value];
-    [text setEnabled:NO];
-
-    [text setBackgroundColor:Clear_];
-
-    CGRect frame = [text frame];
-    [text setFrame:frame];
-    CGRect rect = [text visibleTextRect];
-    frame.size.height = rect.size.height;
-    [text setFrame:frame];
-
-    return text;
-}
-
 NSString *Simplify(NSString *title) {
     const char *data = [title UTF8String];
     size_t size = [title length];
 
-    Pcre title_r("^(.*?)( \\(.*\\))?$");
+    static Pcre square_r("^\\[(.*)\\]$");
+    if (square_r(data, size))
+        return Simplify(square_r[1]);
+
+    static Pcre paren_r("^\\((.*)\\)$");
+    if (paren_r(data, size))
+        return Simplify(paren_r[1]);
+
+    static Pcre title_r("^(.*?) \\(.*\\)$");
     if (title_r(data, size))
-        return title_r[1];
-    else
-        return title;
+        return Simplify(title_r[1]);
+
+    return title;
 }
 /* }}} */
 
+bool isSectionVisible(NSString *section) {
+    NSDictionary *metadata = [Sections_ objectForKey:section];
+    NSNumber *hidden = metadata == nil ? nil : [metadata objectForKey:@"Hidden"];
+    return hidden == nil || ![hidden boolValue];
+}
+
 /* Delegate Prototypes {{{ */
 @class Package;
 @class Source;
@@ -532,7 +734,9 @@ NSString *Simplify(NSString *title) {
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id;
 - (void) setProgressTitle:(NSString *)title;
 - (void) setProgressPercent:(float)percent;
+- (void) startProgress;
 - (void) addProgressOutput:(NSString *)output;
+- (bool) isCancelling:(size_t)received;
 @end
 
 @protocol ConfigurationDelegate
@@ -543,8 +747,15 @@ NSString *Simplify(NSString *title) {
 @protocol CydiaDelegate
 - (void) installPackage:(Package *)package;
 - (void) removePackage:(Package *)package;
-- (void) slideUp:(UIAlertSheet *)alert;
+- (void) slideUp:(UIActionSheet *)alert;
 - (void) distUpgrade;
+- (void) updateData;
+- (void) syncData;
+- (void) askForSettings;
+- (UIProgressHUD *) addProgressHUD;
+- (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag;
+- (RVPage *) pageForPackage:(NSString *)name;
+- (void) openMailToURL:(NSURL *)url;
 @end
 /* }}} */
 
@@ -573,6 +784,7 @@ class Status :
     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {
+        //NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);
         [delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]];
     }
 
@@ -586,8 +798,19 @@ class Status :
         )
             return;
 
+        std::string &error(item.Owner->ErrorText);
+        if (error.empty())
+            return;
+
+        NSString *description([NSString stringWithUTF8String:item.Description.c_str()]);
+        NSArray *fields([description componentsSeparatedByString:@" "]);
+        NSString *source([fields count] == 0 ? nil : [fields objectAtIndex:0]);
+
         [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
-            withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()], nil]
+            withObject:[NSArray arrayWithObjects:
+                [NSString stringWithUTF8String:error.c_str()],
+                source,
+            nil]
             waitUntilDone:YES
         ];
     }
@@ -601,10 +824,11 @@ class Status :
         );
 
         [delegate_ setProgressPercent:percent];
-        return value;
+        return [delegate_ isCancelling:CurrentBytes] ? false : value;
     }
 
     virtual void Start() {
+        [delegate_ startProgress];
     }
 
     virtual void Stop() {
@@ -663,6 +887,8 @@ class Progress :
     FILE *input_;
 }
 
++ (Database *) sharedInstance;
+
 - (void) _readCydia:(NSNumber *)fd;
 - (void) _readStatus:(NSNumber *)fd;
 - (void) _readOutput:(NSNumber *)fd;
@@ -671,13 +897,13 @@ class Progress :
 
 - (Package *) packageWithName:(NSString *)name;
 
-- (Database *) init;
 - (pkgCacheFile &) cache;
 - (pkgDepCache::Policy *) policy;
 - (pkgRecords *) records;
 - (pkgProblemResolver *) resolver;
 - (pkgAcquire &) fetcher;
 - (NSArray *) packages;
+- (NSArray *) sources;
 - (void) reloadData;
 
 - (void) configure;
@@ -706,23 +932,31 @@ class Progress :
 
     NSString *defaultIcon_;
 
+    NSDictionary *record_;
     BOOL trusted_;
 }
 
 - (Source *) initWithMetaIndex:(metaIndex *)index;
 
+- (NSComparisonResult) compareByNameAndType:(Source *)source;
+
+- (NSDictionary *) record;
 - (BOOL) trusted;
 
 - (NSString *) uri;
 - (NSString *) distribution;
 - (NSString *) type;
+- (NSString *) key;
+- (NSString *) host;
 
+- (NSString *) name;
 - (NSString *) description;
 - (NSString *) label;
 - (NSString *) origin;
 - (NSString *) version;
 
 - (NSString *) defaultIcon;
+
 @end
 
 @implementation Source
@@ -742,10 +976,24 @@ class Progress :
         [version_ release];
     if (defaultIcon_ != nil)
         [defaultIcon_ release];
+    if (record_ != nil)
+        [record_ release];
 
     [super dealloc];
 }
 
++ (NSArray *) _attributeKeys {
+    return [NSArray arrayWithObjects:@"description", @"distribution", @"host", @"key", @"label", @"name", @"origin", @"trusted", @"type", @"uri", @"version", nil];
+}
+
+- (NSArray *) attributeKeys {
+    return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
 - (Source *) initWithMetaIndex:(metaIndex *)index {
     if ((self = [super init]) != nil) {
         trusted_ = index->IsTrusted();
@@ -754,12 +1002,6 @@ class Progress :
         distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
         type_ = [[NSString stringWithUTF8String:index->GetType()] retain];
 
-        description_ = nil;
-        label_ = nil;
-        origin_ = nil;
-        version_ = nil;
-        defaultIcon_ = nil;
-
         debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
         if (dindex != NULL) {
             std::ifstream release(dindex->MetaIndexFile("Release").c_str());
@@ -786,9 +1028,40 @@ class Progress :
                     version_ = [[NSString stringWithUTF8String:value.c_str()] retain];
             }
         }
+
+        record_ = [Sources_ objectForKey:[self key]];
+        if (record_ != nil)
+            record_ = [record_ retain];
     } return self;
 }
 
+- (NSComparisonResult) compareByNameAndType:(Source *)source {
+    NSDictionary *lhr = [self record];
+    NSDictionary *rhr = [source record];
+
+    if (lhr != rhr)
+        return lhr == nil ? NSOrderedDescending : NSOrderedAscending;
+
+    NSString *lhs = [self name];
+    NSString *rhs = [source name];
+
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];
+
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
+    }
+
+    return [lhs compare:rhs options:CompareOptions_];
+}
+
+- (NSDictionary *) record {
+    return record_;
+}
+
 - (BOOL) trusted {
     return trusted_;
 }
@@ -805,12 +1078,24 @@ class Progress :
     return type_;
 }
 
+- (NSString *) key {
+    return [NSString stringWithFormat:@"%@:%@:%@", type_, uri_, distribution_];
+}
+
+- (NSString *) host {
+    return [[[NSURL URLWithString:[self uri]] host] lowercaseString];
+}
+
+- (NSString *) name {
+    return origin_ == nil ? [self host] : origin_;
+}
+
 - (NSString *) description {
     return description_;
 }
 
 - (NSString *) label {
-    return label_;
+    return label_ == nil ? [self host] : label_;
 }
 
 - (NSString *) origin {
@@ -863,35 +1148,6 @@ class Progress :
 @end
 /* }}} */
 /* Package Class {{{ */
-NSString *Scour(const char *field, const char *begin, const char *end) {
-    size_t i(0), l(strlen(field));
-
-    for (;;) {
-        const char *name = begin + i;
-        const char *colon = name + l;
-        const char *value = colon + 1;
-
-        if (
-            value < end &&
-            *colon == ':' &&
-            memcmp(name, field, l) == 0
-        ) {
-            while (value != end && value[0] == ' ')
-                ++value;
-            const char *line = std::find(value, end, '\n');
-            while (line != value && line[-1] == ' ')
-                --line;
-
-            return [NSString stringWithUTF8Bytes:value length:(line - value)];
-        } else {
-            begin = std::find(begin, end, '\n');
-            if (begin == end)
-                return nil;
-            ++begin;
-        }
-    }
-}
-
 @interface Package : NSObject {
     pkgCache::PkgIterator iterator_;
     _transient Database *database_;
@@ -901,6 +1157,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     Source *source_;
     bool cached_;
 
+    NSString *section_;
+
     NSString *latest_;
     NSString *installed_;
 
@@ -908,8 +1166,12 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     NSString *name_;
     NSString *tagline_;
     NSString *icon_;
-    NSString *website_;
+    NSString *depiction_;
+    NSString *homepage_;
+    Address *sponsor_;
     Address *author_;
+    NSArray *tags_;
+    NSString *role_;
 
     NSArray *relationships_;
 }
@@ -920,12 +1182,17 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (pkgCache::PkgIterator) iterator;
 
 - (NSString *) section;
+- (NSString *) simpleSection;
+
 - (Address *) maintainer;
 - (size_t) size;
 - (NSString *) description;
 - (NSString *) index;
 
+- (NSMutableDictionary *) metadata;
 - (NSDate *) seen;
+- (BOOL) subscribed;
+- (BOOL) ignored;
 
 - (NSString *) latest;
 - (NSString *) installed;
@@ -934,6 +1201,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (BOOL) upgradableAndEssential:(BOOL)essential;
 - (BOOL) essential;
 - (BOOL) broken;
+- (BOOL) unfiltered;
+- (BOOL) visible;
 
 - (BOOL) half;
 - (BOOL) halfConfigured;
@@ -944,27 +1213,38 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (NSString *) id;
 - (NSString *) name;
 - (NSString *) tagline;
-- (NSString *) icon;
-- (NSString *) website;
+- (UIImage *) icon;
+- (NSString *) homepage;
+- (NSString *) depiction;
 - (Address *) author;
 
+- (NSArray *) files;
 - (NSArray *) relationships;
+- (NSArray *) warnings;
+- (NSArray *) applications;
 
 - (Source *) source;
+- (NSString *) role;
 
 - (BOOL) matches:(NSString *)text;
 
+- (bool) hasSupportingRole;
+- (BOOL) hasTag:(NSString *)tag;
+- (NSString *) primaryPurpose;
+- (NSArray *) purposes;
+
 - (NSComparisonResult) compareByName:(Package *)package;
 - (NSComparisonResult) compareBySection:(Package *)package;
-- (NSComparisonResult) compareBySectionAndName:(Package *)package;
-- (NSComparisonResult) compareForChanges:(Package *)package;
+
+- (uint32_t) compareForChanges;
 
 - (void) install;
 - (void) remove;
 
-- (NSNumber *) isSearchedForBy:(NSString *)search;
-- (NSNumber *) isInstalledInSection:(NSString *)section;
-- (NSNumber *) isUninstalledInSection:(NSString *)section;
+- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search;
+- (NSNumber *) isInstalledAndVisible:(NSNumber *)number;
+- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section;
+- (NSNumber *) isVisibleInSource:(Source *)source;
 
 @end
 
@@ -974,6 +1254,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     if (source_ != nil)
         [source_ release];
 
+    if (section_ != nil)
+        [section_ release];
+
     [latest_ release];
     if (installed_ != nil)
         [installed_ release];
@@ -984,10 +1267,18 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [tagline_ release];
     if (icon_ != nil)
         [icon_ release];
-    if (website_ != nil)
-        [website_ release];
+    if (depiction_ != nil)
+        [depiction_ release];
+    if (homepage_ != nil)
+        [homepage_ release];
+    if (sponsor_ != nil)
+        [sponsor_ release];
     if (author_ != nil)
         [author_ release];
+    if (tags_ != nil)
+        [tags_ release];
+    if (role_ != nil)
+        [role_ release];
 
     if (relationships_ != nil)
         [relationships_ release];
@@ -995,13 +1286,30 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [super dealloc];
 }
 
++ (NSArray *) _attributeKeys {
+    return [NSArray arrayWithObjects:@"applications", @"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"maintainer", @"name", @"purposes", @"section", @"size", @"source", @"sponsor", @"tagline", @"warnings", nil];
+}
+
+- (NSArray *) attributeKeys {
+    return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
 - (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
     if ((self = [super init]) != nil) {
         iterator_ = iterator;
         database_ = database;
 
         version_ = [database_ policy]->GetCandidateVer(iterator_);
-        latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain];
+        NSString *latest = version_.end() ? nil : [NSString stringWithUTF8String:version_.VerStr()];
+        latest_ = latest == nil ? nil : [StripVersion(latest) retain];
+
+        pkgCache::VerIterator current = iterator_.CurrentVer();
+        NSString *installed = current.end() ? nil : [NSString stringWithUTF8String:current.VerStr()];
+        installed_ = [StripVersion(installed) retain];
 
         if (!version_.end())
             file_ = version_.FileList();
@@ -1010,10 +1318,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             file_ = pkgCache::VerFileIterator(cache, cache.VerFileP);
         }
 
-        pkgCache::VerIterator current = iterator_.CurrentVer();
-        installed_ = current.end() ? nil : [StripVersion([NSString stringWithUTF8String:current.VerStr()]) retain];
-
-        id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain];
+        id_ = [[NSString stringWithUTF8String:iterator_.Name()] retain];
 
         if (!file_.end()) {
             pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
@@ -1021,30 +1326,127 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             const char *begin, *end;
             parser->GetRec(begin, end);
 
-            name_ = Scour("Name", begin, end);
+            NSString *website(nil);
+            NSString *sponsor(nil);
+            NSString *author(nil);
+            NSString *tag(nil);
+
+            struct {
+                const char *name_;
+                NSString **value_;
+            } names[] = {
+                {"name", &name_},
+                {"icon", &icon_},
+                {"depiction", &depiction_},
+                {"homepage", &homepage_},
+                {"website", &website},
+                {"sponsor", &sponsor},
+                {"author", &author},
+                {"tag", &tag},
+            };
+
+            while (begin != end)
+                if (*begin == '\n') {
+                    ++begin;
+                    continue;
+                } else if (isblank(*begin)) next: {
+                    begin = static_cast<char *>(memchr(begin + 1, '\n', end - begin - 1));
+                    if (begin == NULL)
+                        break;
+                } else if (const char *colon = static_cast<char *>(memchr(begin, ':', end - begin))) {
+                    const char *name(begin);
+                    size_t size(colon - begin);
+
+                    begin = static_cast<char *>(memchr(begin, '\n', end - begin));
+
+                    {
+                        const char *stop(begin == NULL ? end : begin);
+                        while (stop[-1] == '\r')
+                            --stop;
+                        while (++colon != stop && isblank(*colon));
+
+                        for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i)
+                            if (strncasecmp(names[i].name_, name, size) == 0) {
+                                NSString *value([NSString stringWithUTF8Bytes:colon length:(stop - colon)]);
+                                *names[i].value_ = value;
+                                break;
+                            }
+                    }
+
+                    if (begin == NULL)
+                        break;
+                    ++begin;
+                } else goto next;
+
             if (name_ != nil)
                 name_ = [name_ retain];
             tagline_ = [[NSString stringWithUTF8String:parser->ShortDesc().c_str()] retain];
-            icon_ = Scour("Icon", begin, end);
             if (icon_ != nil)
                 icon_ = [icon_ retain];
-            website_ = Scour("Homepage", begin, end);
-            if (website_ == nil)
-                website_ = Scour("Website", begin, end);
-            if (website_ != nil)
-                website_ = [website_ retain];
-            NSString *author = Scour("Author", begin, end);
+            if (depiction_ != nil)
+                depiction_ = [depiction_ retain];
+            if (homepage_ == nil)
+                homepage_ = website;
+            if ([homepage_ isEqualToString:depiction_])
+                homepage_ = nil;
+            if (homepage_ != nil)
+                homepage_ = [homepage_ retain];
+            if (sponsor != nil)
+                sponsor_ = [[Address addressWithString:sponsor] retain];
             if (author != nil)
-                author_ = [Address addressWithString:author];
+                author_ = [[Address addressWithString:author] retain];
+            if (tag != nil)
+                tags_ = [[tag componentsSeparatedByString:@", "] retain];
         }
 
-        NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
-        if (metadata == nil || [metadata count] == 0) {
-            metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+        if (tags_ != nil)
+            for (int i(0), e([tags_ count]); i != e; ++i) {
+                NSString *tag = [tags_ objectAtIndex:i];
+                if ([tag hasPrefix:@"role::"]) {
+                    role_ = [[tag substringFromIndex:6] retain];
+                    break;
+                }
+            }
+
+        NSString *solid(latest == nil ? installed : latest);
+        bool changed(false);
+
+        NSString *key([id_ lowercaseString]);
+
+        NSMutableDictionary *metadata = [Packages_ objectForKey:key];
+        if (metadata == nil) {
+            metadata = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
                 now_, @"FirstSeen",
-            nil];
+            nil] mutableCopy];
 
-            [Packages_ setObject:metadata forKey:id_];
+            if (solid != nil)
+                [metadata setObject:solid forKey:@"LastVersion"];
+            changed = true;
+        } else {
+            NSDate *first([metadata objectForKey:@"FirstSeen"]);
+            NSDate *last([metadata objectForKey:@"LastSeen"]);
+            NSString *version([metadata objectForKey:@"LastVersion"]);
+
+            if (first == nil) {
+                first = last == nil ? now_ : last;
+                [metadata setObject:first forKey:@"FirstSeen"];
+                changed = true;
+            }
+
+            if (solid != nil)
+                if (version == nil) {
+                    [metadata setObject:solid forKey:@"LastVersion"];
+                    changed = true;
+                } else if (![version isEqualToString:solid]) {
+                    [metadata setObject:solid forKey:@"LastVersion"];
+                    last = now_;
+                    [metadata setObject:last forKey:@"LastSeen"];
+                    changed = true;
+                }
+        }
+
+        if (changed) {
+            [Packages_ setObject:metadata forKey:key];
             Changed_ = true;
         }
     } return self;
@@ -1062,14 +1464,38 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (NSString *) section {
+    if (section_ != nil)
+        return section_;
+
     const char *section = iterator_.Section();
-    return section == NULL ? nil : [[NSString stringWithUTF8String:section] stringByReplacingCharacter:'_' withCharacter:' '];
+    if (section == NULL)
+        return nil;
+
+    NSString *name = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_'];
+
+  lookup:
+    if (NSDictionary *value = [SectionMap_ objectForKey:name])
+        if (NSString *rename = [value objectForKey:@"Rename"]) {
+            name = rename;
+            goto lookup;
+        }
+
+    section_ = [[name stringByReplacingCharacter:'_' withCharacter:' '] retain];
+    return section_;
 }
 
-- (Address *) maintainer {
-    if (file_.end())
+- (NSString *) simpleSection {
+    if (NSString *section = [self section])
+        return Simplify(section);
+    else
         return nil;
-    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+
+}
+
+- (Address *) maintainer {
+    if (file_.end())
+        return nil;
+    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
     return [Address addressWithString:[NSString stringWithUTF8String:parser->Maintainer().c_str()]];
 }
 
@@ -1102,8 +1528,32 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return [index length] != 0 && isalpha([index characterAtIndex:0]) ? index : @"123";
 }
 
+- (NSMutableDictionary *) metadata {
+    return [Packages_ objectForKey:[id_ lowercaseString]];
+}
+
 - (NSDate *) seen {
-    return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"];
+    NSDictionary *metadata([self metadata]);
+    if ([self subscribed])
+        if (NSDate *last = [metadata objectForKey:@"LastSeen"])
+            return last;
+    return [metadata objectForKey:@"FirstSeen"];
+}
+
+- (BOOL) subscribed {
+    NSDictionary *metadata([self metadata]);
+    if (NSNumber *subscribed = [metadata objectForKey:@"IsSubscribed"])
+        return [subscribed boolValue];
+    else
+        return false;
+}
+
+- (BOOL) ignored {
+    NSDictionary *metadata([self metadata]);
+    if (NSNumber *ignored = [metadata objectForKey:@"IsIgnored"])
+        return [ignored boolValue];
+    else
+        return false;
 }
 
 - (NSString *) latest {
@@ -1123,10 +1573,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
     if (current.end())
         return essential && [self essential];
-    else {
-        pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
-        return !candidate.end() && candidate != current;
-    }
+    else
+        return !version_.end() && version_ != current;
 }
 
 - (BOOL) essential {
@@ -1137,6 +1585,15 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return [database_ cache][iterator_].InstBroken();
 }
 
+- (BOOL) unfiltered {
+    NSString *section = [self section];
+    return section == nil || isSectionVisible(section);
+}
+
+- (BOOL) visible {
+    return [self hasSupportingRole] && [self unfiltered];
+}
+
 - (BOOL) half {
     unsigned char current = iterator_->CurrentState;
     return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;
@@ -1164,13 +1621,11 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
                 return @"Purge";
             else
                 return @"Remove";
-            _assert(false);
         case pkgDepCache::ModeKeep:
             if ((state.iFlags & pkgDepCache::AutoKept) != 0)
                 return nil;
             else
                 return nil;
-            _assert(false);
         case pkgDepCache::ModeInstall:
             if ((state.iFlags & pkgDepCache::ReInstall) != 0)
                 return @"Reinstall";
@@ -1203,22 +1658,126 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return tagline_;
 }
 
-- (NSString *) icon {
-    return icon_;
+- (UIImage *) icon {
+    NSString *section = [self simpleSection];
+
+    UIImage *icon(nil);
+    if (NSString *icon = icon_)
+        icon = [UIImage imageAtPath:[icon_ substringFromIndex:6]];
+    if (icon == nil) if (section != nil)
+        icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
+    if (icon == nil) if (source_ != nil) if (NSString *icon = [source_ defaultIcon])
+        icon = [UIImage imageAtPath:[icon substringFromIndex:6]];
+    if (icon == nil)
+        icon = [UIImage applicationImageNamed:@"unknown.png"];
+    return icon;
+}
+
+- (NSString *) homepage {
+    return homepage_;
+}
+
+- (NSString *) depiction {
+    return depiction_;
 }
 
-- (NSString *) website {
-    return website_;
+- (Address *) sponsor {
+    return sponsor_;
 }
 
 - (Address *) author {
     return author_;
 }
 
+- (NSArray *) files {
+    NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", id_];
+    NSMutableArray *files = [NSMutableArray arrayWithCapacity:128];
+
+    std::ifstream fin;
+    fin.open([path UTF8String]);
+    if (!fin.is_open())
+        return nil;
+
+    std::string line;
+    while (std::getline(fin, line))
+        [files addObject:[NSString stringWithUTF8String:line.c_str()]];
+
+    return files;
+}
+
 - (NSArray *) relationships {
     return relationships_;
 }
 
+- (NSArray *) warnings {
+    NSMutableArray *warnings([NSMutableArray arrayWithCapacity:4]);
+    const char *name(iterator_.Name());
+
+    size_t length(strlen(name));
+    if (length < 2) invalid:
+        [warnings addObject:@"illegal package identifier"];
+    else for (size_t i(0); i != length; ++i)
+        if (
+            (name[i] < 'a' || name[i] > 'z') &&
+            (name[i] < '0' || name[i] > '9') &&
+            (i == 0 || name[i] != '+' && name[i] != '-' && name[i] != '.')
+        ) goto invalid;
+
+    if (strcmp(name, "cydia") != 0) {
+        bool cydia = false;
+        bool stash = false;
+
+        if (NSArray *files = [self files])
+            for (NSString *file in files)
+                if (!cydia && [file isEqualToString:@"/Applications/Cydia.app"])
+                    cydia = true;
+                else if (!stash && [file isEqualToString:@"/var/stash"])
+                    stash = true;
+
+        if (cydia)
+            [warnings addObject:@"files installed into Cydia.app"];
+        if (stash)
+            [warnings addObject:@"files installed to /var/stash"];
+    }
+
+    return [warnings count] == 0 ? nil : warnings;
+}
+
+- (NSArray *) applications {
+    NSString *me([[NSBundle mainBundle] bundleIdentifier]);
+
+    NSMutableArray *applications([NSMutableArray arrayWithCapacity:2]);
+
+    static Pcre application_r("^/Applications/(.*)\\.app/Info.plist$");
+    if (NSArray *files = [self files])
+        for (NSString *file in files)
+            if (application_r(file)) {
+                NSDictionary *info([NSDictionary dictionaryWithContentsOfFile:file]);
+                NSString *id([info objectForKey:@"CFBundleIdentifier"]);
+                if ([id isEqualToString:me])
+                    continue;
+
+                NSString *display([info objectForKey:@"CFBundleDisplayName"]);
+                if (display == nil)
+                    display = application_r[1];
+
+                NSString *bundle([file stringByDeletingLastPathComponent]);
+                NSString *icon([info objectForKey:@"CFBundleIconFile"]);
+                if (icon == nil || [icon length] == 0)
+                    icon = @"icon.png";
+                NSURL *url([NSURL fileURLWithPath:[bundle stringByAppendingPathComponent:icon]]);
+
+                NSMutableArray *application([NSMutableArray arrayWithCapacity:2]);
+                [applications addObject:application];
+
+                [application addObject:id];
+                [application addObject:display];
+                [application addObject:url];
+            }
+
+    return [applications count] == 0 ? nil : applications;
+}
+
 - (Source *) source {
     if (!cached_) {
         source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain];
@@ -1228,6 +1787,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return source_;
 }
 
+- (NSString *) role {
+    return role_;
+}
+
 - (BOOL) matches:(NSString *)text {
     if (text == nil)
         return NO;
@@ -1249,6 +1812,43 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return NO;
 }
 
+- (bool) hasSupportingRole {
+    if (role_ == nil)
+        return true;
+    if ([role_ isEqualToString:@"enduser"])
+        return true;
+    if ([Role_ isEqualToString:@"User"])
+        return false;
+    if ([role_ isEqualToString:@"hacker"])
+        return true;
+    if ([Role_ isEqualToString:@"Hacker"])
+        return false;
+    if ([role_ isEqualToString:@"developer"])
+        return true;
+    if ([Role_ isEqualToString:@"Developer"])
+        return false;
+    _assert(false);
+}
+
+- (BOOL) hasTag:(NSString *)tag {
+    return tags_ == nil ? NO : [tags_ containsObject:tag];
+}
+
+- (NSString *) primaryPurpose {
+    for (NSString *tag in tags_)
+        if ([tag hasPrefix:@"purpose::"])
+            return [tag substringFromIndex:9];
+    return nil;
+}
+
+- (NSArray *) purposes {
+    NSMutableArray *purposes([NSMutableArray arrayWithCapacity:2]);
+    for (NSString *tag in tags_)
+        if ([tag hasPrefix:@"purpose::"])
+            [purposes addObject:[tag substringFromIndex:9]];
+    return [purposes count] == 0 ? nil : purposes;
+}
+
 - (NSComparisonResult) compareByName:(Package *)package {
     NSString *lhs = [self name];
     NSString *rhs = [package name];
@@ -1263,7 +1863,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             return NSOrderedDescending;
     }
 
-    return [lhs caseInsensitiveCompare:rhs];
+    return [lhs compare:rhs options:CompareOptions_];
 }
 
 - (NSComparisonResult) compareBySection:(Package *)package {
@@ -1275,7 +1875,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     else if (lhs != NULL && rhs == NULL)
         return NSOrderedDescending;
     else if (lhs != NULL && rhs != NULL) {
-        NSComparisonResult result = [lhs caseInsensitiveCompare:rhs];
+        NSComparisonResult result = [lhs compare:rhs options:CompareOptions_];
         if (result != NSOrderedSame)
             return result;
     }
@@ -1283,43 +1883,30 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return NSOrderedSame;
 }
 
-- (NSComparisonResult) compareBySectionAndName:(Package *)package {
-    NSString *lhs = [self section];
-    NSString *rhs = [package section];
-
-    if (lhs == NULL && rhs != NULL)
-        return NSOrderedAscending;
-    else if (lhs != NULL && rhs == NULL)
-        return NSOrderedDescending;
-    else if (lhs != NULL && rhs != NULL) {
-        NSComparisonResult result = [lhs compare:rhs];
-        if (result != NSOrderedSame)
-            return result;
-    }
+- (uint32_t) compareForChanges {
+    union {
+        uint32_t key;
 
-    return [self compareByName:package];
-}
+        struct {
+            uint32_t timestamp : 30;
+            uint32_t ignored : 1;
+            uint32_t upgradable : 1;
+        } bits;
+    } value;
 
-- (NSComparisonResult) compareForChanges:(Package *)package {
-    BOOL lhs = [self upgradableAndEssential:YES];
-    BOOL rhs = [package upgradableAndEssential:YES];
+    value.bits.upgradable = [self upgradableAndEssential:YES] ? 1 : 0;
 
-    if (lhs != rhs)
-        return lhs ? NSOrderedAscending : NSOrderedDescending;
-    else if (!lhs) {
-        switch ([[self seen] compare:[package seen]]) {
-            case NSOrderedAscending:
-                return NSOrderedDescending;
-            case NSOrderedSame:
-                break;
-            case NSOrderedDescending:
-                return NSOrderedAscending;
-            default:
-                _assert(false);
-        }
+    if ([self upgradableAndEssential:YES]) {
+        value.bits.timestamp = 0;
+        value.bits.ignored = [self ignored] ? 0 : 1;
+        value.bits.upgradable = 1;
+    } else {
+        value.bits.timestamp = static_cast<uint32_t>([[self seen] timeIntervalSince1970]) >> 2;
+        value.bits.ignored = 0;
+        value.bits.upgradable = 0;
     }
 
-    return [self compareByName:package];
+    return _not(uint32_t) - value.key;
 }
 
 - (void) install {
@@ -1341,22 +1928,33 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [database_ cache]->MarkDelete(iterator_, true);
 }
 
-- (NSNumber *) isSearchedForBy:(NSString *)search {
-    return [NSNumber numberWithBool:([self valid] && [self matches:search])];
+- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search {
+    return [NSNumber numberWithBool:(
+        [self unfiltered] && [self matches:search]
+    )];
 }
 
-- (NSNumber *) isInstalledInSection:(NSString *)section {
-    return [NSNumber numberWithBool:([self installed] != nil && (section == nil || [section isEqualToString:[self section]]))];
+- (NSNumber *) isInstalledAndVisible:(NSNumber *)number {
+    return [NSNumber numberWithBool:(
+        (![number boolValue] || [self visible]) && [self installed] != nil
+    )];
 }
 
-- (NSNumber *) isUninstalledInSection:(NSString *)name {
+- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)name {
     NSString *section = [self section];
 
-    return [NSNumber numberWithBool:([self valid] && [self installed] == nil && (
-        (name == nil ||
-        section == nil && [name length] == 0 ||
-        [name isEqualToString:section])
-    ))];
+    return [NSNumber numberWithBool:(
+        [self visible] &&
+        [self installed] == nil && (
+            name == nil ||
+            section == nil && [name length] == 0 ||
+            [name isEqualToString:section]
+        )
+    )];
+}
+
+- (NSNumber *) isVisibleInSource:(Source *)source {
+    return [NSNumber numberWithBool:([self source] == source && [self visible])];
 }
 
 @end
@@ -1368,6 +1966,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     size_t count_;
 }
 
+- (NSComparisonResult) compareByName:(Section *)section;
+- (Section *) initWithName:(NSString *)name;
 - (Section *) initWithName:(NSString *)name row:(size_t)row;
 - (NSString *) name;
 - (size_t) row;
@@ -1383,6 +1983,27 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [super dealloc];
 }
 
+- (NSComparisonResult) compareByName:(Section *)section {
+    NSString *lhs = [self name];
+    NSString *rhs = [section name];
+
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];
+
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
+    }
+
+    return [lhs compare:rhs options:CompareOptions_];
+}
+
+- (Section *) initWithName:(NSString *)name {
+    return [self initWithName:name row:0];
+}
+
 - (Section *) initWithName:(NSString *)name row:(size_t)row {
     if ((self = [super init]) != nil) {
         name_ = [name retain];
@@ -1409,45 +2030,59 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 @end
 /* }}} */
 
+static int Finish_;
+static NSArray *Finishes_;
+
 /* Database Implementation {{{ */
 @implementation Database
 
++ (Database *) sharedInstance {
+    static Database *instance;
+    if (instance == nil)
+        instance = [[Database alloc] init];
+    return instance;
+}
+
 - (void) dealloc {
     _assert(false);
     [super dealloc];
 }
 
-- (void) _readCydia:(NSNumber *)fd {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+- (void) _readCydia:(NSNumber *)fd { _pooled
     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;
 
+    static Pcre finish_r("^finish:([^:]*)$");
+
     while (std::getline(is, line)) {
         const char *data(line.c_str());
-        //size_t size = line.size();
-        fprintf(stderr, "C:%s\n", data);
+        size_t size = line.size();
+        lprintf("C:%s\n", data);
+
+        if (finish_r(data, size)) {
+            NSString *finish = finish_r[1];
+            int index = [Finishes_ indexOfObject:finish];
+            if (index != INT_MAX && index > Finish_)
+                Finish_ = index;
+        }
     }
 
-    [pool release];
     _assert(false);
 }
 
-- (void) _readStatus:(NSNumber *)fd {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+- (void) _readStatus:(NSNumber *)fd { _pooled
     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;
 
-    Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
-    Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
+    static Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
+    static Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
 
     while (std::getline(is, line)) {
         const char *data(line.c_str());
         size_t size = line.size();
-        fprintf(stderr, "S:%s\n", data);
+        lprintf("S:%s\n", data);
 
         if (conffile_r(data, size)) {
             [delegate_ setConfigurationData:conffile_r[1]];
@@ -1468,31 +2103,27 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
                     withObject:[NSArray arrayWithObjects:string, id, nil]
                     waitUntilDone:YES
                 ];
-            else if (type == "pmstatus")
+            else if (type == "pmstatus") {
                 [delegate_ setProgressTitle:string];
-            else if (type == "pmconffile")
+            else if (type == "pmconffile")
                 [delegate_ setConfigurationData:string];
             else _assert(false);
         } else _assert(false);
     }
 
-    [pool release];
     _assert(false);
 }
 
-- (void) _readOutput:(NSNumber *)fd {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+- (void) _readOutput:(NSNumber *)fd { _pooled
     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;
 
     while (std::getline(is, line)) {
-        fprintf(stderr, "O:%s\n", line.c_str());
+        lprintf("O:%s\n", line.c_str());
         [delegate_ addProgressOutput:[NSString stringWithUTF8String:line.c_str()]];
     }
 
-    [pool release];
     _assert(false);
 }
 
@@ -1524,7 +2155,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         cydiafd_ = fds[1];
 
         _config->Set("APT::Keep-Fds::", cydiafd_);
-        setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 0"] UTF8String], _not(int));
+        setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 1"] UTF8String], _not(int));
 
         [NSThread
             detachNewThreadSelector:@selector(_readCydia:)
@@ -1583,6 +2214,74 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return packages_;
 }
 
+- (NSArray *) sources {
+    return [sources_ allValues];
+}
+
+- (NSArray *) issues {
+    if (cache_->BrokenCount() == 0)
+        return nil;
+
+    NSMutableArray *issues([NSMutableArray arrayWithCapacity:4]);
+
+    for (Package *package in packages_) {
+        if (![package broken])
+            continue;
+        pkgCache::PkgIterator pkg([package iterator]);
+
+        NSMutableArray *entry([NSMutableArray arrayWithCapacity:4]);
+        [entry addObject:[package name]];
+        [issues addObject:entry];
+
+        pkgCache::VerIterator ver(cache_[pkg].InstVerIter(cache_));
+        if (ver.end())
+            continue;
+
+        for (pkgCache::DepIterator dep(ver.DependsList()); !dep.end(); ) {
+            pkgCache::DepIterator start;
+            pkgCache::DepIterator end;
+            dep.GlobOr(start, end); // ++dep
+
+            if (!cache_->IsImportantDep(end))
+                continue;
+            if ((cache_[end] & pkgDepCache::DepGInstall) != 0)
+                continue;
+
+            NSMutableArray *failure([NSMutableArray arrayWithCapacity:4]);
+            [entry addObject:failure];
+            [failure addObject:[NSString stringWithUTF8String:start.DepType()]];
+
+            Package *package([self packageWithName:[NSString stringWithUTF8String:start.TargetPkg().Name()]]);
+            [failure addObject:[package name]];
+
+            pkgCache::PkgIterator target(start.TargetPkg());
+            if (target->ProvidesList != 0)
+                [failure addObject:@"?"];
+            else {
+                pkgCache::VerIterator ver(cache_[target].InstVerIter(cache_));
+                if (!ver.end())
+                    [failure addObject:[NSString stringWithUTF8String:ver.VerStr()]];
+                else if (!cache_[target].CandidateVerIter(cache_).end())
+                    [failure addObject:@"-"];
+                else if (target->ProvidesList == 0)
+                    [failure addObject:@"!"];
+                else
+                    [failure addObject:@"%"];
+            }
+
+            _forever {
+                if (start.TargetVer() != 0)
+                    [failure addObject:[NSString stringWithFormat:@"%s %s", start.CompType(), start.TargetVer()]];
+                if (start == end)
+                    break;
+                ++start;
+            }
+        }
+    }
+
+    return issues;
+}
+
 - (void) reloadData {
     _error->Discard();
 
@@ -1602,12 +2301,13 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
     cache_.Close();
 
+    _trace();
     if (!cache_.Open(progress_, true)) {
         std::string error;
         if (!_error->PopMessage(error))
             _assert(false);
         _error->Discard();
-        fprintf(stderr, "cache_.Open():[%s]\n", error.c_str());
+        lprintf("cache_.Open():[%s]\n", error.c_str());
 
         if (error == "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct the problem. ")
             [delegate_ repairWithSelector:@selector(configure)];
@@ -1620,6 +2320,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
         return;
     }
+    _trace();
 
     now_ = [[NSDate date] retain];
 
@@ -1652,11 +2353,14 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     }
 
     [packages_ removeAllObjects];
+    _trace();
+    profile_ = 0;
     for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
         if (Package *package = [Package packageWithIterator:iterator database:self])
             [packages_ addObject:package];
-
+    _trace();
     [packages_ sortUsingSelector:@selector(compareByName:)];
+    _trace();
 }
 
 - (void) configure {
@@ -1687,7 +2391,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     if (!cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)) {
         std::string error;
         while (_error->PopMessage(error))
-            fprintf(stderr, "ArchiveCleaner: %s\n", error.c_str());
+            lprintf("ArchiveCleaner: %s\n", error.c_str());
     }
 }
 
@@ -1715,18 +2419,50 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             [before addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]];
     }
 
-    if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue)
+    if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue) {
+        _trace();
+        return;
+    }
+
+    bool failed = false;
+    for (pkgAcquire::ItemIterator item = fetcher_->ItemsBegin(); item != fetcher_->ItemsEnd(); item++) {
+        if ((*item)->Status == pkgAcquire::Item::StatDone && (*item)->Complete)
+            continue;
+
+        std::string uri = (*item)->DescURI();
+        std::string error = (*item)->ErrorText;
+
+        lprintf("pAf:%s:%s\n", uri.c_str(), error.c_str());
+        failed = true;
+
+        [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+            withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:error.c_str()], nil]
+            waitUntilDone:YES
+        ];
+    }
+
+    if (failed) {
+        _trace();
         return;
+    }
 
     _system->UnLock();
     pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
 
-    if (result == pkgPackageManager::Failed)
+    if (_error->PendingError()) {
+        _trace();
         return;
-    if (_error->PendingError())
+    }
+
+    if (result == pkgPackageManager::Failed) {
+        _trace();
         return;
-    if (result != pkgPackageManager::Completed)
+    }
+
+    if (result != pkgPackageManager::Completed) {
+        _trace();
         return;
+    }
 
     NSMutableArray *after = [NSMutableArray arrayWithCapacity:16]; {
         pkgSourceList list;
@@ -1791,60 +2527,29 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 @end
 /* }}} */
 
-/* Confirmation View {{{ */
-void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) {
-    if ([packages count] == 0)
-        return;
-
-    UITextView *text = GetTextView([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "], 120, false);
-    [fields setObject:text forKey:key];
-
-    CGColor blue(space_, 0, 0, 0.4, 1);
-    [text setTextColor:blue];
-}
-
-@protocol ConfirmationViewDelegate
-- (void) cancel;
-- (void) confirm;
-@end
-
-@interface ConfirmationView : UIView {
-    Database *database_;
-    id delegate_;
+/* PopUp Windows {{{ */
+@interface PopUpView : UIView {
+    _transient id delegate_;
     UITransitionView *transition_;
     UIView *overlay_;
-    UINavigationBar *navbar_;
-    UIPreferencesTable *table_;
-    NSMutableDictionary *fields_;
-    UIAlertSheet *essential_;
 }
 
 - (void) cancel;
-
-- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate;
+- (id) initWithView:(UIView *)view delegate:(id)delegate;
 
 @end
 
-@implementation ConfirmationView
+@implementation PopUpView
 
 - (void) dealloc {
-    [navbar_ setDelegate:nil];
     [transition_ setDelegate:nil];
-    [table_ setDataSource:nil];
-
     [transition_ release];
     [overlay_ release];
-    [navbar_ release];
-    [table_ release];
-    [fields_ release];
-    if (essential_ != nil)
-        [essential_ release];
     [super dealloc];
 }
 
 - (void) cancel {
-    [transition_ transition:7 toView:nil];
-    [delegate_ cancel];
+    [transition_ transition:UITransitionPushFromTop toView:nil];
 }
 
 - (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
@@ -1852,139 +2557,182 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [self removeFromSuperview];
 }
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    switch (button) {
-        case 0:
-            if (essential_ != nil)
-                [essential_ popupAlertAnimated:YES];
-            else
-                [delegate_ confirm];
-        break;
+- (id) initWithView:(UIView *)view delegate:(id)delegate {
+    if ((self = [super initWithFrame:[view bounds]]) != nil) {
+        delegate_ = delegate;
 
-        case 1:
-            [self cancel];
-        break;
-    }
-}
+        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
+        [self addSubview:transition_];
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    NSString *context = [sheet context];
+        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
 
-    if ([context isEqualToString:@"remove"])
-        switch (button) {
-            case 1:
-                [self cancel];
-                break;
-            case 2:
-                [delegate_ confirm];
-                break;
-            default:
-                _assert(false);
-        }
-    else if ([context isEqualToString:@"unable"])
-        [self cancel];
+        [view addSubview:self];
 
-    [sheet dismiss];
-}
+        [transition_ setDelegate:self];
 
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
-    return 2;
+        UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease];
+        [transition_ transition:UITransitionNone toView:blank];
+        [transition_ transition:UITransitionPushFromBottom toView:overlay_];
+    } return self;
 }
 
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
-    switch (group) {
-        case 0: return @"Statistics";
-        case 1: return @"Modifications";
+@end
+/* }}} */
 
-        default: _assert(false);
-    }
+/* Mail Composition {{{ */
+@interface MailToView : PopUpView {
+    MailComposeController *controller_;
 }
 
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
-    switch (group) {
-        case 0: return 3;
-        case 1: return [fields_ count];
+- (id) initWithView:(UIView *)view delegate:(id)delegate url:(NSURL *)url;
 
-        default: _assert(false);
-    }
-}
+@end
 
-- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
-    if (group != 1 || row == -1)
-        return proposed;
-    else {
-        _assert(size_t(row) < [fields_ count]);
-        return [[[fields_ allValues] objectAtIndex:row] visibleTextRect].size.height + TextViewOffset_;
-    }
-}
+@implementation MailToView
 
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
-    UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
-    [cell setShowSelection:NO];
+- (void) dealloc {
+    [controller_ release];
+    [super dealloc];
+}
 
-    switch (group) {
-        case 0: switch (row) {
-            case 0: {
-                [cell setTitle:@"Downloading"];
-                [cell setValue:SizeString([database_ fetcher].FetchNeeded())];
-            } break;
+- (void) mailComposeControllerWillAttemptToSend:(MailComposeController *)controller {
+    NSLog(@"will");
+}
 
-            case 1: {
-                [cell setTitle:@"Resuming At"];
-                [cell setValue:SizeString([database_ fetcher].PartialPresent())];
-            } break;
+- (void) mailComposeControllerDidAttemptToSend:(MailComposeController *)controller mailDelivery:(id)delivery {
+    NSLog(@"did:%@", delivery);
+// [UIApp setStatusBarShowsProgress:NO];
+if ([controller error]){
+NSArray *buttons = [NSArray arrayWithObjects:@"OK", nil];
+UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" buttons:buttons defaultButtonIndex:0 delegate:self context:self];
+[mailAlertSheet setBodyText:[controller error]];
+[mailAlertSheet popupAlertAnimated:YES];
+}
+}
 
-            case 2: {
-                double size([database_ cache]->UsrSize());
+- (void) showError {
+    NSLog(@"%@", [controller_ error]);
+    NSArray *buttons = [NSArray arrayWithObjects:@"OK", nil];
+    UIActionSheet *mailAlertSheet = [[UIActionSheet alloc] initWithTitle:@"Error" buttons:buttons defaultButtonIndex:0 delegate:self context:self];
+    [mailAlertSheet setBodyText:[controller_ error]];
+    [mailAlertSheet popupAlertAnimated:YES];
+}
 
-                if (size < 0) {
-                    [cell setTitle:@"Disk Freeing"];
-                    [cell setValue:SizeString(-size)];
-                } else {
-                    [cell setTitle:@"Disk Using"];
-                    [cell setValue:SizeString(size)];
-                }
-            } break;
+- (void) deliverMessage { _pooled
+    setuid(501);
+    setgid(501);
 
-            default: _assert(false);
-        } break;
+    if (![controller_ deliverMessage])
+        [self performSelectorOnMainThread:@selector(showError) withObject:nil waitUntilDone:NO];
+}
 
-        case 1:
-            _assert(size_t(row) < [fields_ count]);
-            [cell setTitle:[[fields_ allKeys] objectAtIndex:row]];
-            [cell addSubview:[[fields_ allValues] objectAtIndex:row]];
-        break;
+- (void) mailComposeControllerCompositionFinished:(MailComposeController *)controller {
+    if ([controller_ needsDelivery])
+        [NSThread detachNewThreadSelector:@selector(deliverMessage) toTarget:self withObject:nil];
+    else
+        [self cancel];
+}
 
-        default: _assert(false);
-    }
+- (id) initWithView:(UIView *)view delegate:(id)delegate url:(NSURL *)url {
+    if ((self = [super initWithView:view delegate:delegate]) != nil) {
+        controller_ = [[MailComposeController alloc] initForContentSize:[overlay_ bounds].size];
+        [controller_ setDelegate:self];
+        [controller_ initializeUI];
+        [controller_ setupForURL:url];
 
-    return cell;
+        UIView *view([controller_ view]);
+        [overlay_ addSubview:view];
+    } return self;
 }
 
-- (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate {
-    if ((self = [super initWithFrame:[view bounds]]) != nil) {
-        database_ = database;
-        delegate_ = delegate;
+@end
+/* }}} */
+/* Confirmation View {{{ */
+bool DepSubstrate(const pkgCache::VerIterator &iterator) {
+    if (!iterator.end())
+        for (pkgCache::DepIterator dep(iterator.DependsList()); !dep.end(); ++dep) {
+            if (dep->Type != pkgCache::Dep::Depends && dep->Type != pkgCache::Dep::PreDepends)
+                continue;
+            pkgCache::PkgIterator package(dep.TargetPkg());
+            if (package.end())
+                continue;
+            if (strcmp(package.Name(), "mobilesubstrate") == 0)
+                return true;
+        }
 
-        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
-        [self addSubview:transition_];
+    return false;
+}
 
-        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+@protocol ConfirmationViewDelegate
+- (void) cancel;
+- (void) confirm;
+@end
 
-        CGSize navsize = [UINavigationBar defaultSize];
-        CGRect navrect = {{0, 0}, navsize};
-        CGRect bounds = [overlay_ bounds];
+@interface ConfirmationView : BrowserView {
+    _transient Database *database_;
+    UIActionSheet *essential_;
+    NSArray *changes_;
+    NSArray *issues_;
+    NSArray *sizes_;
+    BOOL substrate_;
+}
 
-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        if (Advanced_)
-            [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 
-        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
-        [navbar_ pushNavigationItem:navitem];
-        [navbar_ showButtonsWithLeftTitle:@"Cancel" rightTitle:@"Confirm"];
+@end
+
+@implementation ConfirmationView
+
+- (void) dealloc {
+    [changes_ release];
+    if (issues_ != nil)
+        [issues_ release];
+    [sizes_ release];
+    if (essential_ != nil)
+        [essential_ release];
+    [super dealloc];
+}
+
+- (void) cancel {
+    [delegate_ cancel];
+    [book_ popFromSuperviewAnimated:YES];
+}
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"remove"]) {
+        switch (button) {
+            case 1:
+                [self cancel];
+                break;
+            case 2:
+                if (substrate_)
+                    Finish_ = 2;
+                [delegate_ confirm];
+                break;
+            default:
+                _assert(false);
+        }
+
+        [sheet dismiss];
+    } else if ([context isEqualToString:@"unable"]) {
+        [self cancel];
+        [sheet dismiss];
+    } else
+        [super alertSheet:sheet buttonClicked:button];
+}
+
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+    [window setValue:changes_ forKey:@"changes"];
+    [window setValue:issues_ forKey:@"issues"];
+    [window setValue:sizes_ forKey:@"sizes"];
+    [super webView:sender didClearWindowObject:window forFrame:frame];
+}
 
-        fields_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
 
         NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16];
         NSMutableArray *reinstalling = [NSMutableArray arrayWithCapacity:16];
@@ -1994,6 +2742,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         bool remove(false);
 
+        pkgDepCache::Policy *policy([database_ policy]);
+
         pkgCacheFile &cache([database_ cache]);
         NSArray *packages = [database_ packages];
         for (size_t i(0), e = [packages count]; i != e; ++i) {
@@ -2015,13 +2765,16 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
                 if ([package essential])
                     remove = true;
                 [removing addObject:name];
-            }
+            } else continue;
+
+            substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator));
+            substrate_ |= DepSubstrate(iterator.CurrentVer());
         }
 
         if (!remove)
             essential_ = nil;
         else if (Advanced_ || true) {
-            essential_ = [[UIAlertSheet alloc]
+            essential_ = [[UIActionSheet alloc]
                 initWithTitle:@"Removing Essentials"
                 buttons:[NSArray arrayWithObjects:
                     @"Cancel Operation (Safe)",
@@ -2032,10 +2785,12 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
                 context:@"remove"
             ];
 
+#ifndef __OBJC2__
             [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
+#endif
             [essential_ setBodyText:@"This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage."];
         } else {
-            essential_ = [[UIAlertSheet alloc]
+            essential_ = [[UIActionSheet alloc]
                 initWithTitle:@"Unable to Comply"
                 buttons:[NSArray arrayWithObjects:@"Okay", nil]
                 defaultButtonIndex:0
@@ -2046,32 +2801,55 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             [essential_ setBodyText:@"This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. In order to continue and force this operation you will need to be activate the Advanced mode under to continue and force this operation you will need to be activate the Advanced mode under Settings."];
         }
 
-        AddTextView(fields_, installing, @"Installing");
-        AddTextView(fields_, reinstalling, @"Reinstalling");
-        AddTextView(fields_, upgrading, @"Upgrading");
-        AddTextView(fields_, downgrading, @"Downgrading");
-        AddTextView(fields_, removing, @"Removing");
-
-        table_ = [[UIPreferencesTable alloc] initWithFrame:CGRectMake(
-            0, navsize.height, bounds.size.width, bounds.size.height - navsize.height
-        )];
+        changes_ = [[NSArray alloc] initWithObjects:
+            installing,
+            reinstalling,
+            upgrading,
+            downgrading,
+            removing,
+        nil];
+
+        issues_ = [database_ issues];
+        if (issues_ != nil)
+            issues_ = [issues_ retain];
+
+        sizes_ = [[NSArray alloc] initWithObjects:
+            SizeString([database_ fetcher].FetchNeeded()),
+            SizeString([database_ fetcher].PartialPresent()),
+            SizeString([database_ cache]->UsrSize()),
+        nil];
+
+        [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"confirm" ofType:@"html"]]];
+    } return self;
+}
 
-        [table_ setReusesTableCells:YES];
-        [table_ setDataSource:self];
-        [table_ reloadData];
+- (NSString *) backButtonTitle {
+    return @"Confirm";
+}
 
-        [overlay_ addSubview:navbar_];
-        [overlay_ addSubview:table_];
+- (NSString *) leftButtonTitle {
+    return @"Cancel";
+}
 
-        [view addSubview:self];
+- (NSString *) _rightButtonTitle {
+    return issues_ == nil ? @"Confirm" : nil;
+}
 
-        [transition_ setDelegate:self];
+- (void) _leftButtonClicked {
+    [self cancel];
+}
 
-        UIView *blank = [[[UIView alloc] initWithFrame:[transition_ bounds]] autorelease];
-        [transition_ transition:0 toView:blank];
-        [transition_ transition:3 toView:overlay_];
-    } return self;
+#if !AlwaysReload
+- (void) _rightButtonClicked {
+    if (essential_ != nil)
+        [essential_ popupAlertAnimated:YES];
+    else {
+        if (substrate_)
+            Finish_ = 2;
+        [delegate_ confirm];
+    }
 }
+#endif
 
 @end
 /* }}} */
@@ -2115,8 +2893,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 @end
 /* }}} */
 /* Progress View {{{ */
-Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
-
 @interface ProgressView : UIView <
     ConfigurationDelegate,
     ProgressDelegate
@@ -2132,6 +2908,11 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     UITextLabel *status_;
     UIPushButton *close_;
     id delegate_;
+    BOOL running_;
+    SHA1SumValue springlist_;
+    SHA1SumValue sandplate_;
+    size_t received_;
+    NSTimeInterval last_;
 }
 
 - (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
@@ -2144,6 +2925,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (void) _detachNewThreadData:(ProgressData *)data;
 - (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title;
 
+- (BOOL) isRunning;
+
 @end
 
 @protocol ProgressViewDelegate
@@ -2185,10 +2968,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
 
         if (bootstrap_)
-            [overlay_ setBackgroundColor:Black_];
+            [overlay_ setBackgroundColor:[UIColor blackColor]];
         else {
             background_ = [[UIView alloc] initWithFrame:[self bounds]];
-            [background_ setBackgroundColor:Black_];
+            [background_ setBackgroundColor:[UIColor blackColor]];
             [self addSubview:background_];
         }
 
@@ -2224,8 +3007,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             24
         )];
 
-        [status_ setColor:White_];
-        [status_ setBackgroundColor:Clear_];
+        [status_ setColor:[UIColor whiteColor]];
+        [status_ setBackgroundColor:[UIColor clearColor]];
 
         [status_ setCentersHorizontally:YES];
         //[status_ setFont:font];
@@ -2240,11 +3023,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         //[output_ setTextFont:@"Courier New"];
         [output_ setTextSize:12];
 
-        [output_ setTextColor:White_];
-        [output_ setBackgroundColor:Clear_];
+        [output_ setTextColor:[UIColor whiteColor]];
+        [output_ setBackgroundColor:[UIColor clearColor]];
 
         [output_ setMarginTop:0];
         [output_ setAllowsRubberBanding:YES];
+        [output_ setEditable:NO];
 
         [overlay_ addSubview:output_];
 
@@ -2252,18 +3036,16 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             10,
             bounds.size.height - prgsize.height - 50,
             bounds.size.width - 20,
-            26 + prgsize.height
+            32 + prgsize.height
         )];
 
         [close_ setAutosizesToFit:NO];
         [close_ setDrawsShadow:YES];
         [close_ setStretchBackground:YES];
-        [close_ setTitle:@"Close Window"];
         [close_ setEnabled:YES];
 
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+        UIFont *bold = [UIFont boldSystemFontOfSize:22];
         [close_ setTitleFont:bold];
-        CFRelease(bold);
 
         [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
         [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
@@ -2279,8 +3061,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [transition_ transition:6 toView:view_];
 }
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    NSString *context = [sheet context];
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context([sheet context]);
+
     if ([context isEqualToString:@"conffile"]) {
         FILE *input = [database_ input];
 
@@ -2296,31 +3079,128 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             default:
                 _assert(false);
         }
-    }
 
-    [sheet dismiss];
+        [sheet dismiss];
+    }
 }
 
 - (void) closeButtonPushed {
-    [delegate_ progressViewIsComplete:self];
-    [self resetView];
+    running_ = NO;
+
+    switch (Finish_) {
+        case 0:
+            [self resetView];
+        break;
+
+        case 1:
+            [delegate_ suspendWithAnimation:YES];
+        break;
+
+        case 2:
+            system("launchctl stop com.apple.SpringBoard");
+        break;
+
+        case 3:
+            system("launchctl unload "SpringBoard_"; launchctl load "SpringBoard_);
+        break;
+
+        case 4:
+            system("reboot");
+        break;
+    }
 }
 
 - (void) _retachThread {
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:@"Complete"];
+
     [overlay_ addSubview:close_];
     [progress_ removeFromSuperview];
     [status_ removeFromSuperview];
-}
 
-- (void) _detachNewThreadData:(ProgressData *)data {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    [delegate_ progressViewIsComplete:self];
+
+    if (Finish_ < 4) {
+        FileFd file(SandboxTemplate_, FileFd::ReadOnly);
+        MMap mmap(file, MMap::ReadOnly);
+        SHA1Summation sha1;
+        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+        if (!(sandplate_ == sha1.Result()))
+            Finish_ = 4;
+    }
+
+    if (Finish_ < 3) {
+        FileFd file(SpringBoard_, FileFd::ReadOnly);
+        MMap mmap(file, MMap::ReadOnly);
+        SHA1Summation sha1;
+        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+        if (!(springlist_ == sha1.Result()))
+            Finish_ = 3;
+    }
+
+    switch (Finish_) {
+        case 0: [close_ setTitle:@"Return to Cydia"]; break;
+        case 1: [close_ setTitle:@"Close Cydia (Restart)"]; break;
+        case 2: [close_ setTitle:@"Restart SpringBoard"]; break;
+        case 3: [close_ setTitle:@"Reload SpringBoard"]; break;
+        case 4: [close_ setTitle:@"Reboot Device"]; break;
+    }
+
+#define Cache_ "/User/Library/Caches/com.apple.mobile.installation.plist"
+
+    if (NSMutableDictionary *cache = [[NSMutableDictionary alloc] initWithContentsOfFile:@ Cache_]) {
+        [cache autorelease];
+
+        NSFileManager *manager = [NSFileManager defaultManager];
+        NSError *error = nil;
+
+        id system = [cache objectForKey:@"System"];
+        if (system == nil)
+            goto error;
+
+        struct stat info;
+        if (stat(Cache_, &info) == -1)
+            goto error;
+
+        [system removeAllObjects];
+
+        if (NSArray *apps = [manager contentsOfDirectoryAtPath:@"/Applications" error:&error]) {
+            for (NSString *app in apps)
+                if ([app hasSuffix:@".app"]) {
+                    NSString *path = [@"/Applications" stringByAppendingPathComponent:app];
+                    NSString *plist = [path stringByAppendingPathComponent:@"Info.plist"];
+                    if (NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithContentsOfFile:plist]) {
+                        [info autorelease];
+                        if ([info objectForKey:@"CFBundleIdentifier"] != nil) {
+                            [info setObject:path forKey:@"Path"];
+                            [info setObject:@"System" forKey:@"ApplicationType"];
+                            [system addInfoDictionary:info];
+                        }
+                    }
+                }
+        } else goto error;
+
+        [cache writeToFile:@Cache_ atomically:YES];
+
+        if (chown(Cache_, info.st_uid, info.st_gid) == -1)
+            goto error;
+        if (chmod(Cache_, info.st_mode) == -1)
+            goto error;
+
+        if (false) error:
+            lprintf("%s\n", error == nil ? strerror(errno) : [[error localizedDescription] UTF8String]);
+    }
+
+    notify_post("com.apple.mobile.application_installed");
+
+    [delegate_ setStatusBarShowsProgress:NO];
+}
 
+- (void) _detachNewThreadData:(ProgressData *)data { _pooled
     [[data target] performSelector:[data selector] withObject:[data object]];
     [data release];
 
     [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
-
-    [pool release];
 }
 
 - (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {
@@ -2331,10 +3211,32 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [output_ setText:@""];
     [progress_ setProgress:0];
 
+    received_ = 0;
+    last_ = 0;//[NSDate timeIntervalSinceReferenceDate];
+
     [close_ removeFromSuperview];
     [overlay_ addSubview:progress_];
     [overlay_ addSubview:status_];
 
+    [delegate_ setStatusBarShowsProgress:YES];
+    running_ = YES;
+
+    {
+        FileFd file(SandboxTemplate_, FileFd::ReadOnly);
+        MMap mmap(file, MMap::ReadOnly);
+        SHA1Summation sha1;
+        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+        sandplate_ = sha1.Result();
+    }
+
+    {
+        FileFd file(SpringBoard_, FileFd::ReadOnly);
+        MMap mmap(file, MMap::ReadOnly);
+        SHA1Summation sha1;
+        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+        springlist_ = sha1.Result();
+    }
+
     [transition_ transition:6 toView:overlay_];
 
     [NSThread
@@ -2353,7 +3255,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         detachNewThreadSelector:selector
         toTarget:database_
         withObject:nil
-        title:@"Repairing..."
+        title:@"Repairing"
     ];
 }
 
@@ -2368,8 +3270,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
     Package *package = id == nil ? nil : [database_ packageWithName:id];
 
-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:(package == nil ? @"Source Error" : [package name])
+    UIActionSheet *sheet = [[[UIActionSheet alloc]
+        initWithTitle:(package == nil ? id : [package name])
         buttons:[NSArray arrayWithObjects:@"Okay", nil]
         defaultButtonIndex:0
         delegate:self
@@ -2396,6 +3298,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     ];
 }
 
+- (void) startProgress {
+    last_ = [NSDate timeIntervalSinceReferenceDate];
+}
+
 - (void) addProgressOutput:(NSString *)output {
     [self
         performSelectorOnMainThread:@selector(_addProgressOutput:)
@@ -2404,13 +3310,28 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     ];
 }
 
+- (bool) isCancelling:(size_t)received {
+    if (last_ != 0) {
+        NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
+        if (received_ != received) {
+            received_ = received;
+            last_ = now;
+        } else if (now - last_ > 30)
+            return true;
+    }
+
+    return false;
+}
+
 - (void) _setConfigurationData:(NSString *)data {
+    static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
+
     _assert(conffile_r(data));
 
     NSString *ofile = conffile_r[1];
     //NSString *nfile = conffile_r[2];
 
-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+    UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:@"Configuration Upgrade"
         buttons:[NSArray arrayWithObjects:
             @"Keep My Old Copy",
@@ -2430,7 +3351,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (void) _setProgressTitle:(NSString *)title {
-    [status_ setText:[title stringByAppendingString:@"..."]];
+    NSMutableArray *words([[title componentsSeparatedByString:@" "] mutableCopy]);
+    for (size_t i(0), e([words count]); i != e; ++i) {
+        NSString *word([words objectAtIndex:i]);
+        if (Package *package = [database_ packageWithName:word])
+            [words replaceObjectAtIndex:i withObject:[package name]];
+    }
+
+    [status_ setText:[words componentsJoinedByString:@" "]];
 }
 
 - (void) _setProgressPercent:(NSNumber *)percent {
@@ -2444,123 +3372,89 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [output_ scrollRectToVisible:rect animated:YES];
 }
 
+- (BOOL) isRunning {
+    return running_;
+}
+
 @end
 /* }}} */
 
 /* Package Cell {{{ */
-@interface PackageCell : UITableCell {
-    UIImageView *icon_;
-    UITextLabel *name_;
-    UITextLabel *description_;
-    UITextLabel *source_;
-    //UIImageView *trusted_;
+@interface PackageCell : UISimpleTableCell {
+    UIImage *icon_;
+    NSString *name_;
+    NSString *description_;
+    NSString *source_;
+    UIImage *badge_;
 #ifdef USE_BADGES
-    UIImageView *badge_;
     UITextLabel *status_;
 #endif
-    BOOL setup_;
 }
 
 - (PackageCell *) init;
 - (void) setPackage:(Package *)package;
 
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
-
 + (int) heightForPackage:(Package *)package;
 
 @end
 
 @implementation PackageCell
 
+- (void) clearPackage {
+    if (icon_ != nil) {
+        [icon_ release];
+        icon_ = nil;
+    }
+
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
+    }
+
+    if (description_ != nil) {
+        [description_ release];
+        description_ = nil;
+    }
+
+    if (source_ != nil) {
+        [source_ release];
+        source_ = nil;
+    }
+
+    if (badge_ != nil) {
+        [badge_ release];
+        badge_ = nil;
+    }
+}
+
 - (void) dealloc {
-    [icon_ release];
-    [name_ release];
-    [description_ release];
-    [source_ release];
+    [self clearPackage];
 #ifdef USE_BADGES
-    [badge_ release];
     [status_ release];
 #endif
-    //[trusted_ release];
     [super dealloc];
 }
 
 - (PackageCell *) init {
     if ((self = [super init]) != nil) {
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 20);
-        GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12);
-        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
-
-        icon_ = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 30, 30)];
-
-        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 8, 240, 25)];
-        [name_ setBackgroundColor:Clear_];
-        [name_ setFont:bold];
-
-        source_ = [[UITextLabel alloc] initWithFrame:CGRectMake(58, 28, 225, 20)];
-        [source_ setBackgroundColor:Clear_];
-        [source_ setFont:large];
-
-        description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 46, 280, 20)];
-        [description_ setBackgroundColor:Clear_];
-        [description_ setFont:small];
-
-        /*trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
-        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];*/
-
 #ifdef USE_BADGES
-        badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
-
         status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
-        [status_ setBackgroundColor:Clear_];
+        [status_ setBackgroundColor:[UIColor clearColor]];
         [status_ setFont:small];
 #endif
-
-        /*[icon_ setImage:[UIImage applicationImageNamed:@"unknown.png"]];
-        [icon_ zoomToScale:0.5];
-        [icon_ setFrame:CGRectMake(10, 10, 30, 30)];*/
-
-        [self addSubview:icon_];
-        [self addSubview:name_];
-        [self addSubview:description_];
-        [self addSubview:source_];
-
-        CFRelease(small);
-        CFRelease(large);
-        CFRelease(bold);
     } return self;
 }
 
 - (void) setPackage:(Package *)package {
-    /*if (setup_)
-        return;
-    else
-        setup_ = YES;*/
+    [self clearPackage];
 
     Source *source = [package source];
+    NSString *section = [package simpleSection];
 
-    UIImage *image = nil;
-    if (NSString *icon = [package icon])
-        image = [UIImage imageAtPath:[icon substringFromIndex:6]];
-    if (image == nil) if (NSString *icon = [source defaultIcon])
-        image = [UIImage imageAtPath:[icon substringFromIndex:6]];
-    if (image == nil)
-        image = [UIImage applicationImageNamed:@"unknown.png"];
-    [icon_ setImage:image];
-
-    /*if (image != nil) {
-        CGSize size = [image size];
-        float scale = 30 / std::max(size.width, size.height);
-        [icon_ zoomToScale:scale];
-    }*/
+    icon_ = [[package icon] retain];
 
-    [icon_ setFrame:CGRectMake(10, 10, 30, 30)];
-
-    [name_ setText:[package name]];
-    [description_ setText:[package tagline]];
+    name_ = [[package name] retain];
+    description_ = [[package tagline] retain];
 
     NSString *label = nil;
     bool trusted = false;
@@ -2570,178 +3464,194 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         trusted = [source trusted];
     } else if ([[package id] isEqualToString:@"firmware"])
         label = @"Apple";
-
-    if (label == nil)
+    else
         label = @"Unknown/Local";
 
     NSString *from = [NSString stringWithFormat:@"from %@", label];
 
-    NSString *section = Simplify([package section]);
     if (section != nil && ![section isEqualToString:label])
         from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
 
-    [source_ setText:from];
+    source_ = [from retain];
 
-#ifdef USE_BADGES
-    [badge_ removeFromSuperview];
-    [status_ removeFromSuperview];
+    if (NSString *purpose = [package primaryPurpose])
+        if ((badge_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Purposes/%@.png", App_, purpose]]) != nil)
+            badge_ = [badge_ retain];
 
+#ifdef USE_BADGES
     if (NSString *mode = [package mode]) {
         [badge_ setImage:[UIImage applicationImageNamed:
             [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
         ]];
 
         [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]];
-        [status_ setColor:Blueish_];
+        [status_ setColor:[UIColor colorWithCGColor:Blueish_]];
     } else if ([package half]) {
         [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
         [status_ setText:@"Package Damaged"];
-        [status_ setColor:Red_];
+        [status_ setColor:[UIColor redColor]];
     } else {
         [badge_ setImage:nil];
         [status_ setText:nil];
-        goto done;
     }
-
-    [self addSubview:badge_];
-    [self addSubview:status_];
-  done:;
 #endif
 }
 
-- (void) _setSelected:(float)fraction {
-    CGColor black(space_,
-        Interpolate(0.0, 1.0, fraction),
-        Interpolate(0.0, 1.0, fraction),
-        Interpolate(0.0, 1.0, fraction),
-    1.0);
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+    if (icon_ != nil) {
+        CGRect rect;
+        rect.size = [icon_ size];
 
-    CGColor gray(space_,
-        Interpolate(0.4, 1.0, fraction),
-        Interpolate(0.4, 1.0, fraction),
-        Interpolate(0.4, 1.0, fraction),
-    1.0);
+        rect.size.width /= 2;
+        rect.size.height /= 2;
 
-    [name_ setColor:black];
-    [description_ setColor:gray];
-    [source_ setColor:black];
-}
+        rect.origin.x = 25 - rect.size.width / 2;
+        rect.origin.y = 25 - rect.size.height / 2;
 
-- (void) setSelected:(BOOL)selected {
-    [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected];
-}
+        [icon_ drawInRect:rect];
+    }
 
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
-    if (!fade)
-        [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected withFade:fade];
-}
+    if (badge_ != nil) {
+        CGSize size = [badge_ size];
+
+        [badge_ drawAtPoint:CGPointMake(
+            36 - size.width / 2,
+            36 - size.height / 2
+        )];
+    }
 
-- (void) _setSelectionFadeFraction:(float)fraction {
-    [self _setSelected:fraction];
-    [super _setSelectionFadeFraction:fraction];
+    if (selected)
+        UISetColor(White_);
+
+    if (!selected)
+        UISetColor(Black_);
+    [name_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
+    [source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
+
+    if (!selected)
+        UISetColor(Gray_);
+    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
+
+    [super drawContentInRect:rect selected:selected];
 }
 
 + (int) heightForPackage:(Package *)package {
+    NSString *tagline([package tagline]);
+    int height = tagline == nil || [tagline length] == 0 ? -17 : 0;
 #ifdef USE_BADGES
     if ([package hasMode] || [package half])
-        return 96;
+        return height + 96;
     else
 #endif
-        return 73;
+        return height + 73;
 }
 
 @end
 /* }}} */
 /* Section Cell {{{ */
-@interface SectionCell : UITableCell {
-    UITextLabel *name_;
-    UITextLabel *count_;
+@interface SectionCell : UISimpleTableCell {
+    NSString *section_;
+    NSString *name_;
+    NSString *count_;
+    UIImage *icon_;
+    _UISwitchSlider *switch_;
+    BOOL editing_;
 }
 
 - (id) init;
-- (void) setSection:(Section *)section;
-
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
+- (void) setSection:(Section *)section editing:(BOOL)editing;
 
 @end
 
 @implementation SectionCell
 
+- (void) clearSection {
+    if (section_ != nil) {
+        [section_ release];
+        section_ = nil;
+    }
+
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
+    }
+
+    if (count_ != nil) {
+        [count_ release];
+        count_ = nil;
+    }
+}
+
 - (void) dealloc {
-    [name_ release];
-    [count_ release];
+    [self clearSection];
+    [icon_ release];
+    [switch_ release];
     [super dealloc];
 }
 
 - (id) init {
     if ((self = [super init]) != nil) {
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
-        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 12);
-
-        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 9, 250, 25)];
-        [name_ setBackgroundColor:Clear_];
-        [name_ setFont:bold];
+        icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain];
 
-        count_ = [[UITextLabel alloc] initWithFrame:CGRectMake(11, 7, 29, 32)];
-        [count_ setCentersHorizontally:YES];
-        [count_ setBackgroundColor:Clear_];
-        [count_ setFont:small];
-        [count_ setColor:White_];
+        switch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];
+        [switch_ addTarget:self action:@selector(onSwitch:) forEvents:kUIControlEventMouseUpInside];
+    } return self;
+}
 
-        UIImageView *folder = [[[UIImageView alloc] initWithFrame:CGRectMake(8, 7, 32, 32)] autorelease];
-        [folder setImage:[UIImage applicationImageNamed:@"folder.png"]];
+- (void) onSwitch:(id)sender {
+    NSMutableDictionary *metadata = [Sections_ objectForKey:section_];
+    if (metadata == nil) {
+        metadata = [NSMutableDictionary dictionaryWithCapacity:2];
+        [Sections_ setObject:metadata forKey:section_];
+    }
 
-        [self addSubview:folder];
-        [self addSubview:name_];
-        [self addSubview:count_];
+    Changed_ = true;
+    [metadata setObject:[NSNumber numberWithBool:([switch_ value] == 0)] forKey:@"Hidden"];
+}
 
-        [self _setSelected:0];
+- (void) setSection:(Section *)section editing:(BOOL)editing {
+    if (editing != editing_) {
+        if (editing_)
+            [switch_ removeFromSuperview];
+        else
+            [self addSubview:switch_];
+        editing_ = editing;
+    }
 
-        CFRelease(small);
-        CFRelease(bold);
-    } return self;
-}
+    [self clearSection];
 
-- (void) setSection:(Section *)section {
     if (section == nil) {
-        [name_ setText:@"All Packages"];
-        [count_ setText:nil];
+        name_ = [@"All Packages" retain];
+        count_ = nil;
     } else {
-        NSString *name = [section name];
-        [name_ setText:(name == nil ? @"(No Section)" : name)];
-        [count_ setText:[NSString stringWithFormat:@"%d", [section count]]];
+        section_ = [section name];
+        if (section_ != nil)
+            section_ = [section_ retain];
+        name_  = [(section_ == nil ? @"(No Section)" : section_) retain];
+        count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
+
+        if (editing_)
+            [switch_ setValue:(isSectionVisible(section_) ? 1 : 0) animated:NO];
     }
 }
 
-- (void) _setSelected:(float)fraction {
-    CGColor black(space_,
-        Interpolate(0.0, 1.0, fraction),
-        Interpolate(0.0, 1.0, fraction),
-        Interpolate(0.0, 1.0, fraction),
-    1.0);
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+    [icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
 
-    [name_ setColor:black];
-}
+    if (selected)
+        UISetColor(White_);
 
-- (void) setSelected:(BOOL)selected {
-    [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected];
-}
+    if (!selected)
+        UISetColor(Black_);
+    [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(editing_ ? 164 : 250) withFont:Font22Bold_ ellipsis:2];
 
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
-    if (!fade)
-        [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected withFade:fade];
-}
+    CGSize size = [count_ sizeWithFont:Font14_];
+
+    UISetColor(White_);
+    if (count_ != nil)
+        [count_ drawAtPoint:CGPointMake(13 + (29 - size.width) / 2, 16) withFont:Font12Bold_];
 
-- (void) _setSelectionFadeFraction:(float)fraction {
-    [self _setSelected:fraction];
-    [super _setSelectionFadeFraction:fraction];
+    [super drawContentInRect:rect selected:selected];
 }
 
 @end
@@ -2784,15 +3694,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
     if (reusing == nil) {
         reusing = [[[UIImageAndTextTableCell alloc] init] autorelease];
-        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        UIFont *font = [UIFont systemFontOfSize:16];
         [[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font];
-        CFRelease(font);
     }
     [(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]];
     return reusing;
 }
 
-- (BOOL) canSelectRow:(int)row {
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
     return NO;
 }
 
@@ -2836,14 +3745,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         package_ = [package retain];
         name_ = [[package id] retain];
 
-        NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_];
-
-        {
-            std::ifstream fin([path UTF8String]);
-            std::string line;
-            while (std::getline(fin, line))
-                [files_ addObject:[NSString stringWithUTF8String:line.c_str()]];
-        }
+        if (NSArray *files = [package files])
+            [files_ addObjectsFromArray:files];
 
         if ([files_ count] != 0) {
             if ([[files_ objectAtIndex:0] isEqualToString:@"/."])
@@ -2890,16 +3793,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 @end
 /* }}} */
 /* Package View {{{ */
-@protocol PackageViewDelegate
-- (void) performPackage:(Package *)package;
-@end
-
-@interface PackageView : RVPage {
+@interface PackageView : BrowserView {
     _transient Database *database_;
-    UIPreferencesTable *table_;
     Package *package_;
     NSString *name_;
-    UITextView *description_;
     NSMutableArray *buttons_;
 }
 
@@ -2911,247 +3808,57 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 @implementation PackageView
 
 - (void) dealloc {
-    [table_ setDataSource:nil];
-    [table_ setDelegate:nil];
-
     if (package_ != nil)
         [package_ release];
     if (name_ != nil)
         [name_ release];
-    if (description_ != nil)
-        [description_ release];
-    [table_ release];
     [buttons_ release];
     [super dealloc];
 }
 
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
-    int number = 2;
-    if ([package_ installed] != nil)
-        ++number;
-    if ([package_ source] != nil)
-        ++number;
-    return number;
-}
-
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
-    if (group-- == 0)
-        return nil;
-    else if ([package_ installed] != nil && group-- == 0)
-        return @"Installed Package";
-    else if (group-- == 0)
-        return @"Package Details";
-    else if ([package_ source] != nil && group-- == 0)
-        return @"Source Information";
+- (void) _clickButtonWithName:(NSString *)name {
+    if ([name isEqualToString:@"Install"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Reinstall"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Remove"])
+        [delegate_ removePackage:package_];
+    else if ([name isEqualToString:@"Upgrade"])
+        [delegate_ installPackage:package_];
     else _assert(false);
 }
 
-- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
-    if (description_ == nil || group != 0 || row != 1)
-        return proposed;
-    else
-        return [description_ visibleTextRect].size.height + TextViewOffset_;
-}
-
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
-    if (group-- == 0) {
-        int number = 1;
-        if ([package_ author] != nil)
-            ++number;
-        if (description_ != nil)
-            ++number;
-        if ([package_ website] != nil)
-            ++number;
-        return number;
-    } else if ([package_ installed] != nil && group-- == 0)
-        return 2;
-    else if (group-- == 0) {
-        int number = 2;
-        if ([package_ size] != 0)
-            ++number;
-        if ([package_ maintainer] != nil)
-            ++number;
-        if ([package_ relationships] != nil)
-            ++number;
-        if ([[package_ source] trusted])
-            ++number;
-        return number;
-    } else if ([package_ source] != nil && group-- == 0) {
-        Source *source = [package_ source];
-        NSString *description = [source description];
-        int number = 1;
-        if (description != nil && ![description isEqualToString:[source label]])
-            ++number;
-        if ([source origin] != nil)
-            ++number;
-        return number;
-    } else _assert(false);
-}
-
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
-    UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
-    [cell setShowSelection:NO];
-
-    if (group-- == 0) {
-        if (false) {
-        } else if (row-- == 0) {
-            [cell setTitle:[package_ name]];
-            [cell setValue:[package_ latest]];
-        } else if ([package_ author] != nil && row-- == 0) {
-            [cell setTitle:@"Author"];
-            [cell setValue:[[package_ author] name]];
-            [cell setShowDisclosure:YES];
-            [cell setShowSelection:YES];
-        } else if (description_ != nil && row-- == 0) {
-            [cell addSubview:description_];
-        } else if ([package_ website] != nil && row-- == 0) {
-            [cell setTitle:@"More Information"];
-            [cell setShowDisclosure:YES];
-            [cell setShowSelection:YES];
-        } else _assert(false);
-    } else if ([package_ installed] != nil && group-- == 0) {
-        if (false) {
-        } else if (row-- == 0) {
-            [cell setTitle:@"Version"];
-            NSString *installed([package_ installed]);
-            [cell setValue:(installed == nil ? @"n/a" : installed)];
-        } else if (row-- == 0) {
-            [cell setTitle:@"Filesystem Content"];
-            [cell setShowDisclosure:YES];
-            [cell setShowSelection:YES];
-        } else _assert(false);
-    } else if (group-- == 0) {
-        if (false) {
-        } else if (row-- == 0) {
-            [cell setTitle:@"Identifier"];
-            [cell setValue:[package_ id]];
-        } else if (row-- == 0) {
-            [cell setTitle:@"Section"];
-            NSString *section([package_ section]);
-            [cell setValue:(section == nil ? @"n/a" : section)];
-        } else if ([package_ size] != 0 && row-- == 0) {
-            [cell setTitle:@"Expanded Size"];
-            [cell setValue:SizeString([package_ size])];
-        } else if ([package_ maintainer] != nil && row-- == 0) {
-            [cell setTitle:@"Maintainer"];
-            [cell setValue:[[package_ maintainer] name]];
-            [cell setShowDisclosure:YES];
-            [cell setShowSelection:YES];
-        } else if ([package_ relationships] != nil && row-- == 0) {
-            [cell setTitle:@"Package Relationships"];
-            [cell setShowDisclosure:YES];
-            [cell setShowSelection:YES];
-        } else if ([[package_ source] trusted] && row-- == 0) {
-            [cell setIcon:[UIImage applicationImageNamed:@"trusted.png"]];
-            [cell setValue:@"This package has been signed."];
-        } else _assert(false);
-    } else if ([package_ source] != nil && group-- == 0) {
-        Source *source = [package_ source];
-        NSString *description = [source description];
-
-        if (false) {
-        } else if (row-- == 0) {
-            NSString *label = [source label];
-            if (label == nil)
-                label = [source uri];
-            [cell setTitle:label];
-            [cell setValue:[source version]];
-        } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
-            [cell setValue:description];
-        } else if ([source origin] != nil && row-- == 0) {
-            [cell setTitle:@"Origin"];
-            [cell setValue:[source origin]];
-        } else _assert(false);
-    } else _assert(false);
-
-    return cell;
-}
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context([sheet context]);
 
-- (BOOL) canSelectRow:(int)row {
-    return YES;
-}
+    if ([context isEqualToString:@"modify"]) {
+        int count = [buttons_ count];
+        _assert(count != 0);
+        _assert(button <= count + 1);
 
-- (void) tableRowSelected:(NSNotification *)notification {
-    int row = [table_ selectedRow];
-    if (row == INT_MAX)
-        return;
+        if (count != button - 1)
+            [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
 
-    #define _else else goto _label; return; } _label:
-
-    if (true) {
-        if (row-- == 0) {
-        } else if (row-- == 0) {
-        } else if ([package_ author] != nil && row-- == 0) {
-            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
-                [[package_ author] email],
-                [[NSString stringWithFormat:@"regarding apt package \"%@\"",
-                    [package_ name]
-                ] stringByAddingPercentEscapes]
-            ]]];
-        } else if (description_ != nil && row-- == 0) {
-        } else if ([package_ website] != nil && row-- == 0) {
-            NSURL *url = [NSURL URLWithString:[package_ website]];
-            BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
-            [browser setDelegate:delegate_];
-            [book_ pushPage:browser];
-            [browser loadURL:url];
-    } _else if ([package_ installed] != nil) {
-        if (row-- == 0) {
-        } else if (row-- == 0) {
-        } else if (row-- == 0) {
-            FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
-            [files setDelegate:delegate_];
-            [files setPackage:package_];
-            [book_ pushPage:files];
-    } _else if (true) {
-        if (row-- == 0) {
-        } else if (row-- == 0) {
-        } else if (row-- == 0) {
-        } else if ([package_ size] != 0 && row-- == 0) {
-        } else if ([package_ maintainer] != nil && row-- == 0) {
-            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
-                [[package_ maintainer] email],
-                [[NSString stringWithFormat:@"regarding apt package \"%@\"",
-                    [package_ name]
-                ] stringByAddingPercentEscapes]
-            ]]];
-        } else if ([package_ relationships] != nil && row-- == 0) {
-        } else if ([[package_ source] trusted] && row-- == 0) {
-    } _else if ([package_ source] != nil) {
-        Source *source = [package_ source];
-        NSString *description = [source description];
-
-        if (row-- == 0) {
-        } else if (row-- == 0) {
-        } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
-        } else if ([source origin] != nil && row-- == 0) {
-    } _else _assert(false);
+        [sheet dismiss];
+    } else
+        [super alertSheet:sheet buttonClicked:button];
 }
 
-- (void) _clickButtonWithName:(NSString *)name {
-    if ([name isEqualToString:@"Install"])
-        [delegate_ installPackage:package_];
-    else if ([name isEqualToString:@"Reinstall"])
-        [delegate_ installPackage:package_];
-    else if ([name isEqualToString:@"Remove"])
-        [delegate_ removePackage:package_];
-    else if ([name isEqualToString:@"Upgrade"])
-        [delegate_ installPackage:package_];
-    else _assert(false);
+- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+    [[frame windowObject] evaluateWebScript:@"document.base.target = '_top'"];
+    return [super webView:sender didFinishLoadForFrame:frame];
 }
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    int count = [buttons_ count];
-    _assert(count != 0);
-    _assert(button <= count + 1);
-
-    if (count != button - 1)
-        [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
-
-    [sheet dismiss];
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+    [window setValue:package_ forKey:@"package"];
+    [super webView:sender didClearWindowObject:window forFrame:frame];
 }
 
+#if !AlwaysReload
 - (void) _rightButtonClicked {
+    /*[super _rightButtonClicked];
+    return;*/
+
     int count = [buttons_ count];
     _assert(count != 0);
 
@@ -3162,35 +3869,29 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [buttons addObjectsFromArray:buttons_];
         [buttons addObject:@"Cancel"];
 
-        [delegate_ slideUp:[[[UIAlertSheet alloc]
+        [delegate_ slideUp:[[[UIActionSheet alloc]
             initWithTitle:nil
             buttons:buttons
             defaultButtonIndex:2
             delegate:self
-            context:@"manage"
+            context:@"modify"
         ] autorelease]];
     }
 }
+#endif
 
-- (NSString *) rightButtonTitle {
+- (NSString *) _rightButtonTitle {
     int count = [buttons_ count];
     return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0];
 }
 
-- (NSString *) title {
+- (NSString *) backButtonTitle {
     return @"Details";
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {
     if ((self = [super initWithBook:book]) != nil) {
         database_ = database;
-
-        table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
-        [self addSubview:table_];
-
-        [table_ setDataSource:self];
-        [table_ setDelegate:self];
-
         buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
     } return self;
 }
@@ -3206,26 +3907,13 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         name_ = nil;
     }
 
-    if (description_ != nil) {
-        [description_ release];
-        description_ = nil;
-    }
-
     [buttons_ removeAllObjects];
 
     if (package != nil) {
         package_ = [package retain];
         name_ = [[package id] retain];
 
-        NSString *description([package description]);
-        if (description == nil)
-            description = [package tagline];
-        if (description != nil) {
-            description_ = [GetTextView(description, 12, true) retain];
-            [description_ setTextColor:Black_];
-        }
-
-        [table_ reloadData];
+        [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]];
 
         if ([package_ source] == nil);
         else if ([package_ upgradableAndEssential:NO])
@@ -3239,10 +3927,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     }
 }
 
-- (void) resetViewAnimated:(BOOL)animated {
-    [table_ resetViewAnimated:animated];
-}
-
 - (void) reloadData {
     [self setPackage:[database_ packageWithName:name_]];
     [self reloadButtons];
@@ -3359,6 +4043,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
         [self addSubview:list_];
         [self reloadData];
+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
@@ -3383,7 +4070,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
-        if ([[package performSelector:filter_ withObject:object_] boolValue])
+        if ([package valid] && [[package performSelector:filter_ withObject:object_] boolValue])
             [packages_ addObject:package];
     }
 
@@ -3427,242 +4114,569 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 @end
 /* }}} */
 
-/* Browser Implementation {{{ */
-@implementation BrowserView
+/* Add Source View {{{ */
+@interface AddSourceView : RVPage {
+    _transient Database *database_;
+}
 
-- (void) dealloc {
-    WebView *webview = [webview_ webView];
-    [webview setFrameLoadDelegate:nil];
-    [webview setResourceLoadDelegate:nil];
-    [webview setUIDelegate:nil];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 
-    [scroller_ setDelegate:nil];
-    [webview_ setDelegate:nil];
+@end
 
-    [scroller_ release];
-    [webview_ release];
-    [urls_ release];
-    [indicator_ release];
-    if (title_ != nil)
-        [title_ release];
-    [super dealloc];
+@implementation AddSourceView
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+    } return self;
 }
 
-- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
-    NSMutableURLRequest *request = [NSMutableURLRequest
-        requestWithURL:url
-        cachePolicy:policy
-        timeoutInterval:30.0
-    ];
+@end
+/* }}} */
+/* Source Cell {{{ */
+@interface SourceCell : UITableCell {
+    UIImage *icon_;
+    NSString *origin_;
+    NSString *description_;
+    NSString *label_;
+}
 
-    [request addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"];
-    [request addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
-    [request addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
+- (void) dealloc;
 
-    [self loadRequest:request];
-}
+- (SourceCell *) initWithSource:(Source *)source;
 
+@end
 
-- (void) loadURL:(NSURL *)url {
-    [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
-}
+@implementation SourceCell
 
-// XXX: this needs to add the headers
-- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request {
-    return request;
+- (void) dealloc {
+    [icon_ release];
+    [origin_ release];
+    [description_ release];
+    [label_ release];
+    [super dealloc];
 }
 
-- (void) loadRequest:(NSURLRequest *)request {
-    [webview_ loadRequest:request];
+- (SourceCell *) initWithSource:(Source *)source {
+    if ((self = [super init]) != nil) {
+        if (icon_ == nil)
+            icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sources/%@.png", [source host]]];
+        if (icon_ == nil)
+            icon_ = [UIImage applicationImageNamed:@"unknown.png"];
+        icon_ = [icon_ retain];
+
+        origin_ = [[source name] retain];
+        label_ = [[source uri] retain];
+        description_ = [[source description] retain];
+    } return self;
 }
 
-- (void) reloadURL {
-    NSURL *url = [[[urls_ lastObject] retain] autorelease];
-    [urls_ removeLastObject];
-    [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData];
-}
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+    if (icon_ != nil)
+        [icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
 
-- (WebView *) webView {
-    return [webview_ webView];
-}
+    if (selected)
+        UISetColor(White_);
 
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
-    [scroller_ setContentSize:frame.size];
-}
+    if (!selected)
+        UISetColor(Black_);
+    [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
 
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
-    [self view:sender didSetFrame:frame];
-}
+    if (!selected)
+        UISetColor(Blue_);
+    [label_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
 
-- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
-    return [self _addHeadersToRequest:request];
+    if (!selected)
+        UISetColor(Gray_);
+    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
+
+    [super drawContentInRect:rect selected:selected];
 }
 
-- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
-    if ([[[request URL] scheme] isEqualToString:@"apptapp"])
-        return nil;
-    [self setBackButtonTitle:title_];
-    BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
-    [browser setDelegate:delegate_];
-    [book_ pushPage:browser];
-    [browser loadRequest:[self _addHeadersToRequest:request]];
-    return [browser webView];
+@end
+/* }}} */
+/* Source Table {{{ */
+@interface SourceTable : RVPage {
+    _transient Database *database_;
+    UISectionList *list_;
+    NSMutableArray *sources_;
+    UIActionSheet *alert_;
+    int offset_;
+
+    NSString *href_;
+    UIProgressHUD *hud_;
+    NSError *error_;
+
+    //NSURLConnection *installer_;
+    NSURLConnection *trivial_bz2_;
+    NSURLConnection *trivial_gz_;
+    //NSURLConnection *automatic_;
+
+    BOOL trivial_;
 }
 
-- (void) webView:(WebView *)sender willClickElement:(id)element {
-    if (![element respondsToSelector:@selector(href)])
-        return;
-    NSString *href = [element href];
-    if (href == nil)
-        return;
-    if ([href hasPrefix:@"apptapp://package/"]) {
-        NSString *name = [href substringFromIndex:18];
-        Package *package = [database_ packageWithName:name];
-        if (package == nil) {
-            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-                initWithTitle:@"Cannot Locate Package"
-                buttons:[NSArray arrayWithObjects:@"Close", nil]
-                defaultButtonIndex:0
-                delegate:self
-                context:@"missing"
-            ] autorelease];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 
-            [sheet setBodyText:[NSString stringWithFormat:
-                @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
-            , name]];
+@end
 
-            [sheet popupAlertAnimated:YES];
-        } else {
-            [self setBackButtonTitle:title_];
-            PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
-            [view setDelegate:delegate_];
-            [view setPackage:package];
-            [book_ pushPage:view];
-        }
+@implementation SourceTable
+
+- (void) _deallocConnection:(NSURLConnection *)connection {
+    if (connection != nil) {
+        [connection cancel];
+        //[connection setDelegate:nil];
+        [connection release];
     }
 }
 
-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
-    title_ = [title retain];
-    [self setTitle:title];
+- (void) dealloc {
+    [[list_ table] setDelegate:nil];
+    [list_ setDataSource:nil];
+
+    if (href_ != nil)
+        [href_ release];
+    if (hud_ != nil)
+        [hud_ release];
+    if (error_ != nil)
+        [error_ release];
+
+    //[self _deallocConnection:installer_];
+    [self _deallocConnection:trivial_gz_];
+    [self _deallocConnection:trivial_bz2_];
+    //[self _deallocConnection:automatic_];
+
+    [sources_ release];
+    [list_ release];
+    [super dealloc];
 }
 
-- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
-    if ([frame parentFrame] != nil)
-        return;
+- (int) numberOfSectionsInSectionList:(UISectionList *)list {
+    return offset_ == 0 ? 1 : 2;
+}
 
-    reloading_ = false;
-    loading_ = true;
-    [indicator_ startAnimation];
-    [self reloadButtons];
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+    switch (section + (offset_ == 0 ? 1 : 0)) {
+        case 0: return @"Entered by User";
+        case 1: return @"Installed by Packages";
 
-    if (title_ != nil) {
-        [title_ release];
-        title_ = nil;
+        default:
+            _assert(false);
+            return nil;
     }
+}
 
-    [self setTitle:@"Loading..."];
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
+    switch (section + (offset_ == 0 ? 1 : 0)) {
+        case 0: return 0;
+        case 1: return offset_;
 
-    WebView *webview = [webview_ webView];
-    NSString *href = [webview mainFrameURL];
-    [urls_ addObject:[NSURL URLWithString:href]];
+        default:
+            _assert(false);
+            return -1;
+    }
+}
 
-    CGRect webrect = [scroller_ frame];
-    webrect.size.height = 0;
-    [webview_ setFrame:webrect];
+- (int) numberOfRowsInTable:(UITable *)table {
+    return [sources_ count];
 }
 
-- (void) _finishLoading {
-    if (!reloading_) {
-        loading_ = false;
-        [indicator_ stopAnimation];
-        [self reloadButtons];
-    }
+- (float) table:(UITable *)table heightForRow:(int)row {
+    Source *source = [sources_ objectAtIndex:row];
+    return [source description] == nil ? 56 : 73;
 }
 
-- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
-    if ([frame parentFrame] != nil)
-        return;
-    [self _finishLoading];
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col {
+    Source *source = [sources_ objectAtIndex:row];
+    // XXX: weird warning, stupid selectors ;P
+    return [[[SourceCell alloc] initWithSource:(id)source] autorelease];
 }
 
-- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
-    if ([frame parentFrame] != nil)
-        return;
-    [self setTitle:[error localizedDescription]];
-    [self _finishLoading];
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+    return YES;
 }
 
-- (id) initWithBook:(RVBook *)book database:(Database *)database {
-    if ((self = [super initWithBook:book]) != nil) {
-        database_ = database;
-        loading_ = false;
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+    return YES;
+}
 
-        struct CGRect bounds = [self bounds];
+- (void) tableRowSelected:(NSNotification*)notification {
+    UITable *table([list_ table]);
+    int row([table selectedRow]);
+    if (row == INT_MAX)
+        return;
 
-        UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease];
-        [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
-        [self addSubview:pinstripe];
+    Source *source = [sources_ objectAtIndex:row];
 
-        scroller_ = [[UIScroller alloc] initWithFrame:bounds];
-        [self addSubview:scroller_];
+    PackageTable *packages = [[[PackageTable alloc]
+        initWithBook:book_
+        database:database_
+        title:[source label]
+        filter:@selector(isVisibleInSource:)
+        with:source
+    ] autorelease];
 
-        [scroller_ setScrollingEnabled:YES];
-        [scroller_ setAdjustForContentSizeChange:YES];
-        [scroller_ setClipsSubviews:YES];
-        [scroller_ setAllowsRubberBanding:YES];
-        [scroller_ setScrollDecelerationFactor:0.99];
-        [scroller_ setDelegate:self];
+    [packages setDelegate:delegate_];
 
-        CGRect webrect = [scroller_ bounds];
-        webrect.size.height = 0;
+    [book_ pushPage:packages];
+}
 
-        webview_ = [[UIWebView alloc] initWithFrame:webrect];
-        [scroller_ addSubview:webview_];
+- (BOOL) table:(UITable *)table canDeleteRow:(int)row {
+    Source *source = [sources_ objectAtIndex:row];
+    return [source record] != nil;
+}
 
-        [webview_ setTilingEnabled:YES];
-        [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
-        [webview_ setAutoresizes:YES];
-        [webview_ setDelegate:self];
-        //[webview_ setEnabledGestures:2];
+- (void) table:(UITable *)table willSwipeToDeleteRow:(int)row {
+    [[list_ table] setDeleteConfirmationRow:row];
+}
 
-        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:0];
-        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
-        [indicator_ setStyle:0];
+- (void) table:(UITable *)table deleteRow:(int)row {
+    Source *source = [sources_ objectAtIndex:row];
+    [Sources_ removeObjectForKey:[source key]];
+    [delegate_ syncData];
+}
 
-        Package *package([database_ packageWithName:@"cydia"]);
-        NSString *application = package == nil ? @"Cydia" : [NSString
-            stringWithFormat:@"Cydia/%@",
-            [package installed]
-        ];
+- (void) _endConnection:(NSURLConnection *)connection {
+    NSURLConnection **field = NULL;
+    if (connection == trivial_bz2_)
+        field = &trivial_bz2_;
+    else if (connection == trivial_gz_)
+        field = &trivial_gz_;
+    _assert(field != NULL);
+    [connection release];
+    *field = nil;
 
-        WebView *webview = [webview_ webView];
-        [webview setApplicationNameForUserAgent:application];
-        [webview setFrameLoadDelegate:self];
-        [webview setResourceLoadDelegate:self];
-        [webview setUIDelegate:self];
+    if (
+        trivial_bz2_ == nil &&
+        trivial_gz_ == nil
+    ) {
+        [delegate_ setStatusBarShowsProgress:NO];
 
-        urls_ = [[NSMutableArray alloc] initWithCapacity:16];
-    } return self;
-}
+        [hud_ show:NO];
+        [hud_ removeFromSuperview];
+        [hud_ autorelease];
+        hud_ = nil;
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
-}
+        if (trivial_) {
+            [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
+                @"deb", @"Type",
+                href_, @"URI",
+                @"./", @"Distribution",
+            nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
 
-- (void) _leftButtonClicked {
-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:@"About Cydia Packager"
-        buttons:[NSArray arrayWithObjects:@"Close", nil]
-        defaultButtonIndex:0
-        delegate:self
-        context:@"about"
-    ] autorelease];
+            [delegate_ syncData];
+        } else if (error_ != nil) {
+            UIActionSheet *sheet = [[[UIActionSheet alloc]
+                initWithTitle:@"Verification Error"
+                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"urlerror"
+            ] autorelease];
 
-    [sheet setBodyText:
-        @"Copyright (C) 2008\n"
-        "Jay Freeman (saurik)\n"
-        "saurik@saurik.com\n"
+            [sheet setBodyText:[error_ localizedDescription]];
+            [sheet popupAlertAnimated:YES];
+        } else {
+            UIActionSheet *sheet = [[[UIActionSheet alloc]
+                initWithTitle:@"Did not Find Repository"
+                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"trivial"
+            ] autorelease];
+
+            [sheet setBodyText:@"The indicated repository could not be found. This could be because you are trying to add a legacy Installer repository (these are not supported). Also, this interface is only capable of working with exact repository URLs. If you host a repository and are having issues please contact the author of Cydia with any questions you have."];
+            [sheet popupAlertAnimated:YES];
+        }
+
+        [href_ release];
+        href_ = nil;
+
+        if (error_ != nil) {
+            [error_ release];
+            error_ = nil;
+        }
+    }
+}
+
+- (void) connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLResponse *)response {
+    switch ([response statusCode]) {
+        case 200:
+            trivial_ = YES;
+    }
+}
+
+- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+    lprintf("connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]);
+    if (error_ != nil)
+        error_ = [error retain];
+    [self _endConnection:connection];
+}
+
+- (void) connectionDidFinishLoading:(NSURLConnection *)connection {
+    [self _endConnection:connection];
+}
+
+- (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method {
+    NSMutableURLRequest *request = [NSMutableURLRequest
+        requestWithURL:[NSURL URLWithString:href]
+        cachePolicy:NSURLRequestUseProtocolCachePolicy
+        timeoutInterval:20.0
+    ];
+
+    [request setHTTPMethod:method];
+
+    return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
+}
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"source"]) {
+        switch (button) {
+            case 1: {
+                NSString *href = [[sheet textField] text];
+
+                //installer_ = [[self _requestHRef:href method:@"GET"] retain];
+
+                if (![href hasSuffix:@"/"])
+                    href_ = [href stringByAppendingString:@"/"];
+                else
+                    href_ = href;
+                href_ = [href_ retain];
+
+                trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain];
+                trivial_gz_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.gz"] method:@"HEAD"] retain];
+                //trivial_bz2_ = [[self _requestHRef:[href stringByAppendingString:@"dists/Release"] method:@"HEAD"] retain];
+
+                trivial_ = false;
+
+                hud_ = [delegate_ addProgressHUD];
+                [hud_ setText:@"Verifying URL"];
+            } break;
+
+            case 2:
+            break;
+
+            default:
+                _assert(false);
+        }
+
+        [sheet dismiss];
+    }
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+        sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
+
+        //list_ = [[UITable alloc] initWithFrame:[self bounds]];
+        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO];
+        [list_ setShouldHideHeaderInShortLists:NO];
+
+        [self addSubview:list_];
+        [list_ setDataSource:self];
+
+        UITableColumn *column = [[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:[self frame].size.width
+        ];
+
+        UITable *table = [list_ table];
+        [table setSeparatorStyle:1];
+        [table addTableColumn:column];
+        [table setDelegate:self];
+
+        [self reloadData];
+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+    } return self;
+}
+
+- (void) reloadData {
+    pkgSourceList list;
+    _assert(list.ReadMainList());
+
+    [sources_ removeAllObjects];
+    [sources_ addObjectsFromArray:[database_ sources]];
+    _trace();
+    [sources_ sortUsingSelector:@selector(compareByNameAndType:)];
+    _trace();
+
+    int count = [sources_ count];
+    for (offset_ = 0; offset_ != count; ++offset_) {
+        Source *source = [sources_ objectAtIndex:offset_];
+        if ([source record] == nil)
+            break;
+    }
+
+    [list_ reloadData];
+}
+
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
+}
+
+- (void) _leftButtonClicked {
+    /*[book_ pushPage:[[[AddSourceView alloc]
+        initWithBook:book_
+        database:database_
+    ] autorelease]];*/
+
+    UIActionSheet *sheet = [[[UIActionSheet alloc]
+        initWithTitle:@"Enter Cydia/APT URL"
+        buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"source"
+    ] autorelease];
+
+    [sheet setNumberOfRows:1];
+
+    [sheet addTextFieldWithValue:@"http://" label:@""];
+
+    UITextInputTraits *traits = [[sheet textField] textInputTraits];
+    [traits setAutocapitalizationType:0];
+    [traits setKeyboardType:UIKeyboardTypeURL];
+    [traits setAutocorrectionType:1];
+
+    [sheet popupAlertAnimated:YES];
+}
+
+- (void) _rightButtonClicked {
+    UITable *table = [list_ table];
+    BOOL editing = [table isRowDeletionEnabled];
+    [table enableRowDeletion:!editing animated:YES];
+    [book_ reloadButtonsForPage:self];
+}
+
+- (NSString *) title {
+    return @"Sources";
+}
+
+- (NSString *) leftButtonTitle {
+    return [[list_ table] isRowDeletionEnabled] ? @"Add" : nil;
+}
+
+- (NSString *) rightButtonTitle {
+    return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit";
+}
+
+- (UINavigationButtonStyle) rightButtonStyle {
+    return [[list_ table] isRowDeletionEnabled] ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
+
+@end
+/* }}} */
+
+/* Installed View {{{ */
+@interface InstalledView : RVPage {
+    _transient Database *database_;
+    PackageTable *packages_;
+    BOOL expert_;
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+
+@end
+
+@implementation InstalledView
+
+- (void) dealloc {
+    [packages_ release];
+    [super dealloc];
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+
+        packages_ = [[PackageTable alloc]
+            initWithBook:book
+            database:database
+            title:nil
+            filter:@selector(isInstalledAndVisible:)
+            with:[NSNumber numberWithBool:YES]
+        ];
+
+        [self addSubview:packages_];
+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+    } return self;
+}
+
+- (void) resetViewAnimated:(BOOL)animated {
+    [packages_ resetViewAnimated:animated];
+}
+
+- (void) reloadData {
+    [packages_ reloadData];
+}
+
+- (void) _rightButtonClicked {
+    [packages_ setObject:[NSNumber numberWithBool:expert_]];
+    [packages_ reloadData];
+    expert_ = !expert_;
+    [book_ reloadButtonsForPage:self];
+}
+
+- (NSString *) title {
+    return @"Installed";
+}
+
+- (NSString *) backButtonTitle {
+    return @"Packages";
+}
+
+- (NSString *) rightButtonTitle {
+    return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple";
+}
+
+- (UINavigationButtonStyle) rightButtonStyle {
+    return expert_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
+
+- (void) setDelegate:(id)delegate {
+    [super setDelegate:delegate];
+    [packages_ setDelegate:delegate];
+}
+
+@end
+/* }}} */
+
+/* Home View {{{ */
+@interface HomeView : BrowserView {
+}
+
+@end
+
+@implementation HomeView
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"about"])
+        [sheet dismiss];
+    else
+        [super alertSheet:sheet buttonClicked:button];
+}
+
+- (void) _leftButtonClicked {
+    UIActionSheet *sheet = [[[UIActionSheet alloc]
+        initWithTitle:@"About Cydia Installer"
+        buttons:[NSArray arrayWithObjects:@"Close", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"about"
+    ] autorelease];
+
+    [sheet setBodyText:
+        @"Copyright (C) 2008\n"
+        "Jay Freeman (saurik)\n"
+        "saurik@saurik.com\n"
         "http://www.saurik.com/\n"
         "\n"
         "The Okori Group\n"
@@ -3674,71 +4688,988 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         "http://www.ccs.ucsb.edu/"
     ];
 
-    [sheet popupAlertAnimated:YES];
+    [sheet popupAlertAnimated:YES];
+}
+
+- (NSString *) leftButtonTitle {
+    return @"About";
+}
+
+@end
+/* }}} */
+/* Manage View {{{ */
+@interface ManageView : BrowserView {
+}
+
+@end
+
+@implementation ManageView
+
+- (NSString *) title {
+    return @"Manage";
+}
+
+- (void) _leftButtonClicked {
+    [delegate_ askForSettings];
+}
+
+- (NSString *) leftButtonTitle {
+    return @"Settings";
+}
+
+#if !AlwaysReload
+- (NSString *) _rightButtonTitle {
+    return nil;
+}
+#endif
+
+@end
+/* }}} */
+
+@interface WebView (Cydia)
+- (void) setScriptDebugDelegate:(id)delegate;
+- (void) _setFormDelegate:(id)delegate;
+- (void) _setUIKitDelegate:(id)delegate;
+- (void) setWebMailDelegate:(id)delegate;
+- (void) _setLayoutInterval:(float)interval;
+@end
+
+/* Indirect Delegate {{{ */
+@interface IndirectDelegate : NSProxy {
+    _transient volatile id delegate_;
+}
+
+- (void) setDelegate:(id)delegate;
+- (id) initWithDelegate:(id)delegate;
+@end
+
+@implementation IndirectDelegate
+
+- (void) setDelegate:(id)delegate {
+    delegate_ = delegate;
+}
+
+- (id) initWithDelegate:(id)delegate {
+    delegate_ = delegate;
+    return self;
+}
+
+- (NSMethodSignature*) methodSignatureForSelector:(SEL)sel {
+    if (delegate_ != nil)
+        if (NSMethodSignature *sig = [delegate_ methodSignatureForSelector:sel])
+            return sig;
+    // XXX: I fucking hate Apple so very very bad
+    return [NSMethodSignature signatureWithObjCTypes:"v@:"];
+}
+
+- (void) forwardInvocation:(NSInvocation *)inv {
+    SEL sel = [inv selector];
+    if (delegate_ != nil && [delegate_ respondsToSelector:sel])
+        [inv invokeWithTarget:delegate_];
+}
+
+@end
+/* }}} */
+/* Browser Implementation {{{ */
+@implementation BrowserView
+
+- (void) dealloc {
+    if (challenge_ != nil)
+        [challenge_ release];
+
+    WebView *webview = [webview_ webView];
+    [webview setFrameLoadDelegate:nil];
+    [webview setResourceLoadDelegate:nil];
+    [webview setUIDelegate:nil];
+    [webview setScriptDebugDelegate:nil];
+    [webview setPolicyDelegate:nil];
+
+    [webview setDownloadDelegate:nil];
+
+    [webview _setFormDelegate:nil];
+    [webview _setUIKitDelegate:nil];
+    [webview setWebMailDelegate:nil];
+    [webview setEditingDelegate:nil];
+
+    [webview_ setDelegate:nil];
+    [webview_ setGestureDelegate:nil];
+
+    //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+
+    [webview close];
+
+#if RecycleWebViews
+    [webview_ removeFromSuperview];
+    [Documents_ addObject:[webview_ autorelease]];
+#else
+    [webview_ release];
+#endif
+
+    [indirect_ setDelegate:nil];
+    [indirect_ release];
+
+    [scroller_ setDelegate:nil];
+
+    [scroller_ release];
+    [urls_ release];
+    [indicator_ release];
+    if (title_ != nil)
+        [title_ release];
+    [super dealloc];
+}
+
+- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
+    [self loadRequest:[NSURLRequest
+        requestWithURL:url
+        cachePolicy:policy
+        timeoutInterval:30.0
+    ]];
+}
+
+- (void) loadURL:(NSURL *)url {
+    [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
+}
+
+- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request {
+    NSMutableURLRequest *copy = [request mutableCopy];
+
+    if (Machine_ != NULL)
+        [copy addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+    if (UniqueID_ != nil)
+        [copy addValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
+
+    if (Role_ != nil)
+        [copy addValue:Role_ forHTTPHeaderField:@"X-Role"];
+
+    return copy;
+}
+
+- (void) loadRequest:(NSURLRequest *)request {
+    pushed_ = true;
+    [webview_ loadRequest:request];
+}
+
+- (void) reloadURL {
+    if ([urls_ count] == 0)
+        return;
+    NSURL *url = [[[urls_ lastObject] retain] autorelease];
+    [urls_ removeLastObject];
+    [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData];
+}
+
+- (WebView *) webView {
+    return [webview_ webView];
+}
+
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
+    [scroller_ setContentSize:frame.size];
+}
+
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
+    [self view:sender didSetFrame:frame];
+}
+
+- (void) pushPage:(RVPage *)page {
+    [self setBackButtonTitle:title_];
+    [page setDelegate:delegate_];
+    [book_ pushPage:page];
+}
+
+- (BOOL) getSpecial:(NSURL *)url {
+    NSString *href([url absoluteString]);
+    NSString *scheme([[url scheme] lowercaseString]);
+
+    RVPage *page = nil;
+
+    if ([href hasPrefix:@"apptapp://package/"])
+        page = [delegate_ pageForPackage:[href substringFromIndex:18]];
+    else if ([scheme isEqualToString:@"cydia"]) {
+        page = [delegate_ pageForURL:url hasTag:NULL];
+        if (page == nil)
+            return false;
+    } else if (![scheme isEqualToString:@"apptapp"])
+        return false;
+
+    if (page != nil)
+        [self pushPage:page];
+    return true;
+}
+
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+    [window setValue:delegate_ forKey:@"cydia"];
+}
+
+- (void) webView:(WebView *)sender decidePolicyForNewWindowAction:(NSDictionary *)dictionary request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener {
+    if (NSURL *url = [request URL]) {
+        if (![self getSpecial:url]) {
+            NSString *scheme([[url scheme] lowercaseString]);
+            if ([scheme isEqualToString:@"mailto"])
+                [delegate_ openMailToURL:url];
+            else goto use;
+        }
+
+        [listener ignore];
+    } else use:
+        [listener use];
+}
+
+- (void) webView:(WebView *)webView decidePolicyForMIMEType:(NSString *)type request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
+    if ([WebView canShowMIMEType:type])
+        [listener use];
+    else {
+        // XXX: handle more mime types!
+        [listener ignore];
+        if (frame == [webView mainFrame])
+            [UIApp openURL:[request URL]];
+    }
+}
+
+- (void) webView:(WebView *)sender decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
+    NSURL *url([request URL]);
+
+    if (url == nil) use: {
+        [listener use];
+        return;
+    }
+
+    const NSArray *capability(reinterpret_cast<const NSArray *>(GSSystemGetCapability(kGSDisplayIdentifiersCapability)));
+
+    if (
+        [capability containsObject:@"com.apple.Maps"] && [url mapsURL] ||
+        [capability containsObject:@"com.apple.youtube"] && [url youTubeURL]
+    ) {
+      open:
+        [UIApp openURL:url];
+      ignore:
+        [listener ignore];
+        return;
+    }
+
+    int store(_not(int));
+    if (NSURL *itms = [url itmsURL:&store]) {
+        NSLog(@"itms#%@#%u#%@", url, store, itms);
+        if (
+            store == 1 && [capability containsObject:@"com.apple.MobileStore"] ||
+            store == 2 && [capability containsObject:@"com.apple.AppStore"]
+        ) {
+            url = itms;
+            goto open;
+        }
+    }
+
+    NSString *scheme([[url scheme] lowercaseString]);
+
+    if ([scheme isEqualToString:@"tel"]) {
+        // XXX: intelligence
+        goto open;
+    }
+
+    if ([scheme isEqualToString:@"mailto"]) {
+        [delegate_ openMailToURL:url];
+        goto ignore;
+    }
+
+    if ([self getSpecial:url])
+        goto ignore;
+    else if ([WebView _canHandleRequest:request])
+        goto use;
+    else if ([url isSpringboardHandledURL])
+        goto open;
+    else
+        goto use;
+}
+
+- (void) webView:(WebView *)sender setStatusText:(NSString *)text {
+    //lprintf("Status:%s\n", [text UTF8String]);
+}
+
+- (void) _pushPage {
+    if (pushed_)
+        return;
+    pushed_ = true;
+    [book_ pushPage:self];
+}
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"challenge"]) {
+        id<NSURLAuthenticationChallengeSender> sender([challenge_ sender]);
+
+        switch (button) {
+            case 1: {
+                NSString *username([[sheet textFieldAtIndex:0] text]);
+                NSString *password([[sheet textFieldAtIndex:1] text]);
+
+                NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]);
+
+                [sender useCredential:credential forAuthenticationChallenge:challenge_];
+            } break;
+
+            case 2:
+                [sender cancelAuthenticationChallenge:challenge_];
+            break;
+
+            default:
+                _assert(false);
+        }
+
+        [challenge_ release];
+        challenge_ = nil;
+
+        [sheet dismiss];
+    }
+}
+
+- (void) webView:(WebView *)sender resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)source {
+    challenge_ = [challenge retain];
+
+    NSURLProtectionSpace *space([challenge protectionSpace]);
+    NSString *realm([space realm]);
+    if (realm == nil)
+        realm = @"";
+
+    UIActionSheet *sheet = [[[UIActionSheet alloc]
+        initWithTitle:realm
+        buttons:[NSArray arrayWithObjects:@"Login", @"Cancel", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"challenge"
+    ] autorelease];
+
+    [sheet setNumberOfRows:1];
+
+    [sheet addTextFieldWithValue:@"" label:@"username"];
+    [sheet addTextFieldWithValue:@"" label:@"password"];
+
+    UITextField *username([sheet textFieldAtIndex:0]); {
+        UITextInputTraits *traits([username textInputTraits]);
+        [traits setAutocapitalizationType:0];
+        [traits setAutocorrectionType:1];
+    }
+
+    UITextField *password([sheet textFieldAtIndex:1]); {
+        UITextInputTraits *traits([password textInputTraits]);
+        [traits setAutocapitalizationType:0];
+        [traits setAutocorrectionType:1];
+    }
+
+    [sheet popupAlertAnimated:YES];
+}
+
+- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)source {
+    NSURL *url = [request URL];
+    if ([self getSpecial:url])
+        return nil;
+    [self _pushPage];
+    return [self _addHeadersToRequest:request];
+}
+
+- (WebView *) _createWebViewWithRequest:(NSURLRequest *)request pushed:(BOOL)pushed {
+    [self setBackButtonTitle:title_];
+
+    BrowserView *browser = [[[BrowserView alloc] initWithBook:book_] autorelease];
+    [browser setDelegate:delegate_];
+
+    if (pushed) {
+        [browser loadRequest:[self _addHeadersToRequest:request]];
+        [book_ pushPage:browser];
+    }
+
+    return [browser webView];
+}
+
+- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
+    return [self _createWebViewWithRequest:request pushed:(request != nil)];
+}
+
+- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request windowFeatures:(NSDictionary *)features {
+    return [self _createWebViewWithRequest:request pushed:YES];
+}
+
+- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+
+    title_ = [title retain];
+    [book_ reloadTitleForPage:self];
+}
+
+- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+
+    reloading_ = false;
+    loading_ = true;
+    [indicator_ startAnimation];
+    [self reloadButtons];
+
+    if (title_ != nil) {
+        [title_ release];
+        title_ = nil;
+    }
+
+    [book_ reloadTitleForPage:self];
+
+    WebView *webview = [webview_ webView];
+    NSString *href = [webview mainFrameURL];
+    [urls_ addObject:[NSURL URLWithString:href]];
+
+    [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];
+
+    CGRect webrect = [scroller_ bounds];
+    webrect.size.height = 0;
+    [webview_ setFrame:webrect];
+}
+
+- (void) _finishLoading {
+    if (!reloading_) {
+        loading_ = false;
+        [indicator_ stopAnimation];
+        [self reloadButtons];
+    }
+}
+
+- (BOOL) webView:(WebView *)sender shouldScrollToPoint:(struct CGPoint)point forFrame:(WebFrame *)frame {
+    return [webview_ webView:sender shouldScrollToPoint:point forFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didReceiveViewportArguments:(id)arguments forFrame:(WebFrame *)frame {
+    return [webview_ webView:sender didReceiveViewportArguments:arguments forFrame:frame];
+}
+
+- (void) webView:(WebView *)sender needsScrollNotifications:(id)notifications forFrame:(WebFrame *)frame {
+    return [webview_ webView:sender needsScrollNotifications:notifications forFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {
+    return [webview_ webView:sender didCommitLoadForFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didReceiveDocTypeForFrame:(WebFrame *)frame {
+    return [webview_ webView:sender didReceiveDocTypeForFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+    if ([frame parentFrame] == nil)
+        [self _finishLoading];
+    return [webview_ webView:sender didFinishLoadForFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+    [self _finishLoading];
+
+    [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
+        [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],
+        [[error localizedDescription] stringByAddingPercentEscapes]
+    ]]];
+}
+
+- (void) webView:(WebView *)sender addMessageToConsole:(NSDictionary *)dictionary {
+#if ForSaurik
+    lprintf("Console:%s\n", [[dictionary description] UTF8String]);
+#endif
+}
+
+- (id) initWithBook:(RVBook *)book {
+    if ((self = [super initWithBook:book]) != nil) {
+        loading_ = false;
+
+        struct CGRect bounds = [self bounds];
+
+        UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease];
+        [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
+        [self addSubview:pinstripe];
+
+        scroller_ = [[UIScroller alloc] initWithFrame:bounds];
+        [self addSubview:scroller_];
+
+        [scroller_ setScrollingEnabled:YES];
+        [scroller_ setAdjustForContentSizeChange:YES];
+        [scroller_ setClipsSubviews:YES];
+        [scroller_ setAllowsRubberBanding:YES];
+        [scroller_ setScrollDecelerationFactor:0.99];
+        [scroller_ setDelegate:self];
+
+        CGRect webrect = [scroller_ bounds];
+        webrect.size.height = 0;
+
+        WebView *webview;
+
+#if RecycleWebViews
+        webview_ = [Documents_ lastObject];
+        if (webview_ != nil) {
+            webview_ = [webview_ retain];
+            webview = [webview_ webView];
+            [Documents_ removeLastObject];
+            [webview_ setFrame:webrect];
+        } else {
+#else
+        if (true) {
+#endif
+            webview_ = [[UIWebDocumentView alloc] initWithFrame:webrect];
+            webview = [webview_ webView];
+
+            [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
+
+            [webview_ setAllowsMessaging:YES];
+
+            [webview_ setTilingEnabled:YES];
+            [webview_ setDrawsGrid:NO];
+            [webview_ setLogsTilingChanges:NO];
+            [webview_ setTileMinificationFilter:kCAFilterNearest];
+            [webview_ setDetectsPhoneNumbers:NO];
+            [webview_ setAutoresizes:YES];
+
+            [webview_ setViewportSize:CGSizeMake(980, -1) forDocumentTypes:0x10];
+            [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x2];
+            [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x8];
+
+            [webview_ _setDocumentType:0x4];
+
+            [webview_ setZoomsFocusedFormControl:YES];
+            [webview_ setContentsPosition:7];
+            [webview_ setEnabledGestures:0xa];
+            [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:UIGestureAttributeIsZoomRubberBandEnabled];
+            [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:UIGestureAttributeUpdatesScroller];
+
+            [webview_ setSmoothsFonts:YES];
+
+            [webview _setUsesLoaderCache:YES];
+            [webview setGroupName:@"Cydia"];
+            //[webview _setLayoutInterval:0.5];
+        }
+
+        [webview_ setDelegate:self];
+        [webview_ setGestureDelegate:self];
+        [scroller_ addSubview:webview_];
+
+        //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:UIProgressIndicatorStyleMediumWhite];
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 12, indsize.width, indsize.height)];
+        [indicator_ setStyle:UIProgressIndicatorStyleMediumWhite];
+
+        Package *package([[Database sharedInstance] packageWithName:@"cydia"]);
+        NSString *application = package == nil ? @"Cydia" : [NSString
+            stringWithFormat:@"Cydia/%@",
+            [package installed]
+        ]; [webview setApplicationNameForUserAgent:application];
+
+        indirect_ = [[IndirectDelegate alloc] initWithDelegate:self];
+
+        [webview setFrameLoadDelegate:self];
+        [webview setResourceLoadDelegate:indirect_];
+        [webview setUIDelegate:self];
+        [webview setScriptDebugDelegate:self];
+        [webview setPolicyDelegate:self];
+
+        urls_ = [[NSMutableArray alloc] initWithCapacity:16];
+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [scroller_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [pinstripe setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+    } return self;
+}
+
+- (void) didFinishGesturesInView:(UIView *)view forEvent:(id)event {
+    [webview_ redrawScaledDocument];
+}
+
+- (void) _rightButtonClicked {
+    reloading_ = true;
+    [self reloadURL];
+}
+
+- (NSString *) _rightButtonTitle {
+    return @"Reload";
+}
+
+- (NSString *) rightButtonTitle {
+    return loading_ ? @"" : [self _rightButtonTitle];
+}
+
+- (NSString *) title {
+    return title_ == nil ? @"Loading" : title_;
+}
+
+- (NSString *) backButtonTitle {
+    return @"Browser";
+}
+
+- (void) setPageActive:(BOOL)active {
+    if (!active)
+        [indicator_ removeFromSuperview];
+    else
+        [[book_ navigationBar] addSubview:indicator_];
+}
+
+- (void) resetViewAnimated:(BOOL)animated {
+}
+
+- (void) setPushed:(bool)pushed {
+    pushed_ = pushed;
+}
+
+@end
+/* }}} */
+
+/* Cydia Book {{{ */
+@interface CYBook : RVBook <
+    ProgressDelegate
+> {
+    _transient Database *database_;
+    UINavigationBar *overlay_;
+    UINavigationBar *underlay_;
+    UIProgressIndicator *indicator_;
+    UITextLabel *prompt_;
+    UIProgressBar *progress_;
+    UINavigationButton *cancel_;
+    bool updating_;
+    size_t received_;
+    NSTimeInterval last_;
+}
+
+- (id) initWithFrame:(CGRect)frame database:(Database *)database;
+- (void) update;
+- (BOOL) updating;
+
+@end
+
+@implementation CYBook
+
+- (void) dealloc {
+    [overlay_ release];
+    [indicator_ release];
+    [prompt_ release];
+    [progress_ release];
+    [cancel_ release];
+    [super dealloc];
+}
+
+- (NSString *) getTitleForPage:(RVPage *)page {
+    return Simplify([super getTitleForPage:page]);
+}
+
+- (BOOL) updating {
+    return updating_;
+}
+
+- (void) update {
+    [UIView beginAnimations:nil context:NULL];
+
+    CGRect ovrframe = [overlay_ frame];
+    ovrframe.origin.y = 0;
+    [overlay_ setFrame:ovrframe];
+
+    CGRect barframe = [navbar_ frame];
+    barframe.origin.y += ovrframe.size.height;
+    [navbar_ setFrame:barframe];
+
+    CGRect trnframe = [transition_ frame];
+    trnframe.origin.y += ovrframe.size.height;
+    trnframe.size.height -= ovrframe.size.height;
+    [transition_ setFrame:trnframe];
+
+    [UIView endAnimations];
+
+    [indicator_ startAnimation];
+    [prompt_ setText:@"Updating Database"];
+    [progress_ setProgress:0];
+
+    received_ = 0;
+    last_ = [NSDate timeIntervalSinceReferenceDate];
+    updating_ = true;
+    [overlay_ addSubview:cancel_];
+
+    [NSThread
+        detachNewThreadSelector:@selector(_update)
+        toTarget:self
+        withObject:nil
+    ];
+}
+
+- (void) _update_ {
+    updating_ = false;
+
+    [indicator_ stopAnimation];
+
+    [UIView beginAnimations:nil context:NULL];
+
+    CGRect ovrframe = [overlay_ frame];
+    ovrframe.origin.y = -ovrframe.size.height;
+    [overlay_ setFrame:ovrframe];
+
+    CGRect barframe = [navbar_ frame];
+    barframe.origin.y -= ovrframe.size.height;
+    [navbar_ setFrame:barframe];
+
+    CGRect trnframe = [transition_ frame];
+    trnframe.origin.y -= ovrframe.size.height;
+    trnframe.size.height += ovrframe.size.height;
+    [transition_ setFrame:trnframe];
+
+    [UIView commitAnimations];
+
+    [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];
+}
+
+- (id) initWithFrame:(CGRect)frame database:(Database *)database {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        database_ = database;
+
+        CGRect ovrrect = [navbar_ bounds];
+        ovrrect.size.height = [UINavigationBar defaultSize].height;
+        ovrrect.origin.y = -ovrrect.size.height;
+
+        overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect];
+        [self addSubview:overlay_];
+
+        ovrrect.origin.y = frame.size.height;
+        underlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect];
+        [underlay_ setTintColor:[UIColor colorWithRed:0.23 green:0.23 blue:0.23 alpha:1]];
+        [self addSubview:underlay_];
+
+        [overlay_ setBarStyle:1];
+        [underlay_ setBarStyle:1];
+
+        int barstyle = [overlay_ _barStyle:NO];
+        bool ugly = barstyle == 0;
+
+        UIProgressIndicatorStyle style = ugly ?
+            UIProgressIndicatorStyleMediumBrown :
+            UIProgressIndicatorStyleMediumWhite;
+
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
+        unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
+        CGRect indrect = {{indoffset, indoffset}, indsize};
+
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
+        [indicator_ setStyle:style];
+        [overlay_ addSubview:indicator_];
+
+        CGSize prmsize = {215, indsize.height + 4};
+
+        CGRect prmrect = {{
+            indoffset * 2 + indsize.width,
+#ifdef __OBJC2__
+            -1 +
+#endif
+            unsigned(ovrrect.size.height - prmsize.height) / 2
+        }, prmsize};
+
+        UIFont *font = [UIFont systemFontOfSize:15];
+
+        prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
+
+        [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
+        [prompt_ setBackgroundColor:[UIColor clearColor]];
+        [prompt_ setFont:font];
+
+        [overlay_ addSubview:prompt_];
+
+        CGSize prgsize = {75, 100};
+
+        CGRect prgrect = {{
+            ovrrect.size.width - prgsize.width - 10,
+            (ovrrect.size.height - prgsize.height) / 2
+        } , prgsize};
+
+        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
+        [progress_ setStyle:0];
+        [overlay_ addSubview:progress_];
+
+        cancel_ = [[UINavigationButton alloc] initWithTitle:@"Cancel" style:UINavigationButtonStyleHighlighted];
+        [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside];
+
+        CGRect frame = [cancel_ frame];
+        frame.size.width = 65;
+        frame.origin.x = ovrrect.size.width - frame.size.width - 5;
+        frame.origin.y = (ovrrect.size.height - frame.size.height) / 2;
+        [cancel_ setFrame:frame];
+
+        [cancel_ setBarStyle:barstyle];
+    } return self;
+}
+
+- (void) _onCancel {
+    updating_ = false;
+    [cancel_ removeFromSuperview];
+}
+
+- (void) _update { _pooled
+    Status status;
+    status.setDelegate(self);
+
+    [database_ updateWithStatus:status];
+
+    [self
+        performSelectorOnMainThread:@selector(_update_)
+        withObject:nil
+        waitUntilDone:NO
+    ];
+}
+
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
 }
 
-- (void) _rightButtonClicked {
-    reloading_ = true;
-    [self reloadURL];
+- (void) setProgressTitle:(NSString *)title {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressTitle:)
+        withObject:title
+        waitUntilDone:YES
+    ];
 }
 
-- (NSString *) leftButtonTitle {
-    return @"About";
+- (void) setProgressPercent:(float)percent {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressPercent:)
+        withObject:[NSNumber numberWithFloat:percent]
+        waitUntilDone:YES
+    ];
 }
 
-- (NSString *) rightButtonTitle {
-    return loading_ ? @"" : @"Reload";
+- (void) startProgress {
 }
 
-- (NSString *) title {
-    return nil;
+- (void) addProgressOutput:(NSString *)output {
+    [self
+        performSelectorOnMainThread:@selector(_addProgressOutput:)
+        withObject:output
+        waitUntilDone:YES
+    ];
 }
 
-- (NSString *) backButtonTitle {
-    return @"Browser";
+- (bool) isCancelling:(size_t)received {
+    NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
+    if (received_ != received) {
+        received_ = received;
+        last_ = now;
+    } else if (now - last_ > 15)
+        return true;
+    return !updating_;
 }
 
-- (void) setPageActive:(BOOL)active {
-    if (active)
-        [book_ addSubview:indicator_];
-    else
-        [indicator_ removeFromSuperview];
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];
 }
 
-- (void) resetViewAnimated:(BOOL)animated {
+- (void) _setProgressTitle:(NSString *)title {
+    [prompt_ setText:title];
+}
+
+- (void) _setProgressPercent:(NSNumber *)percent {
+    [progress_ setProgress:[percent floatValue]];
+}
+
+- (void) _addProgressOutput:(NSString *)output {
 }
 
 @end
 /* }}} */
+/* Cydia:// Protocol {{{ */
+@interface CydiaURLProtocol : NSURLProtocol {
+}
 
-@interface CYBook : RVBook <
-    ProgressDelegate
-> {
-    _transient Database *database_;
-    UIView *overlay_;
-    UIProgressIndicator *indicator_;
-    UITextLabel *prompt_;
-    UIProgressBar *progress_;
-    bool updating_;
+@end
+
+@implementation CydiaURLProtocol
+
++ (BOOL) canInitWithRequest:(NSURLRequest *)request {
+    NSURL *url([request URL]);
+    if (url == nil)
+        return NO;
+    NSString *scheme([[url scheme] lowercaseString]);
+    if (scheme == nil || ![scheme isEqualToString:@"cydia"])
+        return NO;
+    return YES;
 }
 
-- (id) initWithFrame:(CGRect)frame database:(Database *)database;
-- (void) update;
-- (BOOL) updating;
++ (NSURLRequest *) canonicalRequestForRequest:(NSURLRequest *)request {
+    return request;
+}
+
+- (void) startLoading {
+    id<NSURLProtocolClient> client([self client]);
+    NSURLRequest *request([self request]);
+
+    NSURL *url([request URL]);
+    NSString *href([url absoluteString]);
+
+    NSString *path([href substringFromIndex:8]);
+    NSRange slash([path rangeOfString:@"/"]);
+
+    NSString *command;
+    if (slash.location == NSNotFound) {
+        command = path;
+        path = nil;
+    } else {
+        command = [path substringToIndex:slash.location];
+        path = [path substringFromIndex:(slash.location + 1)];
+    }
+
+    Database *database([Database sharedInstance]);
+
+    if ([command isEqualToString:@"package-icon"]) {
+        if (path == nil)
+            goto fail;
+        path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+        Package *package([database packageWithName:path]);
+        if (package == nil)
+            goto fail;
+
+        UIImage *icon([package icon]);
+
+        NSData *data(UIImagePNGRepresentation(icon));
+
+        NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]);
+        [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+        [client URLProtocol:self didLoadData:data];
+        [client URLProtocolDidFinishLoading:self];
+    } else if ([command isEqualToString:@"section-icon"]) {
+        if (path == nil)
+            goto fail;
+        path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+        NSString *section(Simplify(path));
+
+        UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]]);
+        if (icon == nil)
+            icon = [UIImage applicationImageNamed:@"unknown.png"];
+
+        NSData *data(UIImagePNGRepresentation(icon));
+
+        NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]);
+        [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+        [client URLProtocol:self didLoadData:data];
+        [client URLProtocolDidFinishLoading:self];
+    } else fail: {
+        [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorResourceUnavailable userInfo:nil]];
+    }
+}
+
+- (void) stopLoading {
+}
 
 @end
+/* }}} */
 
 /* Install View {{{ */
 @interface InstallView : RVPage {
     _transient Database *database_;
-    NSMutableArray *packages_;
     NSMutableArray *sections_;
+    NSMutableArray *filtered_;
+    UITransitionView *transition_;
     UITable *list_;
     UIView *accessory_;
+    BOOL editing_;
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database;
 - (void) reloadData;
+- (void) resetView;
 
 @end
 
@@ -3748,15 +5679,16 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [list_ setDataSource:nil];
     [list_ setDelegate:nil];
 
-    [packages_ release];
     [sections_ release];
+    [filtered_ release];
+    [transition_ release];
     [list_ release];
     [accessory_ release];
     [super dealloc];
 }
 
 - (int) numberOfRowsInTable:(UITable *)table {
-    return [sections_ count] + 1;
+    return editing_ ? [sections_ count] : [filtered_ count] + 1;
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
@@ -3766,12 +5698,19 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
     if (reusing == nil)
         reusing = [[[SectionCell alloc] init] autorelease];
-    [(SectionCell *)reusing setSection:(row == 0 ? nil : [sections_ objectAtIndex:(row - 1)])];
+    [(SectionCell *)reusing setSection:(editing_ ?
+        [sections_ objectAtIndex:row] :
+        (row == 0 ? nil : [filtered_ objectAtIndex:(row - 1)])
+    ) editing:editing_];
     return reusing;
 }
 
 - (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
-    return YES;
+    return !editing_;
+}
+
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+    return !editing_;
 }
 
 - (void) tableRowSelected:(NSNotification *)notification {
@@ -3788,7 +5727,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         name = nil;
         title = @"All Packages";
     } else {
-        section = [sections_ objectAtIndex:(row - 1)];
+        section = [filtered_ objectAtIndex:(row - 1)];
         name = [section name];
 
         if (name != nil)
@@ -3803,7 +5742,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         initWithBook:book_
         database:database_
         title:title
-        filter:@selector(isUninstalledInSection:)
+        filter:@selector(isVisiblyUninstalledInSection:)
         with:name
     ] autorelease];
 
@@ -3816,11 +5755,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     if ((self = [super initWithBook:book]) != nil) {
         database_ = database;
 
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
         sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        filtered_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-        list_ = [[UITable alloc] initWithFrame:[self bounds]];
-        [self addSubview:list_];
+        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
+        [self addSubview:transition_];
+
+        list_ = [[UITable alloc] initWithFrame:[transition_ bounds]];
+        [transition_ transition:0 toView:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
@@ -3835,51 +5777,100 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [list_ setReusesTableCells:YES];
 
         [self reloadData];
+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
 - (void) reloadData {
     NSArray *packages = [database_ packages];
 
-    [packages_ removeAllObjects];
     [sections_ removeAllObjects];
+    [filtered_ removeAllObjects];
 
+    NSMutableArray *filtered = [NSMutableArray arrayWithCapacity:[packages count]];
+    NSMutableDictionary *sections = [NSMutableDictionary dictionaryWithCapacity:32];
+
+    _trace();
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
-        if ([package valid] && [package installed] == nil)
-            [packages_ addObject:package];
+        NSString *name([package section]);
+
+        if (name != nil) {
+            Section *section([sections objectForKey:name]);
+            if (section == nil) {
+                section = [[[Section alloc] initWithName:name] autorelease];
+                [sections setObject:section forKey:name];
+            }
+        }
+
+        if ([package valid] && [package installed] == nil && [package visible])
+            [filtered addObject:package];
     }
+    _trace();
 
-    [packages_ sortUsingSelector:@selector(compareBySection:)];
+    [sections_ addObjectsFromArray:[sections allValues]];
+    [sections_ sortUsingSelector:@selector(compareByName:)];
+
+    _trace();
+    [filtered sortUsingSelector:@selector(compareBySection:)];
+    _trace();
 
     Section *section = nil;
-    for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
+    for (size_t offset = 0, count = [filtered count]; offset != count; ++offset) {
+        Package *package = [filtered objectAtIndex:offset];
         NSString *name = [package section];
 
         if (section == nil || name != nil && ![[section name] isEqualToString:name]) {
-            section = [[[Section alloc] initWithName:name row:offset] autorelease];
-            [sections_ addObject:section];
+            section = name == nil ?
+                [[[Section alloc] initWithName:nil] autorelease] :
+                [sections objectForKey:name];
+            [filtered_ addObject:section];
         }
 
         [section addToCount];
     }
+    _trace();
 
     [list_ reloadData];
+    _trace();
+}
+
+- (void) resetView {
+    if (editing_)
+        [self _rightButtonClicked];
 }
 
 - (void) resetViewAnimated:(BOOL)animated {
     [list_ resetViewAnimated:animated];
 }
 
+- (void) _rightButtonClicked {
+    if ((editing_ = !editing_))
+        [list_ reloadData];
+    else
+        [delegate_ updateData];
+    [book_ reloadTitleForPage:self];
+    [book_ reloadButtonsForPage:self];
+}
+
 - (NSString *) title {
-    return @"Install";
+    return editing_ ? @"Section Visibility" : @"Install by Section";
 }
 
 - (NSString *) backButtonTitle {
     return @"Sections";
 }
 
+- (NSString *) rightButtonTitle {
+    return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit";
+}
+
+- (UINavigationButtonStyle) rightButtonStyle {
+    return editing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
+
 - (UIView *) accessoryView {
     return accessory_;
 }
@@ -3990,6 +5981,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [table setReusesTableCells:YES];
 
         [self reloadData];
+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
@@ -3999,53 +5993,59 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [packages_ removeAllObjects];
     [sections_ removeAllObjects];
 
+    _trace();
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
-        if ([package installed] == nil && [package valid] || [package upgradableAndEssential:NO])
+
+        if (
+            [package installed] == nil && [package valid] && [package visible] ||
+            [package upgradableAndEssential:NO]
+        )
             [packages_ addObject:package];
     }
 
-    [packages_ sortUsingSelector:@selector(compareForChanges:)];
+    _trace();
+    [packages_ radixSortUsingSelector:@selector(compareForChanges) withObject:nil];
+    _trace();
 
-    Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades" row:0] autorelease];
+    Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades"] autorelease];
+    Section *ignored = [[[Section alloc] initWithName:@"Ignored Upgrades"] autorelease];
     Section *section = nil;
+    NSDate *last = nil;
 
     upgrades_ = 0;
     bool unseens = false;
 
-    CFLocaleRef locale = CFLocaleCopyCurrent();
-    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
 
+    _trace();
     for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
 
-        if ([package upgradableAndEssential:YES]) {
-            ++upgrades_;
-            [upgradable addToCount];
-        } else {
+        if (![package upgradableAndEssential:YES]) {
             unseens = true;
             NSDate *seen = [package seen];
 
-            NSString *name;
-
-            if (seen == nil)
-                name = [@"n/a ?" retain];
-            else {
-                name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
-            }
+            if (section == nil || last != seen && (seen == nil || [seen compare:last] != NSOrderedSame)) {
+                last = seen;
 
-            if (section == nil || ![[section name] isEqualToString:name]) {
+                NSString *name(seen == nil ? [@"n/a ?" retain] : (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen));
                 section = [[[Section alloc] initWithName:name row:offset] autorelease];
                 [sections_ addObject:section];
+                [name release];
             }
 
-            [name release];
             [section addToCount];
+        } else if ([package ignored])
+            [ignored addToCount];
+        else {
+            ++upgrades_;
+            [upgradable addToCount];
         }
     }
+    _trace();
 
     CFRelease(formatter);
-    CFRelease(locale);
 
     if (unseens) {
         Section *last = [sections_ lastObject];
@@ -4054,6 +6054,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [sections_ removeLastObject];
     }
 
+    if ([ignored count] != 0)
+        [sections_ insertObject:ignored atIndex:0];
     if (upgrades_ != 0)
         [sections_ insertObject:upgradable atIndex:0];
 
@@ -4070,44 +6072,13 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (NSString *) rightButtonTitle {
-    return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade All (%u)", upgrades_];
+    return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade (%u)", upgrades_];
 }
 
 - (NSString *) title {
     return @"Changes";
 }
 
-@end
-/* }}} */
-/* Manage View {{{ */
-@interface ManageView : PackageTable {
-}
-
-- (id) initWithBook:(RVBook *)book database:(Database *)database;
-
-@end
-
-@implementation ManageView
-
-- (id) initWithBook:(RVBook *)book database:(Database *)database {
-    if ((self = [super
-        initWithBook:book
-        database:database
-        title:nil
-        filter:@selector(isInstalledInSection:)
-        with:nil
-    ]) != nil) {
-    } return self;
-}
-
-- (NSString *) title {
-    return @"Installed Packages";
-}
-
-- (NSString *) backButtonTitle {
-    return @"All Packages";
-}
-
 @end
 /* }}} */
 /* Search View {{{ */
@@ -4134,9 +6105,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 @implementation SearchView
 
 - (void) dealloc {
-#ifndef __OBJC2__
-    [[field_ textTraits] setEditingDelegate:nil];
-#endif
     [field_ setDelegate:nil];
 
     [accessory_ release];
@@ -4255,57 +6223,70 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
         dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
         CGColor dimmed(space_, 0, 0, 0, 0.5);
-        [dimmed_ setBackgroundColor:dimmed];
+        [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]];
 
         table_ = [[PackageTable alloc]
             initWithBook:book
             database:database
             title:nil
-            filter:@selector(isSearchedForBy:)
+            filter:@selector(isUnfilteredAndSearchedForBy:)
             with:nil
         ];
 
         [table_ setShouldHideHeaderInShortLists:NO];
         [transition_ transition:0 toView:table_];
 
-        CGRect cnfrect = {{1, 38}, {17, 18}};
+        CGRect cnfrect = {{
+#ifdef __OBJC2__
+        6 +
+#endif
+        1, 38}, {17, 18}};
 
         CGRect area;
-        area.origin.x = cnfrect.size.width + 15;
-        area.origin.y = 30;
-        area.size.width = [self bounds].size.width - area.origin.x - 18;
+        area.origin.x = /*cnfrect.origin.x + cnfrect.size.width + 4 +*/ 10;
+        area.origin.y = 1;
+
+        area.size.width =
+#ifdef __OBJC2__
+            8 +
+#endif
+            [self bounds].size.width - area.origin.x - 18;
+
         area.size.height = [UISearchField defaultHeight];
 
         field_ = [[UISearchField alloc] initWithFrame:area];
 
-        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        UIFont *font = [UIFont systemFontOfSize:16];
         [field_ setFont:font];
-        CFRelease(font);
 
         [field_ setPlaceholder:@"Package Names & Descriptions"];
-        [field_ setPaddingTop:5];
         [field_ setDelegate:self];
 
-#ifndef __OBJC2__
-        UITextTraits *traits = [field_ textTraits];
-        [traits setEditingDelegate:self];
+        [field_ setPaddingTop:5];
+
+        UITextInputTraits *traits = [field_ textInputTraits];
+        [traits setAutocapitalizationType:0];
+        [traits setAutocorrectionType:1];
         [traits setReturnKeyType:6];
-        [traits setAutoCapsType:0];
-        [traits setAutoCorrectionType:1];
-#endif
 
-        UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
+        CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height}};
+
+        accessory_ = [[UIView alloc] initWithFrame:accrect];
+        [accessory_ addSubview:field_];
+
+        /*UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
         [configure setShowPressFeedback:YES];
         [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
         [configure addTarget:self action:@selector(configurePushed) forEvents:1];
+        [accessory_ addSubview:configure];*/
 
-        accessory_ = [[UIView alloc] initWithFrame:CGRectMake(0, 6, cnfrect.size.width + area.size.width + 6 * 3, area.size.height + 30)];
-        [accessory_ addSubview:field_];
-        [accessory_ addSubview:configure];
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [table_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
     } return self;
 }
 
 - (void) flipPage {
+#ifndef __OBJC2__
     LKAnimation *animation = [LKTransition animation];
     [animation setType:@"oglFlip"];
     [animation setTimingFunction:[LKTimingFunction functionWithName:@"easeInEaseOut"]];
@@ -4317,6 +6298,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [[transition_ _layer] addAnimation:animation forKey:0];
     [transition_ transition:0 toView:(flipped_ ? (UIView *) table_ : (UIView *) advanced_)];
     flipped_ = !flipped_;
+#endif
 }
 
 - (void) configurePushed {
@@ -4330,6 +6312,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [table_ resetViewAnimated:animated];
 }
 
+- (void) _reloadData {
+}
+
 - (void) reloadData {
     if (flipped_)
         [self flipPage];
@@ -4358,154 +6343,236 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 @end
 /* }}} */
 
-@implementation CYBook
+@interface SettingsView : RVPage {
+    _transient Database *database_;
+    NSString *name_;
+    Package *package_;
+    UIPreferencesTable *table_;
+    _UISwitchSlider *subscribedSwitch_;
+    _UISwitchSlider *ignoredSwitch_;
+    UIPreferencesControlTableCell *subscribedCell_;
+    UIPreferencesControlTableCell *ignoredCell_;
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package;
+
+@end
+
+@implementation SettingsView
 
 - (void) dealloc {
-    [overlay_ release];
-    [indicator_ release];
-    [prompt_ release];
-    [progress_ release];
+    [table_ setDataSource:nil];
+
+    [name_ release];
+    if (package_ != nil)
+        [package_ release];
+    [table_ release];
+    [subscribedSwitch_ release];
+    [ignoredSwitch_ release];
+    [subscribedCell_ release];
+    [ignoredCell_ release];
     [super dealloc];
 }
 
-- (NSString *) getTitleForPage:(RVPage *)page {
-    return Simplify([super getTitleForPage:page]);
+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+    if (package_ == nil)
+        return 0;
+
+    return 2;
+}
+
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
+    if (package_ == nil)
+        return nil;
+
+    switch (group) {
+        case 0: return nil;
+        case 1: return nil;
+
+        default: _assert(false);
+    }
+
+    return nil;
 }
 
-- (BOOL) updating {
-    return updating_;
-}
+- (BOOL) preferencesTable:(UIPreferencesTable *)table isLabelGroup:(int)group {
+    if (package_ == nil)
+        return NO;
 
-- (void) update {
-    [navbar_ setPrompt:@""];
-    [navbar_ addSubview:overlay_];
-    [indicator_ startAnimation];
-    [prompt_ setText:@"Updating Database..."];
-    [progress_ setProgress:0];
+    switch (group) {
+        case 0: return NO;
+        case 1: return YES;
 
-    updating_ = true;
+        default: _assert(false);
+    }
 
-    [NSThread
-        detachNewThreadSelector:@selector(_update)
-        toTarget:self
-        withObject:nil
-    ];
+    return NO;
 }
 
-- (void) _update_ {
-    updating_ = false;
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+    if (package_ == nil)
+        return 0;
 
-    [overlay_ removeFromSuperview];
-    [indicator_ stopAnimation];
-    [delegate_ reloadData];
+    switch (group) {
+        case 0: return 1;
+        case 1: return 1;
+
+        default: _assert(false);
+    }
 
-    [self setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+    return 0;
 }
 
-- (id) initWithFrame:(CGRect)frame database:(Database *)database {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        database_ = database;
+- (void) onSomething:(UIPreferencesControlTableCell *)cell withKey:(NSString *)key {
+    if (package_ == nil)
+        return;
 
-        if (Advanced_)
-            [navbar_ setBarStyle:1];
+    _UISwitchSlider *slider([cell control]);
+    BOOL value([slider value] != 0);
+    NSMutableDictionary *metadata([package_ metadata]);
 
-        CGRect ovrrect = [navbar_ bounds];
-        ovrrect.size.height = [UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height;
+    BOOL before;
+    if (NSNumber *number = [metadata objectForKey:key])
+        before = [number boolValue];
+    else
+        before = NO;
 
-        overlay_ = [[UIView alloc] initWithFrame:ovrrect];
+    if (value != before) {
+        [metadata setObject:[NSNumber numberWithBool:value] forKey:key];
+        Changed_ = true;
+        [delegate_ updateData];
+    }
+}
 
-        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:2];
-        unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
-        CGRect indrect = {{indoffset, indoffset}, indsize};
+- (void) onSubscribed:(UIPreferencesControlTableCell *)cell {
+    [self onSomething:cell withKey:@"IsSubscribed"];
+}
 
-        indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
-        [indicator_ setStyle:(Advanced_ ? 2 : 3)];
-        [overlay_ addSubview:indicator_];
+- (void) onIgnored:(UIPreferencesControlTableCell *)cell {
+    [self onSomething:cell withKey:@"IsIgnored"];
+}
 
-        CGSize prmsize = {200, indsize.width};
+- (id) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
+    if (package_ == nil)
+        return nil;
 
-        CGRect prmrect = {{
-            indoffset * 2 + indsize.width,
-            (ovrrect.size.height - prmsize.height) / 2
-        }, prmsize};
+    switch (group) {
+        case 0: switch (row) {
+            case 0:
+                return subscribedCell_;
+            case 1:
+                return ignoredCell_;
+            default: _assert(false);
+        } break;
 
-        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12);
+        case 1: switch (row) {
+            case 0: {
+                UIPreferencesControlTableCell *cell([[[UIPreferencesControlTableCell alloc] init] autorelease]);
+                [cell setShowSelection:NO];
+                [cell setTitle:@"Changes only shows upgrades to installed packages so as to minimize spam from packagers. Activate this to see upgrades to this package even when it is not installed."];
+                return cell;
+            }
 
-        prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
+            default: _assert(false);
+        } break;
 
-        [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];
-        [prompt_ setBackgroundColor:Clear_];
-        [prompt_ setFont:font];
+        default: _assert(false);
+    }
 
-        CFRelease(font);
+    return nil;
+}
 
-        [overlay_ addSubview:prompt_];
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package {
+    if ((self = [super initWithBook:book])) {
+        database_ = database;
+        name_ = [package retain];
 
-        CGSize prgsize = {75, 100};
+        table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
+        [self addSubview:table_];
 
-        CGRect prgrect = {{
-            ovrrect.size.width - prgsize.width - 10,
-            (ovrrect.size.height - prgsize.height) / 2
-        } , prgsize};
+        subscribedSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)];
+        [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:kUIControlEventMouseUpInside];
 
-        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
-        [progress_ setStyle:0];
-        [overlay_ addSubview:progress_];
-    } return self;
-}
+        ignoredSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)];
+        [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:kUIControlEventMouseUpInside];
 
-- (void) _update {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        subscribedCell_ = [[UIPreferencesControlTableCell alloc] init];
+        [subscribedCell_ setShowSelection:NO];
+        [subscribedCell_ setTitle:@"Show All Changes"];
+        [subscribedCell_ setControl:subscribedSwitch_];
 
-    Status status;
-    status.setDelegate(self);
+        ignoredCell_ = [[UIPreferencesControlTableCell alloc] init];
+        [ignoredCell_ setShowSelection:NO];
+        [ignoredCell_ setTitle:@"Ignore Upgrades"];
+        [ignoredCell_ setControl:ignoredSwitch_];
 
-    [database_ updateWithStatus:status];
+        [table_ setDataSource:self];
+        [self reloadData];
+    } return self;
+}
 
-    [self
-        performSelectorOnMainThread:@selector(_update_)
-        withObject:nil
-        waitUntilDone:NO
-    ];
+- (void) resetViewAnimated:(BOOL)animated {
+    [table_ resetViewAnimated:animated];
+}
+
+- (void) reloadData {
+    if (package_ != nil)
+        [package_ autorelease];
+    package_ = [database_ packageWithName:name_];
+    if (package_ != nil) {
+        [package_ retain];
+        [subscribedSwitch_ setValue:([package_ subscribed] ? 1 : 0) animated:NO];
+        [ignoredSwitch_ setValue:([package_ ignored] ? 1 : 0) animated:NO];
+    }
 
-    [pool release];
+    [table_ reloadData];
 }
 
-- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
-    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
+- (NSString *) title {
+    return @"Settings";
 }
 
-- (void) setProgressTitle:(NSString *)title {
-    [self
-        performSelectorOnMainThread:@selector(_setProgressTitle:)
-        withObject:title
-        waitUntilDone:YES
-    ];
+@end
+
+/* Signature View {{{ */
+@interface SignatureView : BrowserView {
+    _transient Database *database_;
+    NSString *package_;
 }
 
-- (void) setProgressPercent:(float)percent {
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package;
+
+@end
+
+@implementation SignatureView
+
+- (void) dealloc {
+    [package_ release];
+    [super dealloc];
 }
 
-- (void) addProgressOutput:(NSString *)output {
-    [self
-        performSelectorOnMainThread:@selector(_addProgressOutput:)
-        withObject:output
-        waitUntilDone:YES
-    ];
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+    // XXX: dude!
+    [super webView:sender didClearWindowObject:window forFrame:frame];
 }
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
+- (id) initWithBook:(RVBook *)book database:(Database *)database package:(NSString *)package {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+        package_ = [package retain];
+        [self reloadData];
+    } return self;
 }
 
-- (void) _setProgressTitle:(NSString *)title {
-    [prompt_ setText:[title stringByAppendingString:@"..."]];
+- (void) resetViewAnimated:(BOOL)animated {
 }
 
-- (void) _addProgressOutput:(NSString *)output {
+- (void) reloadData {
+    [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"signature" ofType:@"html"]]];
 }
 
 @end
+/* }}} */
 
 @interface Cydia : UIApplication <
     ConfirmationViewDelegate,
@@ -4518,9 +6585,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     UIView *underlay_;
     UIView *overlay_;
     CYBook *book_;
-    UIButtonBar *buttonbar_;
+    UIToolbar *buttonbar_;
 
-    ConfirmationView *confirm_;
+    RVBook *confirm_;
 
     NSMutableArray *essential_;
     NSMutableArray *broken_;
@@ -4531,6 +6598,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     unsigned tag_;
 
     UIKeyboard *keyboard_;
+    UIProgressHUD *hud_;
 
     InstallView *install_;
     ChangesView *changes_;
@@ -4546,7 +6614,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     if ([broken_ count] != 0) {
         int count = [broken_ count];
 
-        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        UIActionSheet *sheet = [[[UIActionSheet alloc]
             initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
             buttons:[NSArray arrayWithObjects:
                 @"Forcibly Clear",
@@ -4562,9 +6630,13 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     } else if (!Ignored_ && [essential_ count] != 0) {
         int count = [essential_ count];
 
-        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        UIActionSheet *sheet = [[[UIActionSheet alloc]
             initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
-            buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
+            buttons:[NSArray arrayWithObjects:
+                @"Upgrade Essential",
+                @"Complete Upgrade",
+                @"Ignore (Temporary)",
+            nil]
             defaultButtonIndex:0
             delegate:self
             context:@"upgrade"
@@ -4583,19 +6655,13 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
     [database_ reloadData];
 
-    if (Packages_ == nil) {
-        Packages_ = [[NSMutableDictionary alloc] initWithCapacity:128];
-        [Metadata_ setObject:Packages_ forKey:@"Packages"];
-    }
-
     size_t changes(0);
 
     [essential_ removeAllObjects];
     [broken_ removeAllObjects];
 
     NSArray *packages = [database_ packages];
-    for (int i(0), e([packages count]); i != e; ++i) {
-        Package *package = [packages objectAtIndex:i];
+    for (Package *package in packages) {
         if ([package half])
             [broken_ addObject:package];
         if ([package upgradableAndEssential:NO]) {
@@ -4618,33 +6684,78 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [self removeApplicationBadge];
     }
 
+    [self updateData];
+
+#if !ForSaurik
+    if ([packages count] == 0);
+    else if (Loaded_)
+#endif
+        [self _loaded];
+#if !ForSaurik
+    else {
+        Loaded_ = YES;
+        [book_ update];
+    }
+#endif
+
+    /*[hud show:NO];
+    [hud removeFromSuperview];*/
+}
+
+- (void) _saveConfig {
     if (Changed_) {
+        _trace();
         _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+        _trace();
         Changed_ = false;
     }
+}
+
+- (void) updateData {
+    [self _saveConfig];
 
     /* XXX: this is just stupid */
-    if (tag_ != 2)
+    if (tag_ != 2 && install_ != nil)
         [install_ reloadData];
-    if (tag_ != 3)
+    if (tag_ != 3 && changes_ != nil)
         [changes_ reloadData];
-    if (tag_ != 4)
-        [manage_ reloadData];
-    if (tag_ != 5)
+    if (tag_ != 5 && search_ != nil)
         [search_ reloadData];
 
     [book_ reloadData];
+}
 
-    if ([packages count] == 0);
-    else if (Loaded_)
-        [self _loaded];
-    else {
-        Loaded_ = YES;
-        [book_ update];
+- (void) update_ {
+    [database_ update];
+}
+
+- (void) syncData {
+    FILE *file = fopen("/etc/apt/sources.list.d/cydia.list", "w");
+    _assert(file != NULL);
+
+    NSArray *keys = [Sources_ allKeys];
+
+    for (int i(0), e([keys count]); i != e; ++i) {
+        NSString *key = [keys objectAtIndex:i];
+        NSDictionary *source = [Sources_ objectForKey:key];
+
+        fprintf(file, "%s %s %s\n",
+            [[source objectForKey:@"Type"] UTF8String],
+            [[source objectForKey:@"URI"] UTF8String],
+            [[source objectForKey:@"Distribution"] UTF8String]
+        );
     }
 
-    /*[hud show:NO];
-    [hud removeFromSuperview];*/
+    fclose(file);
+
+    [self _saveConfig];
+
+    [progress_
+        detachNewThreadSelector:@selector(update_)
+        toTarget:self
+        withObject:nil
+        title:@"Updating Sources"
+    ];
 }
 
 - (void) reloadData {
@@ -4665,31 +6776,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (void) perform {
     [database_ prepare];
 
-    if ([database_ cache]->BrokenCount() == 0)
-        confirm_ = [[ConfirmationView alloc] initWithView:underlay_ database:database_ delegate:self];
-    else {
-        NSMutableArray *broken = [NSMutableArray arrayWithCapacity:16];
-        NSArray *packages = [database_ packages];
-
-        for (size_t i(0); i != [packages count]; ++i) {
-            Package *package = [packages objectAtIndex:i];
-            if ([package broken])
-                [broken addObject:[package name]];
-        }
-
-        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-            initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()]
-            buttons:[NSArray arrayWithObjects:@"Okay", nil]
-            defaultButtonIndex:0
-            delegate:self
-            context:@"broken"
-        ] autorelease];
+    confirm_ = [[RVBook alloc] initWithFrame:[underlay_ bounds]];
+    [confirm_ setDelegate:self];
 
-        [sheet setBodyText:[NSString stringWithFormat:@"The following packages have unmet dependencies:\n\n%@", [broken componentsJoinedByString:@"\n"]]];
-        [sheet popupAlertAnimated:YES];
+    ConfirmationView *page([[[ConfirmationView alloc] initWithBook:confirm_ database:database_] autorelease]);
+    [page setDelegate:self];
 
-        [self _reloadData];
-    }
+    [confirm_ setPage:page];
+    [underlay_ popSubview:confirm_];
 }
 
 - (void) installPackage:(Package *)package {
@@ -4717,9 +6811,11 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (void) cancel {
     @synchronized (self) {
-        [confirm_ release];
-        confirm_ = nil;
         [self _reloadData];
+        if (confirm_ != nil) {
+            [confirm_ release];
+            confirm_ = nil;
+        }
     }
 }
 
@@ -4731,92 +6827,33 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         detachNewThreadSelector:@selector(perform)
         toTarget:database_
         withObject:nil
-        title:@"Running..."
-    ];
-}
-
-- (void) bootstrap_ {
-    [database_ update];
-    [database_ upgrade];
-    [database_ prepare];
-    [database_ perform];
-}
-
-- (void) bootstrap {
-    [progress_
-        detachNewThreadSelector:@selector(bootstrap_)
-        toTarget:self
-        withObject:nil
-        title:@"Bootstrap Install..."
+        title:@"Running"
     ];
 }
 
-- (void) progressViewIsComplete:(ProgressView *)progress {
-    @synchronized (self) {
-        [self _reloadData];
-
-        if (confirm_ != nil) {
-            [underlay_ addSubview:overlay_];
-            [confirm_ removeFromSuperview];
-            [confirm_ release];
-            confirm_ = nil;
-        }
-    }
-}
-
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    NSString *context = [sheet context];
-    if ([context isEqualToString:@"fixhalf"])
-        switch (button) {
-            case 1:
-                @synchronized (self) {
-                    for (int i = 0, e = [broken_ count]; i != e; ++i) {
-                        Package *broken = [broken_ objectAtIndex:i];
-                        [broken remove];
-
-                        NSString *id = [broken id];
-                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
-                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
-                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
-                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
-                    }
-
-                    [self resolve];
-                    [self perform];
-                }
-            break;
-
-            case 2:
-                [broken_ removeAllObjects];
-                [self _loaded];
-            break;
-
-            default:
-                _assert(false);
-        }
-    else if ([context isEqualToString:@"upgrade"])
-        switch (button) {
-            case 1:
-                @synchronized (self) {
-                    for (int i = 0, e = [essential_ count]; i != e; ++i) {
-                        Package *essential = [essential_ objectAtIndex:i];
-                        [essential install];
-                    }
-
-                    [self resolve];
-                    [self perform];
-                }
-            break;
+- (void) bootstrap_ {
+    [database_ update];
+    [database_ upgrade];
+    [database_ prepare];
+    [database_ perform];
+}
 
-            case 2:
-                Ignored_ = YES;
-            break;
+- (void) bootstrap {
+    [progress_
+        detachNewThreadSelector:@selector(bootstrap_)
+        toTarget:self
+        withObject:nil
+        title:@"Bootstrap Install"
+    ];
+}
 
-            default:
-                _assert(false);
-        }
+- (void) progressViewIsComplete:(ProgressView *)progress {
+    if (confirm_ != nil) {
+        [underlay_ addSubview:overlay_];
+        [confirm_ popFromSuperviewAnimated:NO];
+    }
 
-    [sheet dismiss];
+    [self cancel];
 }
 
 - (void) setPage:(RVPage *)page {
@@ -4825,19 +6862,23 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [book_ setPage:page];
 }
 
-- (RVPage *) _setHomePage {
-    BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
-    [self setPage:browser];
-    [browser loadURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]];
+- (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class {
+    BrowserView *browser = [[[_class alloc] initWithBook:book_] autorelease];
+    [browser loadURL:url];
     return browser;
 }
 
+- (void) _setHomePage {
+    [self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]];
+}
+
 - (void) buttonBarItemTapped:(id)sender {
     unsigned tag = [sender tag];
     if (tag == tag_) {
         [book_ resetViewAnimated:YES];
         return;
-    }
+    } else if (tag_ == 2 && tag != 2)
+        [install_ resetView];
 
     switch (tag) {
         case 1: [self _setHomePage]; break;
@@ -4854,56 +6895,53 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (void) applicationWillSuspend {
-    [super applicationWillSuspend];
-
     [database_ clean];
-
-    if (reload_) {
-        pid_t pid = ExecFork();
-        if (pid == 0) {
-            sleep(1);
-            if (pid_t child = fork())
-                waitpid(child, NULL, 0);
-            else {
-                execlp("launchctl", "launchctl", "unload", SpringBoard_, NULL);
-                exit(0);
-            }
-            execlp("launchctl", "launchctl", "load", SpringBoard_, NULL);
-            exit(0);
-        }
-    }
+    [super applicationWillSuspend];
 }
 
-- (void) applicationDidFinishLaunching:(id)unused {
-    _assert(pkgInitConfig(*_config));
-    _assert(pkgInitSystem(*_config, _system));
+- (void) askForSettings {
+    UIActionSheet *role = [[[UIActionSheet alloc]
+        initWithTitle:@"Who Are You?"
+        buttons:[NSArray arrayWithObjects:
+            @"User (Graphical Only)",
+            @"Hacker (+ Command Line)",
+            @"Developer (No Filters)",
+        nil]
+        defaultButtonIndex:-1
+        delegate:self
+        context:@"role"
+    ] autorelease];
 
-    confirm_ = nil;
-    tag_ = 1;
+    [role setBodyText:@"Not all of the packages available via Cydia are designed to be used by all users. Please categorize yourself so that Cydia can apply helpful filters.\n\nThis choice can be changed from \"Settings\" under the \"Manage\" tab."];
+    [role popupAlertAnimated:YES];
+}
 
-    essential_ = [[NSMutableArray alloc] initWithCapacity:4];
-    broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+- (void) finish {
+    if (hud_ != nil) {
+        [self setStatusBarShowsProgress:NO];
 
-    CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
-    window_ = [[UIWindow alloc] initWithContentRect:screenrect];
+        [hud_ show:NO];
+        [hud_ removeFromSuperview];
+        [hud_ autorelease];
+        hud_ = nil;
 
-    [window_ orderFront: self];
-    [window_ makeKey: self];
-    [window_ _setHidden: NO];
+        pid_t pid = ExecFork();
+        if (pid == 0) {
+            execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL);
+            perror("launchctl stop");
+        }
 
-    database_ = [[Database alloc] init];
-    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
-    [database_ setDelegate:progress_];
-    [window_ setContentView:progress_];
+        return;
+    }
 
-    underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
-    [progress_ setContentView:underlay_];
+    if (Role_ == nil) {
+        [self askForSettings];
+        return;
+    }
 
     overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
 
-    if (!bootstrap_)
-        [underlay_ addSubview:overlay_];
-
+    CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     book_ = [[CYBook alloc] initWithFrame:CGRectMake(
         0, 0, screenrect.size.width, screenrect.size.height - 48
     ) database:database_];
@@ -4929,7 +6967,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             @"install-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:2], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Install", kUIButtonBarButtonTitle,
+            @"Sections", kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -4964,7 +7002,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         nil],
     nil];
 
-    buttonbar_ = [[UIButtonBar alloc]
+    buttonbar_ = [[UIToolbar alloc]
         initInView:overlay_
         withFrame:CGRectMake(
             0, screenrect.size.height - ButtonBarHeight_,
@@ -4993,16 +7031,22 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     CGSize keysize = [UIKeyboard defaultSize];
     CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize};
     keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
-    [[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)];
+    //[[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)];
     [overlay_ addSubview:keyboard_];
 
+    if (!bootstrap_)
+        [underlay_ addSubview:overlay_];
+
+    [self reloadData];
+
     install_ = [[InstallView alloc] initWithBook:book_ database:database_];
     changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
-    manage_ = [[ManageView alloc] initWithBook:book_ database:database_];
     search_ = [[SearchView alloc] initWithBook:book_ database:database_];
 
-    [progress_ resetView];
-    [self reloadData];
+    manage_ = (ManageView *) [[self
+        _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]]
+        withClass:[ManageView class]
+    ] retain];
 
     if (bootstrap_)
         [self bootstrap];
@@ -5010,6 +7054,275 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [self _setHomePage];
 }
 
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"fixhalf"]) {
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [broken_ count]; i != e; ++i) {
+                        Package *broken = [broken_ objectAtIndex:i];
+                        [broken remove];
+
+                        NSString *id = [broken id];
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;
+
+            case 2:
+                [broken_ removeAllObjects];
+                [self _loaded];
+            break;
+
+            default:
+                _assert(false);
+        }
+
+        [sheet dismiss];
+    } else if ([context isEqualToString:@"role"]) {
+        switch (button) {
+            case 1: Role_ = @"User"; break;
+            case 2: Role_ = @"Hacker"; break;
+            case 3: Role_ = @"Developer"; break;
+
+            default:
+                Role_ = nil;
+                _assert(false);
+        }
+
+        bool reset = Settings_ != nil;
+
+        Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+            Role_, @"Role",
+        nil];
+
+        [Metadata_ setObject:Settings_ forKey:@"Settings"];
+
+        Changed_ = true;
+
+        if (reset)
+            [self updateData];
+        else
+            [self finish];
+
+        [sheet dismiss];
+    } else if ([context isEqualToString:@"upgrade"]) {
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [essential_ count]; i != e; ++i) {
+                        Package *essential = [essential_ objectAtIndex:i];
+                        [essential install];
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;
+
+            case 2:
+                [self distUpgrade];
+            break;
+
+            case 3:
+                Ignored_ = YES;
+            break;
+
+            default:
+                _assert(false);
+        }
+
+        [sheet dismiss];
+    }
+}
+
+- (void) reorganize { _pooled
+    system("/usr/libexec/cydia/free.sh");
+    [self performSelectorOnMainThread:@selector(finish) withObject:nil waitUntilDone:NO];
+}
+
+- (void) applicationSuspend:(__GSEvent *)event {
+    if (hud_ == nil && ![progress_ isRunning])
+        [super applicationSuspend:event];
+}
+
+- (void) _animateSuspension:(BOOL)arg0 duration:(double)arg1 startTime:(double)arg2 scale:(float)arg3 {
+    if (hud_ == nil)
+        [super _animateSuspension:arg0 duration:arg1 startTime:arg2 scale:arg3];
+}
+
+- (void) _setSuspended:(BOOL)value {
+    if (hud_ == nil)
+        [super _setSuspended:value];
+}
+
+- (UIProgressHUD *) addProgressHUD {
+    UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
+    [hud show:YES];
+    [underlay_ addSubview:hud];
+    return hud;
+}
+
+- (void) openMailToURL:(NSURL *)url {
+// XXX: this makes me sad
+#if 0
+    [[[MailToView alloc] initWithView:underlay_ delegate:self url:url] autorelease];
+#else
+    [UIApp openURL:url];
+#endif
+}
+
+- (RVPage *) pageForPackage:(NSString *)name {
+    if (Package *package = [database_ packageWithName:name]) {
+        PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+        [view setPackage:package];
+        return view;
+    } else {
+        UIActionSheet *sheet = [[[UIActionSheet alloc]
+            initWithTitle:@"Cannot Locate Package"
+            buttons:[NSArray arrayWithObjects:@"Close", nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"missing"
+        ] autorelease];
+
+        [sheet setBodyText:[NSString stringWithFormat:
+            @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
+        , name]];
+
+        [sheet popupAlertAnimated:YES];
+        return nil;
+    }
+}
+
+- (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag {
+    NSString *href = [url absoluteString];
+
+    if (tag != NULL)
+        tag = 0;
+
+    if ([href isEqualToString:@"cydia://add-source"])
+        return [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease];
+    else if ([href isEqualToString:@"cydia://sources"])
+        return [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease];
+    else if ([href isEqualToString:@"cydia://packages"])
+        return [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease];
+    else if ([href hasPrefix:@"cydia://url/"])
+        return [self _pageForURL:[NSURL URLWithString:[href substringFromIndex:12]] withClass:[BrowserView class]];
+    else if ([href hasPrefix:@"cydia://launch/"])
+        [self launchApplicationWithIdentifier:[href substringFromIndex:15] suspended:NO];
+    else if ([href hasPrefix:@"cydia://package-settings/"])
+        return [[[SettingsView alloc] initWithBook:book_ database:database_ package:[href substringFromIndex:25]] autorelease];
+    else if ([href hasPrefix:@"cydia://package-signature/"])
+        return [[[SignatureView alloc] initWithBook:book_ database:database_ package:[href substringFromIndex:26]] autorelease];
+    else if ([href hasPrefix:@"cydia://package/"])
+        return [self pageForPackage:[href substringFromIndex:16]];
+    else if ([href hasPrefix:@"cydia://files/"]) {
+        NSString *name = [href substringFromIndex:14];
+
+        if (Package *package = [database_ packageWithName:name]) {
+            FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
+            [files setPackage:package];
+            return files;
+        }
+    }
+
+    return nil;
+}
+
+- (void) applicationOpenURL:(NSURL *)url {
+    [super applicationOpenURL:url];
+    int tag;
+    if (RVPage *page = [self pageForURL:url hasTag:&tag]) {
+        [self setPage:page];
+        [buttonbar_ showSelectionForButton:tag];
+        tag_ = tag;
+    }
+}
+
+- (void) applicationDidFinishLaunching:(id)unused {
+    Font12_ = [[UIFont systemFontOfSize:12] retain];
+    Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain];
+    Font14_ = [[UIFont systemFontOfSize:14] retain];
+    Font18Bold_ = [[UIFont boldSystemFontOfSize:18] retain];
+    Font22Bold_ = [[UIFont boldSystemFontOfSize:22] retain];
+
+    _assert(pkgInitConfig(*_config));
+    _assert(pkgInitSystem(*_config, _system));
+
+    tag_ = 1;
+
+    essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+    broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+
+    [NSURLProtocol registerClass:[CydiaURLProtocol class]];
+
+    CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
+    window_ = [[UIWindow alloc] initWithContentRect:screenrect];
+
+    [window_ orderFront:self];
+    [window_ makeKey:self];
+    [window_ setHidden:NO];
+
+    database_ = [Database sharedInstance];
+    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
+    [database_ setDelegate:progress_];
+    [window_ setContentView:progress_];
+
+    underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
+    [progress_ setContentView:underlay_];
+
+    [progress_ resetView];
+
+    if (
+        readlink("/Applications", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/Library/Ringtones", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL /*||
+        readlink("/var/lib", NULL, 0) == -1 && errno == EINVAL*/
+    ) {
+        [self setIdleTimerDisabled:YES];
+
+        hud_ = [self addProgressHUD];
+        [hud_ setText:@"Reorganizing\n\nWill Automatically\nClose When Done"];
+
+        [self setStatusBarShowsProgress:YES];
+
+        [NSThread
+            detachNewThreadSelector:@selector(reorganize)
+            toTarget:self
+            withObject:nil
+        ];
+    } else
+        [self finish];
+}
+
+/* Web Scripting {{{ */
++ (NSString *) webScriptNameForSelector:(SEL)selector {
+    if (selector == @selector(supports:))
+        return @"supports";
+    return nil;
+}
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector {
+    return selector != @selector(supports:);
+}
+
+- (BOOL) supports:(NSString *)feature {
+    return [feature isEqualToString:@"window.open"];
+}
+/* }}} */
+
 - (void) showKeyboard:(BOOL)show {
     CGSize keysize = [UIKeyboard defaultSize];
     CGRect keydown = {{0, [overlay_ bounds].size.height}, keysize};
@@ -5036,7 +7349,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     ];
 }
 
-- (void) slideUp:(UIAlertSheet *)alert {
+- (void) slideUp:(UIActionSheet *)alert {
     if (Advanced_)
         [alert presentSheetFromButtonBar:buttonbar_];
     else
@@ -5045,9 +7358,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 @end
 
-void AddPreferences(NSString *plist) {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+void AddPreferences(NSString *plist) { _pooled
     NSMutableDictionary *settings = [[[NSMutableDictionary alloc] initWithContentsOfFile:plist] autorelease];
     _assert(settings != NULL);
     NSMutableArray *items = [settings objectForKey:@"items"];
@@ -5082,30 +7393,50 @@ void AddPreferences(NSString *plist) {
 
         _assert([settings writeToFile:plist atomically:YES] == YES);
     }
-
-    [pool release];
 }
 
 /*IMP alloc_;
 id Alloc_(id self, SEL selector) {
     id object = alloc_(self, selector);
-    fprintf(stderr, "[%s]A-%p\n", self->isa->name, object);
+    lprintf("[%s]A-%p\n", self->isa->name, object);
     return object;
 }*/
 
 /*IMP dealloc_;
 id Dealloc_(id self, SEL selector) {
     id object = dealloc_(self, selector);
-    fprintf(stderr, "[%s]D-%p\n", self->isa->name, object);
+    lprintf("[%s]D-%p\n", self->isa->name, object);
     return object;
 }*/
 
-int main(int argc, char *argv[]) {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+int main(int argc, char *argv[]) { _pooled
+    bool substrate(false);
+
+    if (argc != 0) {
+        char **args(argv);
+        int arge(1);
+
+        for (int argi(1); argi != argc; ++argi)
+            if (strcmp(argv[argi], "--") == 0) {
+                arge = argi;
+                argv[argi] = argv[0];
+                argv += argi;
+                argc -= argi;
+                break;
+            }
 
-    bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
+        for (int argi(1); argi != arge; ++argi)
+            if (strcmp(args[argi], "--bootstrap") == 0)
+                bootstrap_ = true;
+            else if (strcmp(args[argi], "--substrate") == 0)
+                substrate = true;
+            else
+                fprintf(stderr, "unknown argument: %s\n", args[argi]);
+    }
 
+    App_ = [[NSBundle mainBundle] bundlePath];
     Home_ = NSHomeDirectory();
+    Locale_ = CFLocaleCopyCurrent();
 
     {
         NSString *plist = [Home_ stringByAppendingString:@"/Library/Preferences/com.apple.preferences.sounds.plist"];
@@ -5117,6 +7448,13 @@ int main(int argc, char *argv[]) {
     setuid(0);
     setgid(0);
 
+#if 1 /* XXX: this costs 1.4s of startup performance */
+    if (unlink("/var/cache/apt/pkgcache.bin") == -1)
+        _assert(errno == ENOENT);
+    if (unlink("/var/cache/apt/srcpkgcache.bin") == -1)
+        _assert(errno == ENOENT);
+#endif
+
     /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
     alloc_ = alloc->method_imp;
     alloc->method_imp = (IMP) &Alloc_;*/
@@ -5125,56 +7463,95 @@ int main(int argc, char *argv[]) {
     dealloc_ = dealloc->method_imp;
     dealloc->method_imp = (IMP) &Dealloc_;*/
 
-    if (NSDictionary *sysver = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]) {
-        if (NSString *prover = [sysver valueForKey:@"ProductVersion"]) {
-            Firmware_ = strdup([prover UTF8String]);
-            NSArray *versions = [prover componentsSeparatedByString:@"."];
-            int count = [versions count];
-            Major_ = count > 0 ? [[versions objectAtIndex:0] intValue] : 0;
-            Minor_ = count > 1 ? [[versions objectAtIndex:1] intValue] : 0;
-            BugFix_ = count > 2 ? [[versions objectAtIndex:2] intValue] : 0;
-        }
+    size_t size;
+
+    int maxproc;
+    size = sizeof(maxproc);
+    if (sysctlbyname("kern.maxproc", &maxproc, &size, NULL, 0) == -1)
+        perror("sysctlbyname(\"kern.maxproc\", ?)");
+    else if (maxproc < 64) {
+        maxproc = 64;
+        if (sysctlbyname("kern.maxproc", NULL, NULL, &maxproc, sizeof(maxproc)) == -1)
+            perror("sysctlbyname(\"kern.maxproc\", #)");
     }
 
-    size_t size;
     sysctlbyname("hw.machine", NULL, &size, NULL, 0);
     char *machine = new char[size];
-    sysctlbyname("hw.machine", machine, &size, NULL, 0);
-    Machine_ = machine;
-
-    if (CFMutableDictionaryRef dict = IOServiceMatching("IOPlatformExpertDevice"))
-        if (io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, dict)) {
-            if (CFTypeRef serial = IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0)) {
-                SerialNumber_ = strdup(CFStringGetCStringPtr((CFStringRef) serial, CFStringGetSystemEncoding()));
-                CFRelease(serial);
-            }
+    if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1)
+        perror("sysctlbyname(\"hw.machine\", ?)");
+    else
+        Machine_ = machine;
 
-            IOObjectRelease(service);
-        }
+    UniqueID_ = [[UIDevice currentDevice] uniqueIdentifier];
 
     /*AddPreferences(@"/Applications/Preferences.app/Settings-iPhone.plist");
     AddPreferences(@"/Applications/Preferences.app/Settings-iPod.plist");*/
 
     if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL)
         Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2];
-    else
+    else {
+        Settings_ = [Metadata_ objectForKey:@"Settings"];
+
         Packages_ = [Metadata_ objectForKey:@"Packages"];
+        Sections_ = [Metadata_ objectForKey:@"Sections"];
+        Sources_ = [Metadata_ objectForKey:@"Sources"];
+    }
+
+    if (Settings_ != nil)
+        Role_ = [Settings_ objectForKey:@"Role"];
+
+    if (Packages_ == nil) {
+        Packages_ = [[[NSMutableDictionary alloc] initWithCapacity:128] autorelease];
+        [Metadata_ setObject:Packages_ forKey:@"Packages"];
+    }
+
+    if (Sections_ == nil) {
+        Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease];
+        [Metadata_ setObject:Sections_ forKey:@"Sections"];
+    }
+
+    if (Sources_ == nil) {
+        Sources_ = [[[NSMutableDictionary alloc] initWithCapacity:0] autorelease];
+        [Metadata_ setObject:Sources_ forKey:@"Sources"];
+    }
+
+#if RecycleWebViews
+    Documents_ = [[[NSMutableArray alloc] initWithCapacity:4] autorelease];
+#endif
+
+    if (substrate && access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
+        dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);
 
     if (access("/User", F_OK) != 0)
         system("/usr/libexec/cydia/firmware.sh");
 
+    _assert([[NSFileManager defaultManager]
+        createDirectoryAtPath:@"/var/cache/apt/archives/partial"
+        withIntermediateDirectories:YES
+        attributes:nil
+        error:NULL
+    ]);
+
     space_ = CGColorSpaceCreateDeviceRGB();
 
+    Blue_.Set(space_, 0.2, 0.2, 1.0, 1.0);
     Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0);
     Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
-    Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0);
-    Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
+    Off_.Set(space_, 0.9, 0.9, 0.9, 1.0);
     White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
+    Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);
+
+    Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
+
+    SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
+
+    UIApplicationUseLegacyEvents(YES);
+    UIKeyboardDisableAutomaticAppearance();
 
-    int value = UIApplicationMain(argc, argv, [Cydia class]);
+    int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia");
 
     CGColorSpaceRelease(space_);
+    CFRelease(Locale_);
 
-    [pool release];
     return value;
 }