From 90342db143e781a6137d0c5951224d563adb9d67 Mon Sep 17 00:00:00 2001
From: Will Lee <me@vclwei.com>
Date: Thu, 13 Feb 2014 18:14:55 +0800
Subject: [PATCH 1/8] Add Huobi.com RMB ticker.

---
 btcbar.xcodeproj/project.pbxproj              |   6 +
 .../xcshareddata/btcbar.xccheckout            |  41 ------
 btcbar/AppDelegate.h                          |   1 +
 btcbar/AppDelegate.m                          |   1 +
 btcbar/Fetchers/HuobiRMBFetcher.h             |  20 +++
 btcbar/Fetchers/HuobiRMBFetcher.m             | 129 ++++++++++++++++++
 6 files changed, 157 insertions(+), 41 deletions(-)
 delete mode 100644 btcbar.xcodeproj/project.xcworkspace/xcshareddata/btcbar.xccheckout
 create mode 100644 btcbar/Fetchers/HuobiRMBFetcher.h
 create mode 100644 btcbar/Fetchers/HuobiRMBFetcher.m

diff --git a/btcbar.xcodeproj/project.pbxproj b/btcbar.xcodeproj/project.pbxproj
index b4bd13d..a5556f8 100644
--- a/btcbar.xcodeproj/project.pbxproj
+++ b/btcbar.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
 		83C3E7561859702D00FA2921 /* btclogoAlternate.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7521859702D00FA2921 /* btclogoAlternate.png */; };
 		83C3E7571859702D00FA2921 /* btclogoAlternate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */; };
 		83C3E759185970C800FA2921 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E758185970C800FA2921 /* Icon.icns */; };
+		90347B7918ACB073005C42A8 /* HuobiRMBFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 90347B7818ACB073005C42A8 /* HuobiRMBFetcher.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -55,6 +56,8 @@
 		83C3E7521859702D00FA2921 /* btclogoAlternate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = btclogoAlternate.png; path = Icons/btclogoAlternate.png; sourceTree = "<group>"; };
 		83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "btclogoAlternate@2x.png"; path = "Icons/btclogoAlternate@2x.png"; sourceTree = "<group>"; };
 		83C3E758185970C800FA2921 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Icon.icns; path = ../Resources/Icon.icns; sourceTree = "<group>"; };
+		90347B7718ACB073005C42A8 /* HuobiRMBFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HuobiRMBFetcher.h; path = Fetchers/HuobiRMBFetcher.h; sourceTree = "<group>"; };
+		90347B7818ACB073005C42A8 /* HuobiRMBFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HuobiRMBFetcher.m; path = Fetchers/HuobiRMBFetcher.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -156,6 +159,8 @@
 				83C3E7461859700100FA2921 /* CoinbaseUSDFetcher.m */,
 				83C3E7471859700100FA2921 /* MtGoxUSDFetcher.h */,
 				83C3E7481859700100FA2921 /* MtGoxUSDFetcher.m */,
+				90347B7718ACB073005C42A8 /* HuobiRMBFetcher.h */,
+				90347B7818ACB073005C42A8 /* HuobiRMBFetcher.m */,
 			);
 			name = Fetchers;
 			sourceTree = "<group>";
@@ -241,6 +246,7 @@
 				83C3E7491859700100FA2921 /* BitStampUSDFetcher.m in Sources */,
 				830CE09D171B6C3E00DDD525 /* main.m in Sources */,
 				83C3E74C1859700100FA2921 /* MtGoxUSDFetcher.m in Sources */,
+				90347B7918ACB073005C42A8 /* HuobiRMBFetcher.m in Sources */,
 				83C3E74B1859700100FA2921 /* CoinbaseUSDFetcher.m in Sources */,
 				83C3E74A1859700100FA2921 /* BTCeUSDFetcher.m in Sources */,
 				830CE0A4171B6C3E00DDD525 /* AppDelegate.m in Sources */,
diff --git a/btcbar.xcodeproj/project.xcworkspace/xcshareddata/btcbar.xccheckout b/btcbar.xcodeproj/project.xcworkspace/xcshareddata/btcbar.xccheckout
deleted file mode 100644
index ac02bb6..0000000
--- a/btcbar.xcodeproj/project.xcworkspace/xcshareddata/btcbar.xccheckout
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
-	<false/>
-	<key>IDESourceControlProjectIdentifier</key>
-	<string>FEA3D137-DF6F-4BDA-8CB0-0CF70A3DBF94</string>
-	<key>IDESourceControlProjectName</key>
-	<string>btcbar</string>
-	<key>IDESourceControlProjectOriginsDictionary</key>
-	<dict>
-		<key>1CD60776-8AEB-488E-8B85-2F2F5E8F152E</key>
-		<string>https://github.com/nearengine/btcbar.git</string>
-	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>btcbar.xcodeproj/project.xcworkspace</string>
-	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-	<dict>
-		<key>1CD60776-8AEB-488E-8B85-2F2F5E8F152E</key>
-		<string>../..</string>
-	</dict>
-	<key>IDESourceControlProjectURL</key>
-	<string>https://github.com/nearengine/btcbar.git</string>
-	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
-	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>1CD60776-8AEB-488E-8B85-2F2F5E8F152E</string>
-	<key>IDESourceControlProjectWCConfigurations</key>
-	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>1CD60776-8AEB-488E-8B85-2F2F5E8F152E</string>
-			<key>IDESourceControlWCCName</key>
-			<string>btcbar</string>
-		</dict>
-	</array>
-</dict>
-</plist>
diff --git a/btcbar/AppDelegate.h b/btcbar/AppDelegate.h
index d9f3051..5d58e06 100644
--- a/btcbar/AppDelegate.h
+++ b/btcbar/AppDelegate.h
@@ -9,6 +9,7 @@
 #import "BitStampUSDFetcher.h"
 #import "CoinbaseUSDFetcher.h"
 #import "BTCeUSDFetcher.h"
+#import "HuobiRMBFetcher.h"
 
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
     NSMenu *btcbarMainMenu;
diff --git a/btcbar/AppDelegate.m b/btcbar/AppDelegate.m
index f412bb8..3706cdc 100644
--- a/btcbar/AppDelegate.m
+++ b/btcbar/AppDelegate.m
@@ -31,6 +31,7 @@ - (void)awakeFromNib
                [[BTCeUSDFetcher alloc] init],
                [[CoinbaseUSDFetcher alloc] init],
                [[MtGoxUSDFetcher alloc] init],
+               [[HuobiRMBFetcher alloc] init],
                nil];
     
     
diff --git a/btcbar/Fetchers/HuobiRMBFetcher.h b/btcbar/Fetchers/HuobiRMBFetcher.h
new file mode 100644
index 0000000..93e9084
--- /dev/null
+++ b/btcbar/Fetchers/HuobiRMBFetcher.h
@@ -0,0 +1,20 @@
+//
+//  HuobiRMBFetcher.h
+//  btcbar
+//
+//  Created by lwei on 2/13/14.
+//  Copyright (c) 2014 nearengine. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Fetcher.h"
+
+@interface HuobiRMBFetcher : NSObject<Fetcher, NSURLConnectionDelegate>
+
+@property (nonatomic) NSString* ticker;
+@property (nonatomic) NSString* ticker_menu;
+@property (nonatomic) NSString* url;
+@property (nonatomic) NSError* error;
+@property (nonatomic) NSMutableData *responseData;
+
+@end
diff --git a/btcbar/Fetchers/HuobiRMBFetcher.m b/btcbar/Fetchers/HuobiRMBFetcher.m
new file mode 100644
index 0000000..8d70637
--- /dev/null
+++ b/btcbar/Fetchers/HuobiRMBFetcher.m
@@ -0,0 +1,129 @@
+//
+//  HuobiRMBFetcher.m
+//  btcbar
+//
+//  Created by lwei on 2/13/14.
+//  Copyright (c) 2014 nearengine. All rights reserved.
+//
+
+#import "HuobiRMBFetcher.h"
+
+@implementation HuobiRMBFetcher
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        // Menu Item Name
+        self.ticker_menu = @"HuobiRMB";
+        
+        // Website location
+        self.url = @"http://www.huobi.com";
+        
+        // Immediately request first update
+        [self requestUpdate];
+    }
+    
+    return self;
+}
+
+// Override Ticker setter to trigger status item update
+- (void)setTicker:(NSString *)tickerString
+{
+    // Update the ticker value
+    _ticker = tickerString;
+    
+    // Trigger notification to update ticker
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"btcbar_ticker_update" object:self];
+}
+
+// Initiates an asyncronous HTTP connection
+- (void)requestUpdate
+{
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://market.huobi.com/staticmarket/detail.html"]];
+    
+    // Set the request's user agent
+    [request addValue:@"btcbar/2.0 (HuobiRMBFetcher)" forHTTPHeaderField:@"User-Agent"];
+    
+    // Initialize a connection from our request
+    NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request delegate:self];
+    
+    // Go go go
+    [connection start];
+}
+
+// Initializes data storage on request response
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
+{
+    self.responseData = [[NSMutableData alloc] init];
+}
+
+// Appends response data
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{
+    [self.responseData appendData:data];
+}
+
+// Indiciate no caching
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
+{
+    return nil;
+}
+
+// Parse data after load
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection
+{
+    NSString *responseStr = [[NSString alloc] initWithData:self.responseData encoding:NSUTF8StringEncoding];
+    if (!responseStr) {
+        return;
+    }
+    
+    NSRange range = [responseStr rangeOfString:@"(?<=\\().*(?=\\))" options:NSRegularExpressionSearch];
+    if (range.location > responseStr.length || range.location + range.length > responseStr.length) {
+        return;
+    }
+    
+    NSString *resultsStr = [responseStr substringWithRange:range];
+    
+    if (!resultsStr) {
+        return;
+    }
+    
+    // Parse the JSON into results
+    NSError *jsonParsingError = nil;
+    id results = [NSJSONSerialization JSONObjectWithData:[resultsStr dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:&jsonParsingError];
+    
+    // Results parsed successfully from JSON
+    if (results)
+    {
+        NSNumber *ticker = [results objectForKey:@"p_new"];
+        if (ticker) {
+            NSNumberFormatter *currencyStyle = [[NSNumberFormatter alloc] init];
+            currencyStyle.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"zh_CN"];
+            currencyStyle.numberStyle = NSNumberFormatterCurrencyStyle;
+            self.error = nil;
+            self.ticker = [currencyStyle stringFromNumber:ticker];
+        }
+        // Otherwise log an error...
+        else
+        {
+            self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"API Error", NSLocalizedDescriptionKey, @"The JSON received did not contain a result or the API returned an error.", NSLocalizedFailureReasonErrorKey, nil]];
+            self.ticker = nil;
+        }
+    }
+    // JSON parsing failed
+    else
+    {
+        self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"JSON Error", NSLocalizedDescriptionKey, @"Could not parse the JSON returned.", NSLocalizedFailureReasonErrorKey, nil]];
+        self.ticker = nil;
+    }
+}
+
+// HTTP request failed
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
+{
+    self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"Connection Error", NSLocalizedDescriptionKey, @"Could not connect to Huobi.", NSLocalizedFailureReasonErrorKey, nil]];
+    self.ticker = nil;
+}
+
+@end

From 9c8fb0c2e7e5662aa90c98c7de55d6367090c9ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim.daubenschuetz@gmail.com>
Date: Thu, 22 Jan 2015 14:18:32 +0100
Subject: [PATCH 2/8] Added Bitfinex API

---
 btcbar.xcodeproj/project.pbxproj     |   6 ++
 btcbar/AppDelegate.h                 |   1 +
 btcbar/AppDelegate.m                 |   1 +
 btcbar/Fetchers/BitFinexUSDFetcher.h |  22 +++++
 btcbar/Fetchers/BitFinexUSDFetcher.m | 121 +++++++++++++++++++++++++++
 5 files changed, 151 insertions(+)
 create mode 100644 btcbar/Fetchers/BitFinexUSDFetcher.h
 create mode 100644 btcbar/Fetchers/BitFinexUSDFetcher.m

diff --git a/btcbar.xcodeproj/project.pbxproj b/btcbar.xcodeproj/project.pbxproj
index cd8fb22..4949fa6 100644
--- a/btcbar.xcodeproj/project.pbxproj
+++ b/btcbar.xcodeproj/project.pbxproj
@@ -22,6 +22,7 @@
 		83C3E7561859702D00FA2921 /* btclogoAlternate.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7521859702D00FA2921 /* btclogoAlternate.png */; };
 		83C3E7571859702D00FA2921 /* btclogoAlternate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */; };
 		83C3E759185970C800FA2921 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E758185970C800FA2921 /* Icon.icns */; };
+		B662833B1A712EBB00520512 /* BitFinexUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -52,6 +53,8 @@
 		83C3E7521859702D00FA2921 /* btclogoAlternate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = btclogoAlternate.png; path = Icons/btclogoAlternate.png; sourceTree = "<group>"; };
 		83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "btclogoAlternate@2x.png"; path = "Icons/btclogoAlternate@2x.png"; sourceTree = "<group>"; };
 		83C3E758185970C800FA2921 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Icon.icns; path = ../Resources/Icon.icns; sourceTree = "<group>"; };
+		B66283391A712EBB00520512 /* BitFinexUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BitFinexUSDFetcher.h; path = Fetchers/BitFinexUSDFetcher.h; sourceTree = "<group>"; };
+		B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BitFinexUSDFetcher.m; path = Fetchers/BitFinexUSDFetcher.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -147,6 +150,8 @@
 			children = (
 				83C3E7411859700100FA2921 /* BitStampUSDFetcher.h */,
 				83C3E7421859700100FA2921 /* BitStampUSDFetcher.m */,
+				B66283391A712EBB00520512 /* BitFinexUSDFetcher.h */,
+				B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */,
 				83C3E7431859700100FA2921 /* BTCeUSDFetcher.h */,
 				83C3E7441859700100FA2921 /* BTCeUSDFetcher.m */,
 				83C3E7451859700100FA2921 /* CoinbaseUSDFetcher.h */,
@@ -234,6 +239,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				83C3E7491859700100FA2921 /* BitStampUSDFetcher.m in Sources */,
+				B662833B1A712EBB00520512 /* BitFinexUSDFetcher.m in Sources */,
 				830CE09D171B6C3E00DDD525 /* main.m in Sources */,
 				83C3E74B1859700100FA2921 /* CoinbaseUSDFetcher.m in Sources */,
 				83C3E74A1859700100FA2921 /* BTCeUSDFetcher.m in Sources */,
diff --git a/btcbar/AppDelegate.h b/btcbar/AppDelegate.h
index 880053b..c16beae 100644
--- a/btcbar/AppDelegate.h
+++ b/btcbar/AppDelegate.h
@@ -8,6 +8,7 @@
 #import "BitStampUSDFetcher.h"
 #import "CoinbaseUSDFetcher.h"
 #import "BTCeUSDFetcher.h"
+#import "BitFinexUSDFetcher.h"
 
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
     NSMenu *btcbarMainMenu;
diff --git a/btcbar/AppDelegate.m b/btcbar/AppDelegate.m
index 869ec17..5cdf4a4 100644
--- a/btcbar/AppDelegate.m
+++ b/btcbar/AppDelegate.m
@@ -30,6 +30,7 @@ - (void)awakeFromNib
                [[BitStampUSDFetcher alloc] init],
                [[BTCeUSDFetcher alloc] init],
                [[CoinbaseUSDFetcher alloc] init],
+               [[BitFinexUSDFetcher alloc] init],
                nil];
     
     
diff --git a/btcbar/Fetchers/BitFinexUSDFetcher.h b/btcbar/Fetchers/BitFinexUSDFetcher.h
new file mode 100644
index 0000000..192b7c6
--- /dev/null
+++ b/btcbar/Fetchers/BitFinexUSDFetcher.h
@@ -0,0 +1,22 @@
+//
+//  BitFinexUSDFetcher.h
+//  btcbar
+//
+//  Created by Tim Daubenschütz on 22/01/15.
+//  Copyright (c) 2015 nearengine. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Fetcher.h"
+
+@interface BitFinexUSDFetcher : NSObject<Fetcher, NSURLConnectionDelegate>
+
+@property (nonatomic) NSString* ticker;
+@property (nonatomic) NSString* ticker_menu;
+@property (nonatomic) NSString* url;
+@property (nonatomic) NSError* error;
+@property (nonatomic) NSMutableData *responseData;
+
+- (void)requestUpdate;
+
+@end
diff --git a/btcbar/Fetchers/BitFinexUSDFetcher.m b/btcbar/Fetchers/BitFinexUSDFetcher.m
new file mode 100644
index 0000000..a135db4
--- /dev/null
+++ b/btcbar/Fetchers/BitFinexUSDFetcher.m
@@ -0,0 +1,121 @@
+//
+//  BitFinexUSDFetcher.m
+//  btcbar
+//
+//  Created by Tim Daubenschütz on 22/01/15.
+//  Copyright (c) 2015 nearengine. All rights reserved.
+//
+
+#import "BitFinexUSDFetcher.h"
+
+@implementation BitFinexUSDFetcher
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        // Menu Item Name
+        self.ticker_menu = @"BitFinexUSD";
+        
+        // Website location
+        self.url = @"https://www.bitfinex.com/";
+        
+        // Immediately request first update
+        [self requestUpdate];
+    }
+    
+    return self;
+}
+
+// Override Ticker setter to trigger status item update
+- (void)setTicker:(NSString *)tickerString
+{
+    // Update the ticker value
+    _ticker = tickerString;
+    
+    // Trigger notification to update ticker
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"btcbar_ticker_update" object:self];
+}
+
+// Initiates an asyncronous HTTP connection
+- (void)requestUpdate
+{
+    // More information on the API
+    // can be found here: https://www.bitfinex.com/pages/api
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"https://api.bitfinex.com/v1/pubticker/BTCUSD/"]];
+    
+    // Set the request's user agent
+    [request addValue:@"btcbar/2.0 (BitFinexUSDFetcher)" forHTTPHeaderField:@"User-Agent"];
+    
+    // Initialize a connection from our request
+    NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request delegate:self];
+    
+    // Go go go
+    [connection start];
+}
+
+// Initializes data storage on request response
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
+{
+    self.responseData = [[NSMutableData alloc] init];
+}
+
+// Appends response data
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{
+    [self.responseData appendData:data];
+}
+
+// Indiciate no caching
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
+{
+    return nil;
+}
+
+// Parse data after load
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection
+{
+    // Parse the JSON into results
+    NSError *jsonParsingError = nil;
+    NSDictionary *results = [[NSDictionary alloc] init];
+    results = [NSJSONSerialization JSONObjectWithData:self.responseData options:0 error:&jsonParsingError];
+    
+    // Results parsed successfully from JSON
+    if(results)
+    {
+        // Get API status
+        NSString *resultsStatus = [results objectForKey:@"last_price"];
+        
+        // If API call succeeded update the ticker...
+        if(resultsStatus)
+        {
+            NSNumberFormatter *currencyStyle = [[NSNumberFormatter alloc] init];
+            currencyStyle.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
+            currencyStyle.numberStyle = NSNumberFormatterCurrencyStyle;
+            resultsStatus = [currencyStyle stringFromNumber:[NSDecimalNumber decimalNumberWithString:resultsStatus]];
+            self.ticker = resultsStatus;
+        }
+        // Otherwise log an error...
+        else
+        {
+            self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"API Error", NSLocalizedDescriptionKey, @"The JSON received did not contain a result or the API returned an error.", NSLocalizedFailureReasonErrorKey, nil]];
+            self.ticker = nil;
+        }
+    }
+    // JSON parsing failed
+    else
+    {
+        self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"JSON Error", NSLocalizedDescriptionKey, @"Could not parse the JSON returned.", NSLocalizedFailureReasonErrorKey, nil]];
+        self.ticker = nil;
+    }
+}
+
+// HTTP request failed
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
+{
+    self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"Connection Error", NSLocalizedDescriptionKey, @"Could not connect to BitFinex.", NSLocalizedFailureReasonErrorKey, nil]];
+    self.ticker = nil;
+}
+
+
+@end

From aef5b43fdbe33d9d82b52b9e26c3a54574340b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim.daubenschuetz@gmail.com>
Date: Thu, 22 Jan 2015 17:44:50 +0100
Subject: [PATCH 3/8] Winked added

---
 btcbar.xcodeproj/project.pbxproj    |   6 ++
 btcbar/AppDelegate.h                |   1 +
 btcbar/AppDelegate.m                |   1 +
 btcbar/Fetchers/WinkDexUSDFetcher.h |  22 +++++
 btcbar/Fetchers/WinkDexUSDFetcher.m | 125 ++++++++++++++++++++++++++++
 5 files changed, 155 insertions(+)
 create mode 100644 btcbar/Fetchers/WinkDexUSDFetcher.h
 create mode 100644 btcbar/Fetchers/WinkDexUSDFetcher.m

diff --git a/btcbar.xcodeproj/project.pbxproj b/btcbar.xcodeproj/project.pbxproj
index 4949fa6..eb2dbb1 100644
--- a/btcbar.xcodeproj/project.pbxproj
+++ b/btcbar.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
 		83C3E7571859702D00FA2921 /* btclogoAlternate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */; };
 		83C3E759185970C800FA2921 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E758185970C800FA2921 /* Icon.icns */; };
 		B662833B1A712EBB00520512 /* BitFinexUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */; };
+		B662833E1A715EFB00520512 /* WinkDexUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B662833D1A715EFB00520512 /* WinkDexUSDFetcher.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -55,6 +56,8 @@
 		83C3E758185970C800FA2921 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Icon.icns; path = ../Resources/Icon.icns; sourceTree = "<group>"; };
 		B66283391A712EBB00520512 /* BitFinexUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BitFinexUSDFetcher.h; path = Fetchers/BitFinexUSDFetcher.h; sourceTree = "<group>"; };
 		B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BitFinexUSDFetcher.m; path = Fetchers/BitFinexUSDFetcher.m; sourceTree = "<group>"; };
+		B662833C1A715EFB00520512 /* WinkDexUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WinkDexUSDFetcher.h; path = Fetchers/WinkDexUSDFetcher.h; sourceTree = "<group>"; };
+		B662833D1A715EFB00520512 /* WinkDexUSDFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WinkDexUSDFetcher.m; path = Fetchers/WinkDexUSDFetcher.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -150,6 +153,8 @@
 			children = (
 				83C3E7411859700100FA2921 /* BitStampUSDFetcher.h */,
 				83C3E7421859700100FA2921 /* BitStampUSDFetcher.m */,
+				B662833C1A715EFB00520512 /* WinkDexUSDFetcher.h */,
+				B662833D1A715EFB00520512 /* WinkDexUSDFetcher.m */,
 				B66283391A712EBB00520512 /* BitFinexUSDFetcher.h */,
 				B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */,
 				83C3E7431859700100FA2921 /* BTCeUSDFetcher.h */,
@@ -241,6 +246,7 @@
 				83C3E7491859700100FA2921 /* BitStampUSDFetcher.m in Sources */,
 				B662833B1A712EBB00520512 /* BitFinexUSDFetcher.m in Sources */,
 				830CE09D171B6C3E00DDD525 /* main.m in Sources */,
+				B662833E1A715EFB00520512 /* WinkDexUSDFetcher.m in Sources */,
 				83C3E74B1859700100FA2921 /* CoinbaseUSDFetcher.m in Sources */,
 				83C3E74A1859700100FA2921 /* BTCeUSDFetcher.m in Sources */,
 				830CE0A4171B6C3E00DDD525 /* AppDelegate.m in Sources */,
diff --git a/btcbar/AppDelegate.h b/btcbar/AppDelegate.h
index c16beae..6f9773f 100644
--- a/btcbar/AppDelegate.h
+++ b/btcbar/AppDelegate.h
@@ -9,6 +9,7 @@
 #import "CoinbaseUSDFetcher.h"
 #import "BTCeUSDFetcher.h"
 #import "BitFinexUSDFetcher.h"
+#import "WinkDexUSDFetcher.h"
 
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
     NSMenu *btcbarMainMenu;
diff --git a/btcbar/AppDelegate.m b/btcbar/AppDelegate.m
index 5cdf4a4..8f09fc8 100644
--- a/btcbar/AppDelegate.m
+++ b/btcbar/AppDelegate.m
@@ -31,6 +31,7 @@ - (void)awakeFromNib
                [[BTCeUSDFetcher alloc] init],
                [[CoinbaseUSDFetcher alloc] init],
                [[BitFinexUSDFetcher alloc] init],
+               [[WinkDexUSDFetcher alloc] init],
                nil];
     
     
diff --git a/btcbar/Fetchers/WinkDexUSDFetcher.h b/btcbar/Fetchers/WinkDexUSDFetcher.h
new file mode 100644
index 0000000..182ed1f
--- /dev/null
+++ b/btcbar/Fetchers/WinkDexUSDFetcher.h
@@ -0,0 +1,22 @@
+//
+//  WinkDexUSDFetcher.h
+//  btcbar
+//
+//  Created by Tim Daubenschütz on 22/01/15.
+//  Copyright (c) 2015 nearengine. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Fetcher.h"
+
+@interface WinkDexUSDFetcher : NSObject<Fetcher, NSURLConnectionDelegate>
+
+@property (nonatomic) NSString* ticker;
+@property (nonatomic) NSString* ticker_menu;
+@property (nonatomic) NSString* url;
+@property (nonatomic) NSError* error;
+@property (nonatomic) NSMutableData *responseData;
+
+- (void)requestUpdate;
+
+@end
diff --git a/btcbar/Fetchers/WinkDexUSDFetcher.m b/btcbar/Fetchers/WinkDexUSDFetcher.m
new file mode 100644
index 0000000..d45198a
--- /dev/null
+++ b/btcbar/Fetchers/WinkDexUSDFetcher.m
@@ -0,0 +1,125 @@
+//
+//  WinkDexUSDFetcher.m
+//  btcbar
+//
+//  Created by Tim Daubenschütz on 22/01/15.
+//  Copyright (c) 2015 nearengine. All rights reserved.
+//
+
+#import "WinkDexUSDFetcher.h"
+
+@implementation WinkDexUSDFetcher
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        // Menu Item Name
+        self.ticker_menu = @"WinkDexUSD";
+        
+        // Website location
+        self.url = @"https://winkdex.com/";
+        
+        // Immediately request first update
+        [self requestUpdate];
+    }
+    
+    return self;
+}
+
+// Override Ticker setter to trigger status item update
+- (void)setTicker:(NSString *)tickerString
+{
+    // Update the ticker value
+    _ticker = tickerString;
+    
+    // Trigger notification to update ticker
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"btcbar_ticker_update" object:self];
+}
+
+// Initiates an asyncronous HTTP connection
+- (void)requestUpdate
+{
+    // Documentation for this API
+    // can be found here: http://docs.winkdex.com/#get-request
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"https://winkdex.com/api/v0/price"]];
+    
+    // Set the request's user agent
+    [request addValue:@"btcbar/2.0 (WinkDexUSDFetcher)" forHTTPHeaderField:@"User-Agent"];
+    
+    // Initialize a connection from our request
+    NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request delegate:self];
+    
+    // Go go go
+    [connection start];
+}
+
+// Initializes data storage on request response
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
+{
+    self.responseData = [[NSMutableData alloc] init];
+}
+
+// Appends response data
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{
+    [self.responseData appendData:data];
+}
+
+// Indiciate no caching
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
+{
+    return nil;
+}
+
+// Parse data after load
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection
+{
+    // Parse the JSON into results
+    NSError *jsonParsingError = nil;
+    NSDictionary *results = [[NSDictionary alloc] init];
+    results = [NSJSONSerialization JSONObjectWithData:self.responseData options:0 error:&jsonParsingError];
+    
+    // Results parsed successfully from JSON
+    if(results)
+    {
+        // Get API status
+        NSString *resultsStatus = [results objectForKey:@"price"];
+        
+        // If API call succeeded update the ticker...
+        if(resultsStatus)
+        {
+            NSNumberFormatter *currencyStyle = [[NSNumberFormatter alloc] init];
+            currencyStyle.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
+            currencyStyle.numberStyle = NSNumberFormatterCurrencyStyle;
+            
+            // We first need to convert the price form pennys to dollars
+            // then we can asign it to the view.
+            NSDecimalNumber *price = [[NSDecimalNumber alloc] initWithDouble:[resultsStatus doubleValue]/100];
+            resultsStatus = [currencyStyle stringFromNumber:price];
+            self.ticker = resultsStatus;
+        }
+        // Otherwise log an error...
+        else
+        {
+            self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"API Error", NSLocalizedDescriptionKey, @"The JSON received did not contain a result or the API returned an error.", NSLocalizedFailureReasonErrorKey, nil]];
+            self.ticker = nil;
+        }
+    }
+    // JSON parsing failed
+    else
+    {
+        self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"JSON Error", NSLocalizedDescriptionKey, @"Could not parse the JSON returned.", NSLocalizedFailureReasonErrorKey, nil]];
+        self.ticker = nil;
+    }
+}
+
+// HTTP request failed
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
+{
+    self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"Connection Error", NSLocalizedDescriptionKey, @"Could not connect to WinkDex.", NSLocalizedFailureReasonErrorKey, nil]];
+    self.ticker = nil;
+}
+
+
+@end

From 61cf112f2000c68ff3e5ba48b83e0bd2b3750a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim.daubenschuetz@gmail.com>
Date: Thu, 22 Jan 2015 22:43:07 +0100
Subject: [PATCH 4/8] Adding OKCoinCNY. Unfortunately I couldn't find the local
 identifier for CNY, so I just inserted it manually...

---
 btcbar.xcodeproj/project.pbxproj   |   6 ++
 btcbar/AppDelegate.h               |   1 +
 btcbar/AppDelegate.m               |   1 +
 btcbar/Fetchers/OKCoinCNYFetcher.h |  22 ++++++
 btcbar/Fetchers/OKCoinCNYFetcher.m | 121 +++++++++++++++++++++++++++++
 5 files changed, 151 insertions(+)
 create mode 100644 btcbar/Fetchers/OKCoinCNYFetcher.h
 create mode 100644 btcbar/Fetchers/OKCoinCNYFetcher.m

diff --git a/btcbar.xcodeproj/project.pbxproj b/btcbar.xcodeproj/project.pbxproj
index eb2dbb1..b82a3c9 100644
--- a/btcbar.xcodeproj/project.pbxproj
+++ b/btcbar.xcodeproj/project.pbxproj
@@ -22,6 +22,7 @@
 		83C3E7561859702D00FA2921 /* btclogoAlternate.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7521859702D00FA2921 /* btclogoAlternate.png */; };
 		83C3E7571859702D00FA2921 /* btclogoAlternate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */; };
 		83C3E759185970C800FA2921 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E758185970C800FA2921 /* Icon.icns */; };
+		B65127471A71A1BB00FB6A24 /* OKCoinCNYFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B65127461A71A1BB00FB6A24 /* OKCoinCNYFetcher.m */; };
 		B662833B1A712EBB00520512 /* BitFinexUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */; };
 		B662833E1A715EFB00520512 /* WinkDexUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B662833D1A715EFB00520512 /* WinkDexUSDFetcher.m */; };
 /* End PBXBuildFile section */
@@ -54,6 +55,8 @@
 		83C3E7521859702D00FA2921 /* btclogoAlternate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = btclogoAlternate.png; path = Icons/btclogoAlternate.png; sourceTree = "<group>"; };
 		83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "btclogoAlternate@2x.png"; path = "Icons/btclogoAlternate@2x.png"; sourceTree = "<group>"; };
 		83C3E758185970C800FA2921 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Icon.icns; path = ../Resources/Icon.icns; sourceTree = "<group>"; };
+		B65127451A71A1BB00FB6A24 /* OKCoinCNYFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OKCoinCNYFetcher.h; path = Fetchers/OKCoinCNYFetcher.h; sourceTree = "<group>"; };
+		B65127461A71A1BB00FB6A24 /* OKCoinCNYFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OKCoinCNYFetcher.m; path = Fetchers/OKCoinCNYFetcher.m; sourceTree = "<group>"; };
 		B66283391A712EBB00520512 /* BitFinexUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BitFinexUSDFetcher.h; path = Fetchers/BitFinexUSDFetcher.h; sourceTree = "<group>"; };
 		B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BitFinexUSDFetcher.m; path = Fetchers/BitFinexUSDFetcher.m; sourceTree = "<group>"; };
 		B662833C1A715EFB00520512 /* WinkDexUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WinkDexUSDFetcher.h; path = Fetchers/WinkDexUSDFetcher.h; sourceTree = "<group>"; };
@@ -153,6 +156,8 @@
 			children = (
 				83C3E7411859700100FA2921 /* BitStampUSDFetcher.h */,
 				83C3E7421859700100FA2921 /* BitStampUSDFetcher.m */,
+				B65127451A71A1BB00FB6A24 /* OKCoinCNYFetcher.h */,
+				B65127461A71A1BB00FB6A24 /* OKCoinCNYFetcher.m */,
 				B662833C1A715EFB00520512 /* WinkDexUSDFetcher.h */,
 				B662833D1A715EFB00520512 /* WinkDexUSDFetcher.m */,
 				B66283391A712EBB00520512 /* BitFinexUSDFetcher.h */,
@@ -246,6 +251,7 @@
 				83C3E7491859700100FA2921 /* BitStampUSDFetcher.m in Sources */,
 				B662833B1A712EBB00520512 /* BitFinexUSDFetcher.m in Sources */,
 				830CE09D171B6C3E00DDD525 /* main.m in Sources */,
+				B65127471A71A1BB00FB6A24 /* OKCoinCNYFetcher.m in Sources */,
 				B662833E1A715EFB00520512 /* WinkDexUSDFetcher.m in Sources */,
 				83C3E74B1859700100FA2921 /* CoinbaseUSDFetcher.m in Sources */,
 				83C3E74A1859700100FA2921 /* BTCeUSDFetcher.m in Sources */,
diff --git a/btcbar/AppDelegate.h b/btcbar/AppDelegate.h
index 6f9773f..55b8a30 100644
--- a/btcbar/AppDelegate.h
+++ b/btcbar/AppDelegate.h
@@ -10,6 +10,7 @@
 #import "BTCeUSDFetcher.h"
 #import "BitFinexUSDFetcher.h"
 #import "WinkDexUSDFetcher.h"
+#import "OKCoinCNYFetcher.h"
 
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
     NSMenu *btcbarMainMenu;
diff --git a/btcbar/AppDelegate.m b/btcbar/AppDelegate.m
index 8f09fc8..c924c27 100644
--- a/btcbar/AppDelegate.m
+++ b/btcbar/AppDelegate.m
@@ -32,6 +32,7 @@ - (void)awakeFromNib
                [[CoinbaseUSDFetcher alloc] init],
                [[BitFinexUSDFetcher alloc] init],
                [[WinkDexUSDFetcher alloc] init],
+               [[OKCoinCYNFetcher alloc] init],
                nil];
     
     
diff --git a/btcbar/Fetchers/OKCoinCNYFetcher.h b/btcbar/Fetchers/OKCoinCNYFetcher.h
new file mode 100644
index 0000000..dabc41e
--- /dev/null
+++ b/btcbar/Fetchers/OKCoinCNYFetcher.h
@@ -0,0 +1,22 @@
+//
+//  OKCoinCYNFetcher.h
+//  btcbar
+//
+//  Created by Tim Daubenschütz on 22/01/15.
+//  Copyright (c) 2015 nearengine. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Fetcher.h"
+
+@interface OKCoinCYNFetcher : NSObject<Fetcher, NSURLConnectionDelegate>
+
+@property (nonatomic) NSString* ticker;
+@property (nonatomic) NSString* ticker_menu;
+@property (nonatomic) NSString* url;
+@property (nonatomic) NSError* error;
+@property (nonatomic) NSMutableData *responseData;
+
+- (void)requestUpdate;
+
+@end
diff --git a/btcbar/Fetchers/OKCoinCNYFetcher.m b/btcbar/Fetchers/OKCoinCNYFetcher.m
new file mode 100644
index 0000000..78e543c
--- /dev/null
+++ b/btcbar/Fetchers/OKCoinCNYFetcher.m
@@ -0,0 +1,121 @@
+//
+//  OKCoinCYNFetcher.m
+//  btcbar
+//
+//  Created by Tim Daubenschütz on 22/01/15.
+//  Copyright (c) 2015 nearengine. All rights reserved.
+//
+
+#import "OKCoinCNYFetcher.h"
+
+@implementation OKCoinCYNFetcher
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        // Menu Item Name
+        self.ticker_menu = @"OKCoinCNY";
+        
+        // Website location
+        self.url = @"https://www.okcoin.cn/";
+        
+        // Immediately request first update
+        [self requestUpdate];
+    }
+    
+    return self;
+}
+
+// Override Ticker setter to trigger status item update
+- (void)setTicker:(NSString *)tickerString
+{
+    // Update the ticker value
+    _ticker = tickerString;
+    
+    // Trigger notification to update ticker
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"btcbar_ticker_update" object:self];
+}
+
+// Initiates an asyncronous HTTP connection
+- (void)requestUpdate
+{
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"https://www.okcoin.cn/api/v1/ticker.do?symbol=btc_cny"]];
+    
+    // Set the request's user agent
+    [request addValue:@"btcbar/2.0 (OKCoinCNYFetcher)" forHTTPHeaderField:@"User-Agent"];
+    
+    // Initialize a connection from our request
+    NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request delegate:self];
+    
+    // Go go go
+    [connection start];
+}
+
+// Initializes data storage on request response
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
+{
+    self.responseData = [[NSMutableData alloc] init];
+}
+
+// Appends response data
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{
+    [self.responseData appendData:data];
+}
+
+// Indiciate no caching
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
+{
+    return nil;
+}
+
+// Parse data after load
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection
+{
+    // Parse the JSON into results
+    NSError *jsonParsingError = nil;
+    NSDictionary *results = [[NSDictionary alloc] init];
+    results = [NSJSONSerialization JSONObjectWithData:self.responseData options:0 error:&jsonParsingError];
+    
+    // Results parsed successfully from JSON
+    if(results)
+    {
+        // Get API status
+        NSDictionary *ticker = [results objectForKey:@"ticker"];
+        NSString *resultsStatus = [ticker objectForKey:@"last"];
+        
+        
+        // If API call succeeded update the ticker...
+        if(resultsStatus)
+        {
+            NSNumberFormatter *numberFormatter = [[NSNumberFormatter alloc] init];
+            resultsStatus = [numberFormatter stringFromNumber:[NSDecimalNumber decimalNumberWithString:resultsStatus]];
+            resultsStatus = [NSString stringWithFormat:@"¥ %@", resultsStatus];
+            
+            self.ticker = resultsStatus;
+        }
+        // Otherwise log an error...
+        else
+        {
+            self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"API Error", NSLocalizedDescriptionKey, @"The JSON received did not contain a result or the API returned an error.", NSLocalizedFailureReasonErrorKey, nil]];
+            self.ticker = nil;
+        }
+    }
+    // JSON parsing failed
+    else
+    {
+        self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"JSON Error", NSLocalizedDescriptionKey, @"Could not parse the JSON returned.", NSLocalizedFailureReasonErrorKey, nil]];
+        self.ticker = nil;
+    }
+}
+
+// HTTP request failed
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
+{
+    self.error = [NSError errorWithDomain:@"com.nearengine.btcbar" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"Connection Error", NSLocalizedDescriptionKey, @"Could not connect to OKCoin.", NSLocalizedFailureReasonErrorKey, nil]];
+    self.ticker = nil;
+}
+
+
+@end

From c516a9a51697e5ff4dc8e6342dd298c44c094ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim.daubenschuetz@gmail.com>
Date: Thu, 22 Jan 2015 22:44:22 +0100
Subject: [PATCH 5/8] fixed space

---
 btcbar/Fetchers/OKCoinCNYFetcher.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/btcbar/Fetchers/OKCoinCNYFetcher.m b/btcbar/Fetchers/OKCoinCNYFetcher.m
index 78e543c..ae666f4 100644
--- a/btcbar/Fetchers/OKCoinCNYFetcher.m
+++ b/btcbar/Fetchers/OKCoinCNYFetcher.m
@@ -91,7 +91,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
         {
             NSNumberFormatter *numberFormatter = [[NSNumberFormatter alloc] init];
             resultsStatus = [numberFormatter stringFromNumber:[NSDecimalNumber decimalNumberWithString:resultsStatus]];
-            resultsStatus = [NSString stringWithFormat:@"¥ %@", resultsStatus];
+            resultsStatus = [NSString stringWithFormat:@"¥%@", resultsStatus];
             
             self.ticker = resultsStatus;
         }

From ce83792b27b5ea60ce3ada897eb923256f25e384 Mon Sep 17 00:00:00 2001
From: Chris Shiplet <chris@nearengine.com>
Date: Fri, 17 Apr 2015 23:40:09 -0700
Subject: [PATCH 6/8] Standardize naming convention and ticker formatting

---
 btcbar.xcodeproj/project.pbxproj              | 12 +++---
 btcbar/AppDelegate.h                          |  2 +-
 btcbar/AppDelegate.m                          |  2 +-
 .../{HuobiRMBFetcher.h => HuobiCNYFetcher.h}  |  4 +-
 .../{HuobiRMBFetcher.m => HuobiCNYFetcher.m}  | 43 ++++++++++---------
 5 files changed, 32 insertions(+), 31 deletions(-)
 rename btcbar/Fetchers/{HuobiRMBFetcher.h => HuobiCNYFetcher.h} (81%)
 rename btcbar/Fetchers/{HuobiRMBFetcher.m => HuobiCNYFetcher.m} (87%)

diff --git a/btcbar.xcodeproj/project.pbxproj b/btcbar.xcodeproj/project.pbxproj
index 26f6a27..da34147 100644
--- a/btcbar.xcodeproj/project.pbxproj
+++ b/btcbar.xcodeproj/project.pbxproj
@@ -25,7 +25,7 @@
 		B65127471A71A1BB00FB6A24 /* OKCoinCNYFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B65127461A71A1BB00FB6A24 /* OKCoinCNYFetcher.m */; };
 		B662833B1A712EBB00520512 /* BitFinexUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */; };
 		B662833E1A715EFB00520512 /* WinkDexUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B662833D1A715EFB00520512 /* WinkDexUSDFetcher.m */; };
-		90347B7918ACB073005C42A8 /* HuobiRMBFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 90347B7818ACB073005C42A8 /* HuobiRMBFetcher.m */; };
+		90347B7918ACB073005C42A8 /* HuobiCNYFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 90347B7818ACB073005C42A8 /* HuobiCNYFetcher.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -62,8 +62,8 @@
 		B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BitFinexUSDFetcher.m; path = Fetchers/BitFinexUSDFetcher.m; sourceTree = "<group>"; };
 		B662833C1A715EFB00520512 /* WinkDexUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WinkDexUSDFetcher.h; path = Fetchers/WinkDexUSDFetcher.h; sourceTree = "<group>"; };
 		B662833D1A715EFB00520512 /* WinkDexUSDFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WinkDexUSDFetcher.m; path = Fetchers/WinkDexUSDFetcher.m; sourceTree = "<group>"; };
-		90347B7718ACB073005C42A8 /* HuobiRMBFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HuobiRMBFetcher.h; path = Fetchers/HuobiRMBFetcher.h; sourceTree = "<group>"; };
-		90347B7818ACB073005C42A8 /* HuobiRMBFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HuobiRMBFetcher.m; path = Fetchers/HuobiRMBFetcher.m; sourceTree = "<group>"; };
+		90347B7718ACB073005C42A8 /* HuobiCNYFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HuobiCNYFetcher.h; path = Fetchers/HuobiCNYFetcher.h; sourceTree = "<group>"; };
+		90347B7818ACB073005C42A8 /* HuobiCNYFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HuobiCNYFetcher.m; path = Fetchers/HuobiCNYFetcher.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -169,8 +169,8 @@
 				83C3E7441859700100FA2921 /* BTCeUSDFetcher.m */,
 				83C3E7451859700100FA2921 /* CoinbaseUSDFetcher.h */,
 				83C3E7461859700100FA2921 /* CoinbaseUSDFetcher.m */,
-				90347B7718ACB073005C42A8 /* HuobiRMBFetcher.h */,
-				90347B7818ACB073005C42A8 /* HuobiRMBFetcher.m */,
+				90347B7718ACB073005C42A8 /* HuobiCNYFetcher.h */,
+				90347B7818ACB073005C42A8 /* HuobiCNYFetcher.m */,
 			);
 			name = Fetchers;
 			sourceTree = "<group>";
@@ -258,7 +258,7 @@
 				830CE09D171B6C3E00DDD525 /* main.m in Sources */,
 				B65127471A71A1BB00FB6A24 /* OKCoinCNYFetcher.m in Sources */,
 				B662833E1A715EFB00520512 /* WinkDexUSDFetcher.m in Sources */,
-				90347B7918ACB073005C42A8 /* HuobiRMBFetcher.m in Sources */,
+				90347B7918ACB073005C42A8 /* HuobiCNYFetcher.m in Sources */,
 				83C3E74B1859700100FA2921 /* CoinbaseUSDFetcher.m in Sources */,
 				83C3E74A1859700100FA2921 /* BTCeUSDFetcher.m in Sources */,
 				830CE0A4171B6C3E00DDD525 /* AppDelegate.m in Sources */,
diff --git a/btcbar/AppDelegate.h b/btcbar/AppDelegate.h
index ecd338c..593e414 100644
--- a/btcbar/AppDelegate.h
+++ b/btcbar/AppDelegate.h
@@ -11,7 +11,7 @@
 #import "BitFinexUSDFetcher.h"
 #import "WinkDexUSDFetcher.h"
 #import "OKCoinCNYFetcher.h"
-#import "HuobiRMBFetcher.h"
+#import "HuobiCNYFetcher.h"
 
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
     NSMenu *btcbarMainMenu;
diff --git a/btcbar/AppDelegate.m b/btcbar/AppDelegate.m
index fb9ddee..5dbc25f 100644
--- a/btcbar/AppDelegate.m
+++ b/btcbar/AppDelegate.m
@@ -33,7 +33,7 @@ - (void)awakeFromNib
                [[BitFinexUSDFetcher alloc] init],
                [[WinkDexUSDFetcher alloc] init],
                [[OKCoinCYNFetcher alloc] init],
-               [[HuobiRMBFetcher alloc] init],
+               [[HuobiCNYFetcher alloc] init],
                nil];
 
     // If ticker preference does not exist, default to 0
diff --git a/btcbar/Fetchers/HuobiRMBFetcher.h b/btcbar/Fetchers/HuobiCNYFetcher.h
similarity index 81%
rename from btcbar/Fetchers/HuobiRMBFetcher.h
rename to btcbar/Fetchers/HuobiCNYFetcher.h
index 93e9084..151a073 100644
--- a/btcbar/Fetchers/HuobiRMBFetcher.h
+++ b/btcbar/Fetchers/HuobiCNYFetcher.h
@@ -1,5 +1,5 @@
 //
-//  HuobiRMBFetcher.h
+//  HuobiCNYFetcher.h
 //  btcbar
 //
 //  Created by lwei on 2/13/14.
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "Fetcher.h"
 
-@interface HuobiRMBFetcher : NSObject<Fetcher, NSURLConnectionDelegate>
+@interface HuobiCNYFetcher : NSObject<Fetcher, NSURLConnectionDelegate>
 
 @property (nonatomic) NSString* ticker;
 @property (nonatomic) NSString* ticker_menu;
diff --git a/btcbar/Fetchers/HuobiRMBFetcher.m b/btcbar/Fetchers/HuobiCNYFetcher.m
similarity index 87%
rename from btcbar/Fetchers/HuobiRMBFetcher.m
rename to btcbar/Fetchers/HuobiCNYFetcher.m
index 8d70637..58d1a53 100644
--- a/btcbar/Fetchers/HuobiRMBFetcher.m
+++ b/btcbar/Fetchers/HuobiCNYFetcher.m
@@ -1,29 +1,29 @@
 //
-//  HuobiRMBFetcher.m
+//  HuobiCNYFetcher.m
 //  btcbar
 //
 //  Created by lwei on 2/13/14.
 //  Copyright (c) 2014 nearengine. All rights reserved.
 //
 
-#import "HuobiRMBFetcher.h"
+#import "HuobiCNYFetcher.h"
 
-@implementation HuobiRMBFetcher
+@implementation HuobiCNYFetcher
 
 - (id)init
 {
     if (self = [super init])
     {
         // Menu Item Name
-        self.ticker_menu = @"HuobiRMB";
-        
+        self.ticker_menu = @"HuobiCNY";
+
         // Website location
         self.url = @"http://www.huobi.com";
-        
+
         // Immediately request first update
         [self requestUpdate];
     }
-    
+
     return self;
 }
 
@@ -32,7 +32,7 @@ - (void)setTicker:(NSString *)tickerString
 {
     // Update the ticker value
     _ticker = tickerString;
-    
+
     // Trigger notification to update ticker
     [[NSNotificationCenter defaultCenter] postNotificationName:@"btcbar_ticker_update" object:self];
 }
@@ -41,13 +41,13 @@ - (void)setTicker:(NSString *)tickerString
 - (void)requestUpdate
 {
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://market.huobi.com/staticmarket/detail.html"]];
-    
+
     // Set the request's user agent
-    [request addValue:@"btcbar/2.0 (HuobiRMBFetcher)" forHTTPHeaderField:@"User-Agent"];
-    
+    [request addValue:@"btcbar/2.0 (HuobiCNYFetcher)" forHTTPHeaderField:@"User-Agent"];
+
     // Initialize a connection from our request
     NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request delegate:self];
-    
+
     // Go go go
     [connection start];
 }
@@ -77,32 +77,33 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
     if (!responseStr) {
         return;
     }
-    
+
     NSRange range = [responseStr rangeOfString:@"(?<=\\().*(?=\\))" options:NSRegularExpressionSearch];
     if (range.location > responseStr.length || range.location + range.length > responseStr.length) {
         return;
     }
-    
+
     NSString *resultsStr = [responseStr substringWithRange:range];
-    
+
     if (!resultsStr) {
         return;
     }
-    
+
     // Parse the JSON into results
     NSError *jsonParsingError = nil;
     id results = [NSJSONSerialization JSONObjectWithData:[resultsStr dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:&jsonParsingError];
-    
+
     // Results parsed successfully from JSON
     if (results)
     {
         NSNumber *ticker = [results objectForKey:@"p_new"];
         if (ticker) {
-            NSNumberFormatter *currencyStyle = [[NSNumberFormatter alloc] init];
-            currencyStyle.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"zh_CN"];
-            currencyStyle.numberStyle = NSNumberFormatterCurrencyStyle;
+            NSNumberFormatter *numberFormatter = [[NSNumberFormatter alloc] init];
+            NSString *resultsStatus = [numberFormatter stringFromNumber:ticker];
+            resultsStatus = [NSString stringWithFormat:@"¥%@", resultsStatus];
+            
             self.error = nil;
-            self.ticker = [currencyStyle stringFromNumber:ticker];
+            self.ticker = resultsStatus;
         }
         // Otherwise log an error...
         else

From 6027a70e4097bab2b41bdf9464baf2397077f532 Mon Sep 17 00:00:00 2001
From: Chris Shiplet <chris@nearengine.com>
Date: Fri, 17 Apr 2015 23:43:14 -0700
Subject: [PATCH 7/8] Update README.md

---
 README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e4af6e9..472b4de 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 btcbar
 ======
 
-A tiny status bar widget for OS X that displays the latest USD/BTC spot price from BitStamp, BTCe, and Coinbase.
+A tiny status bar widget for OS X that displays the latest USD/BTC spot price from several USD and CNY exchanges.
 
 ## Screenshot
 
@@ -19,14 +19,18 @@ Simply place btcbar.app in your `/Applications` folder, and optionally add it to
 
 ## Download
 
-The current version of btcbar (2.1.4) can be downloaded here:
+The current version of btcbar (2.2.0) can be downloaded here:
 
-https://github.com/nearengine/btcbar/releases/download/v2.1.4/btcbar_2_1_4.zip
+https://github.com/nearengine/btcbar/releases/download/v2.2.0/btcbar_2_2_0.zip
 
 It requires OS X 10.7+ and a 64-bit processor.
 
 ## Changelog
 
+### 2.2.0
+
+* Adds BitFinexUSD, WinkDexUSD, HuobiCNY and OKCoinCNY
+
 ### 2.1.4
 
 * Removes MtGox
@@ -76,4 +80,4 @@ The source is provided for inspection, considering the nature of Bitcoin. You ar
 
 If for some reason you feel like donating a few micro btc to future development, those should go here:
 
-`1AmsBDouePjXxe2R2kFwbuCdBSpsxwtrUt`
+`1D3NtjVFpoXonqk3MZwsYD9iV5WA7MRXUj`

From 390dc84b78df207a5cc2f61e3ba5267f4b42fa2e Mon Sep 17 00:00:00 2001
From: Chris Shiplet <chris@nearengine.com>
Date: Sat, 18 Apr 2015 00:53:00 -0700
Subject: [PATCH 8/8] Icon tweaks

---
 README.md                            |   1 +
 btcbar.xcodeproj/project.pbxproj     |  22 +++-------------------
 btcbar/AppDelegate.m                 |   8 ++++----
 btcbar/Icons/btclogo.png             | Bin 3411 -> 366 bytes
 btcbar/Icons/btclogo@2x.png          | Bin 4084 -> 751 bytes
 btcbar/Icons/btclogoAlternate.png    | Bin 3115 -> 0 bytes
 btcbar/Icons/btclogoAlternate@2x.png | Bin 3484 -> 0 bytes
 btcbar/Icons/btclogoDim.png          | Bin 3465 -> 0 bytes
 btcbar/Icons/btclogoDim@2x.png       | Bin 4234 -> 0 bytes
 9 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 btcbar/Icons/btclogoAlternate.png
 delete mode 100644 btcbar/Icons/btclogoAlternate@2x.png
 delete mode 100644 btcbar/Icons/btclogoDim.png
 delete mode 100644 btcbar/Icons/btclogoDim@2x.png

diff --git a/README.md b/README.md
index 472b4de..fc21f5d 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ It requires OS X 10.7+ and a 64-bit processor.
 ### 2.2.0
 
 * Adds BitFinexUSD, WinkDexUSD, HuobiCNY and OKCoinCNY
+* New status bar icon with Yosemite (dark theme) support
 
 ### 2.1.4
 
diff --git a/btcbar.xcodeproj/project.pbxproj b/btcbar.xcodeproj/project.pbxproj
index da34147..7b93f5d 100644
--- a/btcbar.xcodeproj/project.pbxproj
+++ b/btcbar.xcodeproj/project.pbxproj
@@ -11,21 +11,17 @@
 		830CE09B171B6C3E00DDD525 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 830CE099171B6C3E00DDD525 /* InfoPlist.strings */; };
 		830CE09D171B6C3E00DDD525 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 830CE09C171B6C3E00DDD525 /* main.m */; };
 		830CE0A4171B6C3E00DDD525 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 830CE0A3171B6C3E00DDD525 /* AppDelegate.m */; };
-		838F835018602990007A7AAE /* btclogoDim.png in Resources */ = {isa = PBXBuildFile; fileRef = 838F834E18602990007A7AAE /* btclogoDim.png */; };
-		838F835118602990007A7AAE /* btclogoDim@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 838F834F18602990007A7AAE /* btclogoDim@2x.png */; };
 		83C3E7491859700100FA2921 /* BitStampUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 83C3E7421859700100FA2921 /* BitStampUSDFetcher.m */; };
 		83C3E74A1859700100FA2921 /* BTCeUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 83C3E7441859700100FA2921 /* BTCeUSDFetcher.m */; };
 		83C3E74B1859700100FA2921 /* CoinbaseUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 83C3E7461859700100FA2921 /* CoinbaseUSDFetcher.m */; };
 		83C3E74F1859702000FA2921 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E74E1859702000FA2921 /* MainMenu.xib */; };
 		83C3E7541859702D00FA2921 /* btclogo.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7501859702D00FA2921 /* btclogo.png */; };
 		83C3E7551859702D00FA2921 /* btclogo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7511859702D00FA2921 /* btclogo@2x.png */; };
-		83C3E7561859702D00FA2921 /* btclogoAlternate.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7521859702D00FA2921 /* btclogoAlternate.png */; };
-		83C3E7571859702D00FA2921 /* btclogoAlternate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */; };
 		83C3E759185970C800FA2921 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 83C3E758185970C800FA2921 /* Icon.icns */; };
+		90347B7918ACB073005C42A8 /* HuobiCNYFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 90347B7818ACB073005C42A8 /* HuobiCNYFetcher.m */; };
 		B65127471A71A1BB00FB6A24 /* OKCoinCNYFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B65127461A71A1BB00FB6A24 /* OKCoinCNYFetcher.m */; };
 		B662833B1A712EBB00520512 /* BitFinexUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */; };
 		B662833E1A715EFB00520512 /* WinkDexUSDFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B662833D1A715EFB00520512 /* WinkDexUSDFetcher.m */; };
-		90347B7918ACB073005C42A8 /* HuobiCNYFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 90347B7818ACB073005C42A8 /* HuobiCNYFetcher.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -42,8 +38,6 @@
 		830CE0A3171B6C3E00DDD525 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		830CE0AE171B6C3F00DDD525 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
 		838F4296182E2F6E00B4FC58 /* Fetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Fetcher.h; sourceTree = "<group>"; };
-		838F834E18602990007A7AAE /* btclogoDim.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = btclogoDim.png; path = Icons/btclogoDim.png; sourceTree = "<group>"; };
-		838F834F18602990007A7AAE /* btclogoDim@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "btclogoDim@2x.png"; path = "Icons/btclogoDim@2x.png"; sourceTree = "<group>"; };
 		83C3E7411859700100FA2921 /* BitStampUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BitStampUSDFetcher.h; path = Fetchers/BitStampUSDFetcher.h; sourceTree = "<group>"; };
 		83C3E7421859700100FA2921 /* BitStampUSDFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BitStampUSDFetcher.m; path = Fetchers/BitStampUSDFetcher.m; sourceTree = "<group>"; };
 		83C3E7431859700100FA2921 /* BTCeUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BTCeUSDFetcher.h; path = Fetchers/BTCeUSDFetcher.h; sourceTree = "<group>"; };
@@ -53,17 +47,15 @@
 		83C3E74E1859702000FA2921 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MainMenu.xib; path = Views/MainMenu.xib; sourceTree = "<group>"; };
 		83C3E7501859702D00FA2921 /* btclogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = btclogo.png; path = Icons/btclogo.png; sourceTree = "<group>"; };
 		83C3E7511859702D00FA2921 /* btclogo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "btclogo@2x.png"; path = "Icons/btclogo@2x.png"; sourceTree = "<group>"; };
-		83C3E7521859702D00FA2921 /* btclogoAlternate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = btclogoAlternate.png; path = Icons/btclogoAlternate.png; sourceTree = "<group>"; };
-		83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "btclogoAlternate@2x.png"; path = "Icons/btclogoAlternate@2x.png"; sourceTree = "<group>"; };
 		83C3E758185970C800FA2921 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Icon.icns; path = ../Resources/Icon.icns; sourceTree = "<group>"; };
+		90347B7718ACB073005C42A8 /* HuobiCNYFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HuobiCNYFetcher.h; path = Fetchers/HuobiCNYFetcher.h; sourceTree = "<group>"; };
+		90347B7818ACB073005C42A8 /* HuobiCNYFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HuobiCNYFetcher.m; path = Fetchers/HuobiCNYFetcher.m; sourceTree = "<group>"; };
 		B65127451A71A1BB00FB6A24 /* OKCoinCNYFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OKCoinCNYFetcher.h; path = Fetchers/OKCoinCNYFetcher.h; sourceTree = "<group>"; };
 		B65127461A71A1BB00FB6A24 /* OKCoinCNYFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OKCoinCNYFetcher.m; path = Fetchers/OKCoinCNYFetcher.m; sourceTree = "<group>"; };
 		B66283391A712EBB00520512 /* BitFinexUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BitFinexUSDFetcher.h; path = Fetchers/BitFinexUSDFetcher.h; sourceTree = "<group>"; };
 		B662833A1A712EBB00520512 /* BitFinexUSDFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BitFinexUSDFetcher.m; path = Fetchers/BitFinexUSDFetcher.m; sourceTree = "<group>"; };
 		B662833C1A715EFB00520512 /* WinkDexUSDFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WinkDexUSDFetcher.h; path = Fetchers/WinkDexUSDFetcher.h; sourceTree = "<group>"; };
 		B662833D1A715EFB00520512 /* WinkDexUSDFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WinkDexUSDFetcher.m; path = Fetchers/WinkDexUSDFetcher.m; sourceTree = "<group>"; };
-		90347B7718ACB073005C42A8 /* HuobiCNYFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HuobiCNYFetcher.h; path = Fetchers/HuobiCNYFetcher.h; sourceTree = "<group>"; };
-		90347B7818ACB073005C42A8 /* HuobiCNYFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HuobiCNYFetcher.m; path = Fetchers/HuobiCNYFetcher.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -146,10 +138,6 @@
 				83C3E758185970C800FA2921 /* Icon.icns */,
 				83C3E7501859702D00FA2921 /* btclogo.png */,
 				83C3E7511859702D00FA2921 /* btclogo@2x.png */,
-				83C3E7521859702D00FA2921 /* btclogoAlternate.png */,
-				83C3E7531859702D00FA2921 /* btclogoAlternate@2x.png */,
-				838F834E18602990007A7AAE /* btclogoDim.png */,
-				838F834F18602990007A7AAE /* btclogoDim@2x.png */,
 			);
 			name = Icons;
 			sourceTree = "<group>";
@@ -235,12 +223,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				83C3E7541859702D00FA2921 /* btclogo.png in Resources */,
-				83C3E7561859702D00FA2921 /* btclogoAlternate.png in Resources */,
-				838F835118602990007A7AAE /* btclogoDim@2x.png in Resources */,
 				830CE09B171B6C3E00DDD525 /* InfoPlist.strings in Resources */,
-				83C3E7571859702D00FA2921 /* btclogoAlternate@2x.png in Resources */,
 				83C3E759185970C800FA2921 /* Icon.icns in Resources */,
-				838F835018602990007A7AAE /* btclogoDim.png in Resources */,
 				83C3E7551859702D00FA2921 /* btclogo@2x.png in Resources */,
 				83C3E74F1859702000FA2921 /* MainMenu.xib in Resources */,
 			);
diff --git a/btcbar/AppDelegate.m b/btcbar/AppDelegate.m
index 5dbc25f..cf89924 100644
--- a/btcbar/AppDelegate.m
+++ b/btcbar/AppDelegate.m
@@ -67,12 +67,12 @@ - (void)awakeFromNib
     // Initialize status bar item with flexible width
     btcbarStatusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
 
-    // Set status bar image and highlighted image
-    btcbarStatusItem.image = [NSImage imageNamed:@"btclogoDim"];
-    btcbarStatusItem.alternateImage = [NSImage imageNamed:@"btclogoAlternate"];
+    // Set status bar image
+    NSImage *image = [NSImage imageNamed:@"btclogo"];
+    [image setTemplate:YES];
+    [btcbarStatusItem setImage:image];
 
     // Set menu options on click
-    btcbarStatusItem.highlightMode = YES;
     btcbarStatusItem.menu = btcbarMainMenu;
 
     // Setup timer to update all tickers every 10 seconds
diff --git a/btcbar/Icons/btclogo.png b/btcbar/Icons/btclogo.png
index 898e647adcdb14ca6ae8ad845f07bbb29715616e..a6d020055e8d38fe5e89b11014256af8e4a2774c 100644
GIT binary patch
delta 339
zcmV-Z0j&Ph8twv+B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0003H
zNkl<Zc-mrMpfS(_;yxh04#Yp8_!?A9ix>mgfOrZJ{{`azI50?V1`u=NGh{cKCOII!
z1jPJU4BQLVg8`-@DY^^AQb4>7h<Snd9Tvl;pc|qM#D9<!V1EOQK<op=-;vb)f$D{W
zel(l@0kH#A?gJ3t2VxT_e;t}ykX{BRsH6uL+qseW3P7v_WpkscMbY~ci~qf$asfbW
z4`pir@mDl;AiWGML?j6ZsLOu?@i8C{2jb00^1qN3U&rI34^aMlD4!Kg-4*08+JWYZ
z&rl3A=r$0yK}`ATXlnN$b9B(6Uk-;iL53Vbi+&wa6XbI&-k(a-EJC$Ri=JgB0PziI
l^nQWH&ID{>LRA0|U;s-#fH5eP*M$H8002ovPDHLkV1iM(j4J>D

delta 3408
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

diff --git a/btcbar/Icons/btclogo@2x.png b/btcbar/Icons/btclogo@2x.png
index 7d711ee9b033e4ba912c160b706e87b865307567..b2f82e59471fdd4dd30186fc57988416922bdc20 100644
GIT binary patch
delta 727
zcmV;|0x13TAMXW_B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0007!
zNkl<Zc-qWZJxClu6n4);h$vA=RK&tUbR$><LK;O8ECPpef~K&I76C~SQ=|*2Op`i9
zL=-D6EY8A8$l?zkT3DSLgN11n!EoB@UA~cbVHxJl&d%+TeSh%XF+20#d^_{rn>Xte
zi^ZxqNunxdk`zCV<NS9brJYJz=(@l#&<At_Pl3lk9=HOIfGuDhIJRaMAYuvAz@AVE
zfj!c5On5wSF(A|l{0K=zhS2Ydg3vf{TPB$jZpofCp()^AGr?OLH$m+bwLfZf?#V7o
zhzt8M;9CXKLVtqnz7CUzgwHGh)fI|xVRxS9QRg8kn&yCd#n?HioumI>)OSwpLtq8y
zp|qfqdeRxBtz^SKt=WGY5u~yjo9Q5@-qk1%(Hk{LlXg&FKhVUi#tCC{S4YS-4BriD
z!da<*4R|7rd9ShOa#1#HxD9my{iDDK>DifP{0J9ieSZ;0l3&_2V|zJ5-4T%ye(}}U
zuHllQa$cVg<qdski*f1!piPnImICbMIj1gK5(<)9;1h7CODQTswktFZ902<ifnvL!
zD~Nq&?A>sLPAv(|D#qL?PWBeY-YFOMxrn1|LV9-1jLmUTwiEFodLXr1nQ=QDp^V`~
zH=4cz)qm78z!#}6#pq;ohpVn;eg`xvDuhS$ypeK_N<=!i2z!<Vo%Sy*eMuC1zim%@
zQ4e{H@*?ovhXK-gN$nnLzXFzlP2i8_1wH?5L|0RH8W#38HMPIs?=r2ae*$l)Ag_c7
zyOUHS8Q<+!X$1-qlPQqh72BI@tnOugpYqBi<4{F)bCvJ**^orCR6!cw?VX38aGzsb
zDmz7m`3z{LLSAgiC1vVu%D~27KmILDT)v={Rwx-KQbPU;FaYmRAvq>mA=m%_002ov
JPDHLkV1hRfNa6qh

literal 4084
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

diff --git a/btcbar/Icons/btclogoAlternate.png b/btcbar/Icons/btclogoAlternate.png
deleted file mode 100644
index f2cf8037bb7b3ddb95ddc1d26bf345cbe357bacc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3115
zcmV+`4Ak?9P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z00042Nkl<Zc-pL#y(@)b7{-4`5{u#_$zWmdwffkUG8hetWUygU3WK5yHh+Q5Um%Mz
z;OLA>p~zq~aWJWqpXH&~({s)-xaz6*?YZvjzIyNLese1Sf%+<UJ-{f?0lWeaKmqtj
zveozusb{89Qn%E`xGol1Qp?uHrP^LeXu3ktwtAg#d6jkcEz+VsN5mC%Rqa&w)%gld
zehIB5NH=O;Z4RA#)#HfsqBdoP3JIY%wO(CU-_=RAL4AsN6DoCKc-@JCUI1m_2{-{t
zKwTm-eS`~u)`ZY$DCz@tfg-R0<Re~FHb;+<-D7o79SQHBYJd1%F&5Mxn+2dNJePnS
z;4U~_49@R?frRt(tfR3+r#W>qOm0e@4SCAqEEUMZh_n}o3l)M|R)<qUZR)Lm!>77j
zZP(h=qZ%U5>P)Sr{XXOBL6~MaY<)3=GoPx-{nwA}YXA?!6v{4B)Mx+z002ovPDHLk
FV1gLk&L02(

diff --git a/btcbar/Icons/btclogoAlternate@2x.png b/btcbar/Icons/btclogoAlternate@2x.png
deleted file mode 100644
index 893b51edf6d48a0b5d5b455d07a5d72500a559cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3484
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
KMNUMnLSTZG_;z{#

diff --git a/btcbar/Icons/btclogoDim.png b/btcbar/Icons/btclogoDim.png
deleted file mode 100644
index ecc2e029d74f1e9cdbc25b79b8f2348c7d76ce36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3465
zcmV;44R-R0P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z0008CNkl<Zc-pL#&r2IY9L3+n)nrX#6Sb0PONnVf+D+;9M@%3QFUB;5f+&Ik177vw
zMLY<>{~>r1JOwNkyi25MKuT$m<kF_bRJ1=Jy7&Vclelg&J?(Z~gS~W43*Wb&d2g6E
zgi?zCu^0d#gfyCU0JsCd44?|&1i*Iyl3FAiVHyB>00aTtYcQ(<_yAx_3nY|MwWH?%
zUI5VD6oU{_q?9HAlw?QhA07gDsfEnU%$zwK4w2{isw$3+VVI~ok^I3j4D(8o{<>XQ
zSU9QI>j;O#p9+P-v;O}6vrH!Al;@Hpb+xp#3;=kmIBIKa^GK4US36l+T4Kh>$G5WC
z?AO)R)vV2C`|S04E1Hx(LP)a$G8&EUYo}VR8Y`7bZhn6LQG0uPAdyJaH#ax4R;#rp
zYeZ3Owpy(YC0e;$zNH26JYV(sd>3P5W9EZ{1Cir6-PF`nN|GdxTIX~+9RTtS0Gywn
zU%Li<eSHEU1U%2T&dts3PE1Vv)a&(rQ52ihI*Y|(QlfQscGlEGuh(1g`~ABt%l2e4
znFo<b<S`)xxm@nIc0;?}E-KO7Zg;6zELs4-WHQyKr>DPpJf59+JZ?NZJUp(|YKTN4
z((v$bQ41Ox8v3PxMn*>VlF8%~04SA8x@a`Y84QL3%d#CC8yo56<>fAp<L**Q2ejun
zIXPKSZZ-hh;NW01oldvPB97y7r>Cd4MN#}H2truvM5oiywY9Y`qobp5u2dwS&xeA+
z;M4v6{pNo)oe+Y>#l_=TEcP0JaHS$Hm+M_BmD&je0_B?^X0y2-kH>{rES4mM2n|b1
zDK!A_udlD)Us+i(ZEtTIj*gC+SeB)|y}g&AP^dgRJA2&S-Tj^rvZsDVwC$IHb^tB_
rT>y*#E&-eY_yHhK2)WR{M}GzY7+ep_B>a0|00000NkvXXu0mjfvWRcc

diff --git a/btcbar/Icons/btclogoDim@2x.png b/btcbar/Icons/btclogoDim@2x.png
deleted file mode 100644
index 12fe287e90f01c034e8b516d7278b685d4ae2107..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4234
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