diff --git a/app/_views/album_art_view.rb b/app/_views/album_art_view.rb
index e372981..d279b0b 100644
--- a/app/_views/album_art_view.rb
+++ b/app/_views/album_art_view.rb
@@ -10,29 +10,42 @@ def init
       v.addSubview(@vote_view)
 
       @vote_slider_in_progress = false
-
+      @vote_toggle_state_active = always_show_votes?
       slidein_vote_view
+
+      @update_observer = App.notification_center.observe JB_TOGGLE_VOTE_SLIDER do |n|
+        state = n.userInfo[:state]
+        @vote_toggle_state_active = state
+        handle_vote_toggle_update
+      end
     end
   end
 
+  def handle_vote_toggle_update
+    vote_toggle_state_active? ? slidein_vote_view : slideout_vote_view
+  end
+
   def slidein_vote_view
-    return if @vote_slider_in_progress
+    return if vote_slider_in_progress?
 
     new_frame = @vote_view.frame
-    new_frame.origin.x += VOTE_VIEW_W
+    new_frame.origin.x = 0
 
     @vote_slider_in_progress = true
+
     NSAnimationContext.beginGrouping
     NSAnimationContext.currentContext.setCompletionHandler(
       lambda do
-        timer = NSTimer.scheduledTimerWithTimeInterval(
-          5.0,
-          target:self,
-          selector:'slideout_vote_view',
-          userInfo:nil,
-          repeats: false
-        )
-        NSRunLoop.mainRunLoop.addTimer(timer, forMode:NSRunLoopCommonModes)
+        if !vote_toggle_state_active?
+          timer = NSTimer.scheduledTimerWithTimeInterval(
+            5.0,
+            target:self,
+            selector:'slideout_vote_view',
+            userInfo:nil,
+            repeats: false
+          )
+          NSRunLoop.mainRunLoop.addTimer(timer, forMode:NSRunLoopCommonModes)
+        end
       end
     )
     NSAnimationContext.currentContext.setDuration(0.5)
@@ -42,12 +55,13 @@ def slidein_vote_view
 
   def slideout_vote_view
     new_frame = @vote_view.frame
-    new_frame.origin.x -= VOTE_VIEW_W
+    new_frame.origin.x = -VOTE_VIEW_W
 
     NSAnimationContext.beginGrouping
     NSAnimationContext.currentContext.setCompletionHandler(
       lambda do
         @vote_slider_in_progress = false
+        slidein_vote_view if vote_toggle_state_active?
       end
     )
     NSAnimationContext.currentContext.setDuration(0.5)
@@ -57,7 +71,6 @@ def slideout_vote_view
 
   def handle_vote(score, rating)
     @vote_view.do_vote(score, rating)
-
     make_turd if !score.nil? && score < -6
 
     slidein_vote_view
@@ -94,4 +107,24 @@ def make_turd
     setImage(turd)
   end
 
+  def always_show_votes?
+    Persistence.get("alwaysShowVotes") == true ? 1 : 0
+  end
+
+  def vote_slider_in_progress?
+    @vote_slider_in_progress
+  end
+
+  def vote_toggle_state_active?
+    @vote_toggle_state_active == 1 ? true : false
+  end
+
+  def ok_to_slide_vote_in?
+    !vote_slider_in_progress? && @vote_toggle_state_active
+  end
+
+  def ok_to_slide_vote_out?
+    vote_slider_in_progress? && @vote_toggle_state_active
+  end
+
 end
\ No newline at end of file
diff --git a/app/_views/nowplaying_view.rb b/app/_views/nowplaying_view.rb
index 8ece9a4..637799a 100644
--- a/app/_views/nowplaying_view.rb
+++ b/app/_views/nowplaying_view.rb
@@ -122,6 +122,11 @@ def draw_title_box
       v.setDrawsBackground(false)
       v.setSelectable(false)
       v.setTranslatesAutoresizingMaskIntoConstraints(false)
+      v.setContentCompressionResistancePriority(
+        NSLayoutPriorityDefaultLow,
+        forOrientation:NSLayoutConstraintOrientationHorizontal
+      )
+      v.cell.setBackgroundStyle(NSBackgroundStyleRaised)
     end
   end
 
@@ -132,6 +137,11 @@ def draw_artist_box
       v.setDrawsBackground(false)
       v.setSelectable(false)
       v.setTranslatesAutoresizingMaskIntoConstraints(false)
+      v.setContentCompressionResistancePriority(
+        NSLayoutPriorityDefaultLow,
+        forOrientation:NSLayoutConstraintOrientationHorizontal
+      )
+      v.cell.setBackgroundStyle(NSBackgroundStyleRaised)
     end
   end
 
@@ -142,6 +152,11 @@ def draw_album_box
       v.setDrawsBackground(false)
       v.setSelectable(false)
       v.setTranslatesAutoresizingMaskIntoConstraints(false)
+      v.setContentCompressionResistancePriority(
+        NSLayoutPriorityDefaultLow,
+        forOrientation:NSLayoutConstraintOrientationHorizontal
+      )
+      v.cell.setBackgroundStyle(NSBackgroundStyleRaised)
     end
   end
 
@@ -156,6 +171,11 @@ def draw_addedby_box
       v.setDrawsBackground(false)
       v.setSelectable(false)
       v.setTranslatesAutoresizingMaskIntoConstraints(false)
+      v.setContentCompressionResistancePriority(
+        NSLayoutPriorityDefaultLow,
+        forOrientation:NSLayoutConstraintOrientationHorizontal
+      )
+      v.cell.setBackgroundStyle(NSBackgroundStyleRaised)
     end
   end
 
@@ -169,7 +189,6 @@ def update_title
       'NSParagraphStyle' => paragraph
     }) unless track.title.nil?
     @title.setAttributedStringValue(txt)
-    @title.invalidateIntrinsicContentSize
     @title.setToolTip(track.title)
   end
 
@@ -184,15 +203,6 @@ def update_artist
     }) unless track.artist.nil?
     @artist.setAttributedStringValue(txt)
     @artist.invalidateIntrinsicContentSize
-    # @artistsetContentHuggingPriority(
-    #   NSLayoutPriorityFittingSizeCompression-1.0,
-    #   forOrientation:NSLayoutConstraintOrientationVertical
-    # )
-
-    # Think You Can Wait (from the Film Win Win)
-    # The National
-    # Think You Can Wait (from the Film Win Win) / The National
-
     @artist.setToolTip(track.artist)
   end
 
diff --git a/app/_views/vote_view.rb b/app/_views/vote_view.rb
index 65c04bb..386c441 100644
--- a/app/_views/vote_view.rb
+++ b/app/_views/vote_view.rb
@@ -11,6 +11,7 @@ def init
         txt.setBezeled(false)
         txt.setDrawsBackground(false)
         txt.setAlignment(NSCenterTextAlignment)
+        txt.cell.setBackgroundStyle(NSBackgroundStyleRaised)
       end
 
       v.addSubview(@label)
diff --git a/app/_windows/jukebox_control_window.rb b/app/_windows/jukebox_control_window.rb
index 27f26f5..66249d7 100644
--- a/app/_windows/jukebox_control_window.rb
+++ b/app/_windows/jukebox_control_window.rb
@@ -21,11 +21,7 @@ def canBecomeMainWindow
   end
 
   def register_vote(button)
-    if VoteHandler.register(button.vote)
-      puts "vote registered"
-    else
-      puts "vote registerinf failed!"
-    end
+    VoteHandler.register(button.vote)
   end
 
   def build_views
@@ -39,7 +35,8 @@ def build_views
 
     metrics_dict = {
       "padding"       => 10,
-      "default_width" => 200
+      "default_width" => 200,
+      "max_width"     => 350
     }
 
     views_dictionary.each do |key, view|
@@ -60,7 +57,7 @@ def build_views
       views:views_dictionary
     )
     constraints += NSLayoutConstraint.constraintsWithVisualFormat(
-      "H:|[now_playing(==default_width@750)]-5-[vote_buttons]-padding-|",
+      "H:|[now_playing(>=default_width,<=max_width)]-5-[vote_buttons]-padding-|",
       options:0,
       metrics:metrics_dict,
       views:views_dictionary
diff --git a/app/config/constants.rb b/app/config/constants.rb
index d254b8f..e2d39dd 100644
--- a/app/config/constants.rb
+++ b/app/config/constants.rb
@@ -21,5 +21,6 @@
 JB_MESSAGE_RECEIVED="JukeboxMessageReceived"
 JB_UPDATED="JukeboxUpdated"
 JB_DO_VOTE="JukeboxDoVote"
+JB_TOGGLE_VOTE_SLIDER="ToggleVoteSlider"
 
 CHOSEN_BY_TXT="Chosen by"
\ No newline at end of file
diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb
index b8ad779..6ccec8e 100644
--- a/app/controllers/preferences_controller.rb
+++ b/app/controllers/preferences_controller.rb
@@ -29,4 +29,8 @@ def awakeFromNib
     )
   end
 
+  def toggle_always_show_votes(button)
+    App.notification_center.post(JB_TOGGLE_VOTE_SLIDER, nil, {state:button.state})
+  end
+
 end
\ No newline at end of file
diff --git a/ib.xcodeproj/Stubs.h b/ib.xcodeproj/Stubs.h
index cd9b932..8d0e14d 100644
--- a/ib.xcodeproj/Stubs.h
+++ b/ib.xcodeproj/Stubs.h
@@ -103,6 +103,7 @@
 
 -(IBAction) init;
 -(IBAction) awakeFromNib;
+-(IBAction) toggle_always_show_votes:(id) button;
 
 @end
 
diff --git a/ib.xcodeproj/project.pbxproj b/ib.xcodeproj/project.pbxproj
index dee6938..26361bf 100644
--- a/ib.xcodeproj/project.pbxproj
+++ b/ib.xcodeproj/project.pbxproj
@@ -10,55 +10,103 @@
 	<string>46</string>
 	<key>objects</key>
 	<dict>
-		<key>00342BDD299C426BA0F09701</key>
+		<key>066CDA4D8EB6449F855F02AC</key>
 		<dict>
-			<key>includeInIndex</key>
-			<string>1</string>
+			<key>fileRef</key>
+			<string>DF56046E7B574D818CFAED05</string>
 			<key>isa</key>
-			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>sourcecode.c.objc</string>
+			<string>PBXBuildFile</string>
+		</dict>
+		<key>09B29B12FE48426FB71A0948</key>
+		<dict>
+			<key>children</key>
+			<array>
+				<string>BBD77DA643A64CA1BC9837EA</string>
+				<string>4854758623124BE0AC9BBAE1</string>
+				<string>83B64533F4CF496DA81E7988</string>
+				<string>79BFF00DF07B432F91659B67</string>
+				<string>95E21A00F98A40B18B3876CA</string>
+				<string>C170F2448BDF464AA752D1A9</string>
+				<string>C21009BE7FD641899FDBA080</string>
+				<string>AEAAE51D8A8047BABCA6091E</string>
+				<string>61367EE7640A43A28E282577</string>
+				<string>DCC2DD151C034A288A0A3B7D</string>
+				<string>3A9910DDC9714432A49AFCA5</string>
+			</array>
+			<key>isa</key>
+			<string>PBXGroup</string>
+			<key>name</key>
+			<string>Pods</string>
 			<key>path</key>
-			<string>Stubs.m</string>
+			<string>vendor/Pods/Headers</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>00E9851F8AFA4BB9A7EFB67C</key>
+		<key>111D6DA4C2F6477CAC141E69</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>sourcecode.c.objc</string>
 			<key>path</key>
-			<string>k_logo_col_18x18.png</string>
+			<string>Stubs.m</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>126EB380B69F4FAC9DD1A74B</key>
+		<key>1F414271A3EC4AE0B4E0CE78</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>sourcecode.c.h</string>
 			<key>path</key>
-			<string>____Pods-environment.h</string>
+			<string>turd.png</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>144B8815E2BF4417B582EC8A</key>
+		<key>2D4B95107FAD4D3189BD308B</key>
+		<dict>
+			<key>buildActionMask</key>
+			<string>2147483647</string>
+			<key>files</key>
+			<array>
+				<string>9B2CD2FC02BB4A68A8F12484</string>
+			</array>
+			<key>isa</key>
+			<string>PBXSourcesBuildPhase</string>
+			<key>runOnlyForDeploymentPostprocessing</key>
+			<string>0</string>
+		</dict>
+		<key>2E32826FCE3C4444B0E47CD4</key>
+		<dict>
+			<key>buildConfigurations</key>
+			<array>
+				<string>4C7BBDBBE08C43A59A6F3D85</string>
+				<string>BF264D44E3484F00BF6C546B</string>
+			</array>
+			<key>defaultConfigurationIsVisible</key>
+			<string>0</string>
+			<key>defaultConfigurationName</key>
+			<string>Release</string>
+			<key>isa</key>
+			<string>XCConfigurationList</string>
+		</dict>
+		<key>38D70B184CFD4CAF97DECB04</key>
 		<dict>
-			<key>includeInIndex</key>
-			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>wrapper.framework</string>
+			<key>name</key>
+			<string>CoreData.framework</string>
 			<key>path</key>
-			<string>jukebox.png</string>
+			<string>Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreData.framework</string>
 			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
+			<string>DEVELOPER_DIR</string>
 		</dict>
-		<key>19AB52072B4B4F45AED62762</key>
+		<key>3A9910DDC9714432A49AFCA5</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
@@ -67,26 +115,39 @@
 			<key>lastKnownFileType</key>
 			<string>sourcecode.c.h</string>
 			<key>name</key>
-			<string>MASShortcutView+UserDefaults.h</string>
+			<string>SRWebSocket.h</string>
 			<key>path</key>
-			<string>MASShortcut/MASShortcutView+UserDefaults.h</string>
+			<string>SocketRocket/SRWebSocket.h</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>19BC4353BC2244BB9297E060</key>
+		<key>3C65871CCA0A4C73AE5F2ADB</key>
 		<dict>
 			<key>isa</key>
 			<string>PBXFileReference</string>
 			<key>lastKnownFileType</key>
 			<string>wrapper.framework</string>
 			<key>name</key>
-			<string>QuartzCore.framework</string>
+			<string>CoreGraphics.framework</string>
 			<key>path</key>
-			<string>Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/QuartzCore.framework</string>
+			<string>Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreGraphics.framework</string>
 			<key>sourceTree</key>
 			<string>DEVELOPER_DIR</string>
 		</dict>
-		<key>1B51A59743864149ABE2B623</key>
+		<key>4854758623124BE0AC9BBAE1</key>
+		<dict>
+			<key>includeInIndex</key>
+			<string>1</string>
+			<key>isa</key>
+			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>sourcecode.c.h</string>
+			<key>path</key>
+			<string>____Pods-MASShortcut-prefix.h</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
+		</dict>
+		<key>4C7BBDBBE08C43A59A6F3D85</key>
 		<dict>
 			<key>buildSettings</key>
 			<dict>
@@ -115,11 +176,20 @@
 				<key>CLANG_WARN_OBJC_ROOT_CLASS</key>
 				<string>YES_ERROR</string>
 				<key>COPY_PHASE_STRIP</key>
-				<string>NO</string>
-				<key>ENABLE_NS_ASSERTIONS</key>
-				<string>NO</string>
+				<string>YES</string>
 				<key>GCC_C_LANGUAGE_STANDARD</key>
 				<string>gnu99</string>
+				<key>GCC_DYNAMIC_NO_PIC</key>
+				<string>NO</string>
+				<key>GCC_OPTIMIZATION_LEVEL</key>
+				<string>0</string>
+				<key>GCC_PREPROCESSOR_DEFINITIONS</key>
+				<array>
+					<string>DEBUG=1</string>
+					<string>$(inherited)</string>
+				</array>
+				<key>GCC_SYMBOLS_PRIVATE_EXTERN</key>
+				<string>NO</string>
 				<key>GCC_WARN_64_TO_32_BIT_CONVERSION</key>
 				<string>YES</string>
 				<key>GCC_WARN_ABOUT_RETURN_TYPE</key>
@@ -132,118 +202,138 @@
 				<string>YES</string>
 				<key>GCC_WARN_UNUSED_VARIABLE</key>
 				<string>YES</string>
-				<key>VALIDATE_PRODUCT</key>
+				<key>ONLY_ACTIVE_ARCH</key>
 				<string>YES</string>
 			</dict>
 			<key>isa</key>
 			<string>XCBuildConfiguration</string>
 			<key>name</key>
-			<string>Release</string>
+			<string>Debug</string>
 		</dict>
-		<key>22ABEBFBFE394517B7EF3512</key>
+		<key>50D5D6571FDD4AAEA2A8DF91</key>
 		<dict>
-			<key>buildConfigurationList</key>
-			<string>456957EFF0C04667B0B587A0</string>
-			<key>buildPhases</key>
+			<key>children</key>
 			<array>
-				<string>3A627F5D75964FE697F29C07</string>
-				<string>C6024F8B5B054506A84DC672</string>
+				<string>5B598451874F4A7AA70690A1</string>
 			</array>
-			<key>buildRules</key>
-			<array/>
-			<key>dependencies</key>
-			<array/>
 			<key>isa</key>
-			<string>PBXNativeTarget</string>
+			<string>PBXGroup</string>
 			<key>name</key>
-			<string>ib</string>
-			<key>productName</key>
-			<string>ib</string>
-			<key>productReference</key>
-			<string>A325410144A84DECAA89626B</string>
-			<key>productType</key>
-			<string>com.apple.product-type.library.static</string>
+			<string>Products</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
+		</dict>
+		<key>5771BB1904E34DACBD5ACB57</key>
+		<dict>
+			<key>buildActionMask</key>
+			<string>2147483647</string>
+			<key>files</key>
+			<array>
+				<string>066CDA4D8EB6449F855F02AC</string>
+				<string>7A906E8B37CB499E89FB9E45</string>
+				<string>6366E66F93E642058D9E009A</string>
+				<string>83375796C851483F940C53E5</string>
+			</array>
+			<key>isa</key>
+			<string>PBXFrameworksBuildPhase</string>
+			<key>runOnlyForDeploymentPostprocessing</key>
+			<string>0</string>
 		</dict>
-		<key>24B88BFF53DD450797C75E79</key>
+		<key>5B598451874F4A7AA70690A1</key>
 		<dict>
+			<key>explicitFileType</key>
+			<string>archive.ar</string>
 			<key>includeInIndex</key>
-			<string>1</string>
+			<string>0</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
 			<key>path</key>
-			<string>support.png</string>
+			<string>libib.a</string>
 			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
+			<string>BUILT_PRODUCTS_DIR</string>
 		</dict>
-		<key>28AF8D3E96D64976BCBBB1A4</key>
+		<key>61367EE7640A43A28E282577</key>
 		<dict>
+			<key>includeInIndex</key>
+			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
 			<key>lastKnownFileType</key>
-			<string>wrapper.framework</string>
+			<string>sourcecode.c.h</string>
 			<key>name</key>
-			<string>Cocoa.framework</string>
+			<string>base64.h</string>
 			<key>path</key>
-			<string>Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework</string>
+			<string>SocketRocket/base64.h</string>
 			<key>sourceTree</key>
-			<string>DEVELOPER_DIR</string>
+			<string>&lt;group&gt;</string>
 		</dict>
-		<key>294C923CA8B342E884DB19CD</key>
+		<key>6366E66F93E642058D9E009A</key>
+		<dict>
+			<key>fileRef</key>
+			<string>3C65871CCA0A4C73AE5F2ADB</string>
+			<key>isa</key>
+			<string>PBXBuildFile</string>
+		</dict>
+		<key>653FC7C4F82742C892B58275</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>sourcecode.c.h</string>
-			<key>name</key>
-			<string>base64.h</string>
 			<key>path</key>
-			<string>SocketRocket/base64.h</string>
+			<string>holiday.png</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
+		</dict>
+		<key>66C3E590A78E410D852801F1</key>
+		<dict>
+			<key>children</key>
+			<array>
+				<string>50D5D6571FDD4AAEA2A8DF91</string>
+				<string>A0503A8F6CBA4A45B7F8D2DD</string>
+				<string>AC376AE042EF425BB99D473E</string>
+				<string>8DF050F49A944EB5A4213379</string>
+				<string>09B29B12FE48426FB71A0948</string>
+			</array>
+			<key>isa</key>
+			<string>PBXGroup</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>2B5D235A63634D89AEC5F8EC</key>
+		<key>6E155C4E4D834C018845FC6C</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
 			<key>path</key>
-			<string>missing_artwork.png</string>
+			<string>k_logo_col_18x18.png</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>2D95D1C623F2417CA56280F9</key>
+		<key>700DD7B596CA40EEA7B55EAD</key>
 		<dict>
+			<key>includeInIndex</key>
+			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>wrapper.framework</string>
-			<key>name</key>
-			<string>CoreGraphics.framework</string>
 			<key>path</key>
-			<string>Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreGraphics.framework</string>
+			<string>campfire.png</string>
 			<key>sourceTree</key>
-			<string>DEVELOPER_DIR</string>
+			<string>&lt;group&gt;</string>
 		</dict>
-		<key>329131F71AE24BCDA7449A0E</key>
+		<key>70E469314A7F4D0794491D9A</key>
 		<dict>
-			<key>children</key>
-			<array>
-				<string>28AF8D3E96D64976BCBBB1A4</string>
-				<string>19BC4353BC2244BB9297E060</string>
-				<string>2D95D1C623F2417CA56280F9</string>
-				<string>C7D50B78258E41AAA181DA6A</string>
-			</array>
+			<key>includeInIndex</key>
+			<string>1</string>
 			<key>isa</key>
-			<string>PBXGroup</string>
-			<key>name</key>
-			<string>OS X</string>
+			<string>PBXFileReference</string>
+			<key>path</key>
+			<string>timesheet.png</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>36E352D0962A4D5C8DBCB85C</key>
+		<key>79BFF00DF07B432F91659B67</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
@@ -252,40 +342,27 @@
 			<key>lastKnownFileType</key>
 			<string>sourcecode.c.h</string>
 			<key>name</key>
-			<string>SRWebSocket.h</string>
+			<string>MASShortcut+Monitoring.h</string>
 			<key>path</key>
-			<string>SocketRocket/SRWebSocket.h</string>
+			<string>MASShortcut/MASShortcut+Monitoring.h</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>37913342793D4201B20F4E2E</key>
+		<key>7A906E8B37CB499E89FB9E45</key>
 		<dict>
 			<key>fileRef</key>
-			<string>19BC4353BC2244BB9297E060</string>
+			<string>989C742BF6424874A7F6777F</string>
 			<key>isa</key>
 			<string>PBXBuildFile</string>
 		</dict>
-		<key>3A627F5D75964FE697F29C07</key>
-		<dict>
-			<key>buildActionMask</key>
-			<string>2147483647</string>
-			<key>files</key>
-			<array>
-				<string>82AC034C233A4FCA8EB78AB0</string>
-			</array>
-			<key>isa</key>
-			<string>PBXSourcesBuildPhase</string>
-			<key>runOnlyForDeploymentPostprocessing</key>
-			<string>0</string>
-		</dict>
-		<key>3B1EDEDBC70340E99D1877FA</key>
+		<key>83375796C851483F940C53E5</key>
 		<dict>
 			<key>fileRef</key>
-			<string>2D95D1C623F2417CA56280F9</string>
+			<string>38D70B184CFD4CAF97DECB04</string>
 			<key>isa</key>
 			<string>PBXBuildFile</string>
 		</dict>
-		<key>43A9C901422042E1B5DD3BDE</key>
+		<key>83B64533F4CF496DA81E7988</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
@@ -298,36 +375,49 @@
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>444137A6874745E6AFE1D082</key>
+		<key>899BE913B1BC4AA69CE36CFF</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>sourcecode.c.h</string>
-			<key>name</key>
-			<string>MASShortcut+UserDefaults.h</string>
 			<key>path</key>
-			<string>MASShortcut/MASShortcut+UserDefaults.h</string>
+			<string>pivotal.png</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>456957EFF0C04667B0B587A0</key>
+		<key>8DF050F49A944EB5A4213379</key>
 		<dict>
-			<key>buildConfigurations</key>
+			<key>children</key>
 			<array>
-				<string>E7D17D17B624404B9404C6A0</string>
-				<string>B37CF06DE41245438497A010</string>
+				<string>D7343AD423A9430A8416FE6A</string>
+				<string>111D6DA4C2F6477CAC141E69</string>
 			</array>
-			<key>defaultConfigurationIsVisible</key>
-			<string>0</string>
-			<key>defaultConfigurationName</key>
-			<string>Release</string>
 			<key>isa</key>
-			<string>XCConfigurationList</string>
+			<string>PBXGroup</string>
+			<key>name</key>
+			<string>Supporting Files</string>
+			<key>path</key>
+			<string>ib.xcodeproj</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
+		</dict>
+		<key>95E21A00F98A40B18B3876CA</key>
+		<dict>
+			<key>includeInIndex</key>
+			<string>1</string>
+			<key>isa</key>
+			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>sourcecode.c.h</string>
+			<key>name</key>
+			<string>MASShortcut+UserDefaults.h</string>
+			<key>path</key>
+			<string>MASShortcut/MASShortcut+UserDefaults.h</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
 		</dict>
-		<key>504E8CA0ECEF4255931EEA51</key>
+		<key>968666874E754B108B3A850F</key>
 		<dict>
 			<key>attributes</key>
 			<dict>
@@ -335,7 +425,7 @@
 				<string>0500</string>
 			</dict>
 			<key>buildConfigurationList</key>
-			<string>D47CA397F144400C9BDB0060</string>
+			<string>2E32826FCE3C4444B0E47CD4</string>
 			<key>compatibilityVersion</key>
 			<string>Xcode 3.2</string>
 			<key>developmentRegion</key>
@@ -349,9 +439,9 @@
 				<string>en</string>
 			</array>
 			<key>mainGroup</key>
-			<string>D5444D7854F14F82B69A94F0</string>
+			<string>66C3E590A78E410D852801F1</string>
 			<key>productRefGroup</key>
-			<string>BB447D4202E74DF794444E33</string>
+			<string>50D5D6571FDD4AAEA2A8DF91</string>
 			<key>projectDirPath</key>
 			<string></string>
 			<key>projectReferences</key>
@@ -360,144 +450,128 @@
 			<string></string>
 			<key>targets</key>
 			<array>
-				<string>22ABEBFBFE394517B7EF3512</string>
+				<string>9BC03126A2C04CEDA11D674B</string>
 			</array>
 		</dict>
-		<key>5FA2582996EA48EB927C5F30</key>
+		<key>989C742BF6424874A7F6777F</key>
 		<dict>
-			<key>includeInIndex</key>
-			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>wrapper.framework</string>
+			<key>name</key>
+			<string>QuartzCore.framework</string>
 			<key>path</key>
-			<string>pivotal.png</string>
+			<string>Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/QuartzCore.framework</string>
 			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
+			<string>DEVELOPER_DIR</string>
 		</dict>
-		<key>70E3BEC285E24226A41ABAA1</key>
+		<key>9954B7D74B544D1BA8122FD8</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
 			<key>path</key>
-			<string>k_logo_bw_18x18.png</string>
+			<string>support.png</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>73C70C59707D402E9C35BAE1</key>
+		<key>9B2CD2FC02BB4A68A8F12484</key>
 		<dict>
-			<key>includeInIndex</key>
-			<string>1</string>
-			<key>isa</key>
-			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>file.xib</string>
-			<key>path</key>
-			<string>Preferences.xib</string>
-			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
-		</dict>
-		<key>760CAEC75D3D4D25B45FAE46</key>
-		<dict>
-			<key>includeInIndex</key>
-			<string>1</string>
-			<key>isa</key>
-			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>sourcecode.c.h</string>
-			<key>path</key>
-			<string>Stubs.h</string>
-			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
-		</dict>
-		<key>82AC034C233A4FCA8EB78AB0</key>
-		<dict>
-			<key>fileRef</key>
-			<string>00342BDD299C426BA0F09701</string>
+			<key>fileRef</key>
+			<string>111D6DA4C2F6477CAC141E69</string>
 			<key>isa</key>
 			<string>PBXBuildFile</string>
 		</dict>
-		<key>91E30869F54A44F183460124</key>
+		<key>9BC03126A2C04CEDA11D674B</key>
 		<dict>
-			<key>includeInIndex</key>
-			<string>1</string>
+			<key>buildConfigurationList</key>
+			<string>AB376703AC374D0A9976DEED</string>
+			<key>buildPhases</key>
+			<array>
+				<string>2D4B95107FAD4D3189BD308B</string>
+				<string>5771BB1904E34DACBD5ACB57</string>
+			</array>
+			<key>buildRules</key>
+			<array/>
+			<key>dependencies</key>
+			<array/>
 			<key>isa</key>
-			<string>PBXFileReference</string>
-			<key>path</key>
-			<string>timesheet.png</string>
-			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
+			<string>PBXNativeTarget</string>
+			<key>name</key>
+			<string>ib</string>
+			<key>productName</key>
+			<string>ib</string>
+			<key>productReference</key>
+			<string>5B598451874F4A7AA70690A1</string>
+			<key>productType</key>
+			<string>com.apple.product-type.library.static</string>
 		</dict>
-		<key>93484FC2184C4E96953BF9B0</key>
+		<key>9E9B75DDF12F4D679B645AB4</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
 			<key>path</key>
-			<string>turd.png</string>
+			<string>k_logo_bw_18x18.png</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>953161F0478144E99AA953F2</key>
+		<key>A0503A8F6CBA4A45B7F8D2DD</key>
 		<dict>
 			<key>children</key>
 			<array>
-				<string>760CAEC75D3D4D25B45FAE46</string>
-				<string>00342BDD299C426BA0F09701</string>
+				<string>EFC446AF6B3E46E88F074DE7</string>
 			</array>
 			<key>isa</key>
 			<string>PBXGroup</string>
 			<key>name</key>
-			<string>Supporting Files</string>
-			<key>path</key>
-			<string>ib.xcodeproj</string>
+			<string>Frameworks</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>98D7C6E3D7AF416EB2034D80</key>
+		<key>AB376703AC374D0A9976DEED</key>
 		<dict>
-			<key>includeInIndex</key>
-			<string>1</string>
+			<key>buildConfigurations</key>
+			<array>
+				<string>D76258F2641C4FC4B03DF27F</string>
+				<string>CE0DDBB1F0F9472F9FA7C88B</string>
+			</array>
+			<key>defaultConfigurationIsVisible</key>
+			<string>0</string>
+			<key>defaultConfigurationName</key>
+			<string>Release</string>
 			<key>isa</key>
-			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>sourcecode.c.h</string>
-			<key>name</key>
-			<string>NSData+SRB64Additions.h</string>
-			<key>path</key>
-			<string>SocketRocket/NSData+SRB64Additions.h</string>
-			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
+			<string>XCConfigurationList</string>
 		</dict>
-		<key>993C800D1B7A47398DD1E760</key>
+		<key>AC376AE042EF425BB99D473E</key>
 		<dict>
-			<key>includeInIndex</key>
-			<string>1</string>
+			<key>children</key>
+			<array>
+				<string>700DD7B596CA40EEA7B55EAD</string>
+				<string>653FC7C4F82742C892B58275</string>
+				<string>E995FACC38FA4B19ABFA8394</string>
+				<string>9E9B75DDF12F4D679B645AB4</string>
+				<string>6E155C4E4D834C018845FC6C</string>
+				<string>F72B49FFB30F4C3CB5F2F4C7</string>
+				<string>899BE913B1BC4AA69CE36CFF</string>
+				<string>9954B7D74B544D1BA8122FD8</string>
+				<string>70E469314A7F4D0794491D9A</string>
+				<string>1F414271A3EC4AE0B4E0CE78</string>
+				<string>EDE3AE35122D41FD8DA5EF18</string>
+			</array>
 			<key>isa</key>
-			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>sourcecode.c.h</string>
+			<string>PBXGroup</string>
+			<key>name</key>
+			<string>Resources</string>
 			<key>path</key>
-			<string>____Pods-MASShortcut-prefix.h</string>
+			<string>resources</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>A325410144A84DECAA89626B</key>
-		<dict>
-			<key>explicitFileType</key>
-			<string>archive.ar</string>
-			<key>includeInIndex</key>
-			<string>0</string>
-			<key>isa</key>
-			<string>PBXFileReference</string>
-			<key>path</key>
-			<string>libib.a</string>
-			<key>sourceTree</key>
-			<string>BUILT_PRODUCTS_DIR</string>
-		</dict>
-		<key>AB604D9B24524C7C9968B1E9</key>
+		<key>AEAAE51D8A8047BABCA6091E</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
@@ -506,24 +580,26 @@
 			<key>lastKnownFileType</key>
 			<string>sourcecode.c.h</string>
 			<key>name</key>
-			<string>MASShortcut+Monitoring.h</string>
+			<string>MASShortcutView.h</string>
 			<key>path</key>
-			<string>MASShortcut/MASShortcut+Monitoring.h</string>
+			<string>MASShortcut/MASShortcutView.h</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>AC704A8A2CB041B285854C48</key>
+		<key>BBD77DA643A64CA1BC9837EA</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>sourcecode.c.h</string>
 			<key>path</key>
-			<string>campfire.png</string>
+			<string>____Pods-environment.h</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>B1D6AADAA4B24932AB1B3BB3</key>
+		<key>BF264D44E3484F00BF6C546B</key>
 		<dict>
 			<key>buildSettings</key>
 			<dict>
@@ -552,20 +628,11 @@
 				<key>CLANG_WARN_OBJC_ROOT_CLASS</key>
 				<string>YES_ERROR</string>
 				<key>COPY_PHASE_STRIP</key>
-				<string>YES</string>
-				<key>GCC_C_LANGUAGE_STANDARD</key>
-				<string>gnu99</string>
-				<key>GCC_DYNAMIC_NO_PIC</key>
 				<string>NO</string>
-				<key>GCC_OPTIMIZATION_LEVEL</key>
-				<string>0</string>
-				<key>GCC_PREPROCESSOR_DEFINITIONS</key>
-				<array>
-					<string>DEBUG=1</string>
-					<string>$(inherited)</string>
-				</array>
-				<key>GCC_SYMBOLS_PRIVATE_EXTERN</key>
+				<key>ENABLE_NS_ASSERTIONS</key>
 				<string>NO</string>
+				<key>GCC_C_LANGUAGE_STANDARD</key>
+				<string>gnu99</string>
 				<key>GCC_WARN_64_TO_32_BIT_CONVERSION</key>
 				<string>YES</string>
 				<key>GCC_WARN_ABOUT_RETURN_TYPE</key>
@@ -578,26 +645,45 @@
 				<string>YES</string>
 				<key>GCC_WARN_UNUSED_VARIABLE</key>
 				<string>YES</string>
-				<key>ONLY_ACTIVE_ARCH</key>
+				<key>VALIDATE_PRODUCT</key>
 				<string>YES</string>
 			</dict>
 			<key>isa</key>
 			<string>XCBuildConfiguration</string>
 			<key>name</key>
-			<string>Debug</string>
+			<string>Release</string>
 		</dict>
-		<key>B24B1E9AF8A646A6BF6FE9A4</key>
+		<key>C170F2448BDF464AA752D1A9</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
 			<key>isa</key>
 			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>sourcecode.c.h</string>
+			<key>name</key>
+			<string>MASShortcut.h</string>
 			<key>path</key>
-			<string>holiday.png</string>
+			<string>MASShortcut/MASShortcut.h</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>B37CF06DE41245438497A010</key>
+		<key>C21009BE7FD641899FDBA080</key>
+		<dict>
+			<key>includeInIndex</key>
+			<string>1</string>
+			<key>isa</key>
+			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>sourcecode.c.h</string>
+			<key>name</key>
+			<string>MASShortcutView+UserDefaults.h</string>
+			<key>path</key>
+			<string>MASShortcut/MASShortcutView+UserDefaults.h</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
+		</dict>
+		<key>CE0DDBB1F0F9472F9FA7C88B</key>
 		<dict>
 			<key>buildSettings</key>
 			<dict>
@@ -646,49 +732,7 @@
 			<key>name</key>
 			<string>Debug</string>
 		</dict>
-		<key>BB447D4202E74DF794444E33</key>
-		<dict>
-			<key>children</key>
-			<array>
-				<string>A325410144A84DECAA89626B</string>
-			</array>
-			<key>isa</key>
-			<string>PBXGroup</string>
-			<key>name</key>
-			<string>Products</string>
-			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
-		</dict>
-		<key>C6024F8B5B054506A84DC672</key>
-		<dict>
-			<key>buildActionMask</key>
-			<string>2147483647</string>
-			<key>files</key>
-			<array>
-				<string>CA4B343B93574EEEAE26111A</string>
-				<string>37913342793D4201B20F4E2E</string>
-				<string>3B1EDEDBC70340E99D1877FA</string>
-				<string>F3B5D4E20F2F471B8E56544B</string>
-			</array>
-			<key>isa</key>
-			<string>PBXFrameworksBuildPhase</string>
-			<key>runOnlyForDeploymentPostprocessing</key>
-			<string>0</string>
-		</dict>
-		<key>C7D50B78258E41AAA181DA6A</key>
-		<dict>
-			<key>isa</key>
-			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>wrapper.framework</string>
-			<key>name</key>
-			<string>CoreData.framework</string>
-			<key>path</key>
-			<string>Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreData.framework</string>
-			<key>sourceTree</key>
-			<string>DEVELOPER_DIR</string>
-		</dict>
-		<key>C84DD76396C44DA685862D38</key>
+		<key>D7343AD423A9430A8416FE6A</key>
 		<dict>
 			<key>includeInIndex</key>
 			<string>1</string>
@@ -696,103 +740,12 @@
 			<string>PBXFileReference</string>
 			<key>lastKnownFileType</key>
 			<string>sourcecode.c.h</string>
-			<key>name</key>
-			<string>MASShortcutView.h</string>
-			<key>path</key>
-			<string>MASShortcut/MASShortcutView.h</string>
-			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
-		</dict>
-		<key>CA4B343B93574EEEAE26111A</key>
-		<dict>
-			<key>fileRef</key>
-			<string>28AF8D3E96D64976BCBBB1A4</string>
-			<key>isa</key>
-			<string>PBXBuildFile</string>
-		</dict>
-		<key>D47CA397F144400C9BDB0060</key>
-		<dict>
-			<key>buildConfigurations</key>
-			<array>
-				<string>B1D6AADAA4B24932AB1B3BB3</string>
-				<string>1B51A59743864149ABE2B623</string>
-			</array>
-			<key>defaultConfigurationIsVisible</key>
-			<string>0</string>
-			<key>defaultConfigurationName</key>
-			<string>Release</string>
-			<key>isa</key>
-			<string>XCConfigurationList</string>
-		</dict>
-		<key>D5444D7854F14F82B69A94F0</key>
-		<dict>
-			<key>children</key>
-			<array>
-				<string>BB447D4202E74DF794444E33</string>
-				<string>DE9B582D690545F88599083D</string>
-				<string>E94F94F174344016AF3AEE6D</string>
-				<string>953161F0478144E99AA953F2</string>
-				<string>D601E0235F39494ABD6BB4BC</string>
-			</array>
-			<key>isa</key>
-			<string>PBXGroup</string>
-			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
-		</dict>
-		<key>D601E0235F39494ABD6BB4BC</key>
-		<dict>
-			<key>children</key>
-			<array>
-				<string>126EB380B69F4FAC9DD1A74B</string>
-				<string>993C800D1B7A47398DD1E760</string>
-				<string>43A9C901422042E1B5DD3BDE</string>
-				<string>AB604D9B24524C7C9968B1E9</string>
-				<string>444137A6874745E6AFE1D082</string>
-				<string>DD7BC784920F400B91AFB4C3</string>
-				<string>19AB52072B4B4F45AED62762</string>
-				<string>C84DD76396C44DA685862D38</string>
-				<string>294C923CA8B342E884DB19CD</string>
-				<string>98D7C6E3D7AF416EB2034D80</string>
-				<string>36E352D0962A4D5C8DBCB85C</string>
-			</array>
-			<key>isa</key>
-			<string>PBXGroup</string>
-			<key>name</key>
-			<string>Pods</string>
-			<key>path</key>
-			<string>vendor/Pods/Headers</string>
-			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
-		</dict>
-		<key>DD7BC784920F400B91AFB4C3</key>
-		<dict>
-			<key>includeInIndex</key>
-			<string>1</string>
-			<key>isa</key>
-			<string>PBXFileReference</string>
-			<key>lastKnownFileType</key>
-			<string>sourcecode.c.h</string>
-			<key>name</key>
-			<string>MASShortcut.h</string>
 			<key>path</key>
-			<string>MASShortcut/MASShortcut.h</string>
-			<key>sourceTree</key>
-			<string>&lt;group&gt;</string>
-		</dict>
-		<key>DE9B582D690545F88599083D</key>
-		<dict>
-			<key>children</key>
-			<array>
-				<string>329131F71AE24BCDA7449A0E</string>
-			</array>
-			<key>isa</key>
-			<string>PBXGroup</string>
-			<key>name</key>
-			<string>Frameworks</string>
+			<string>Stubs.h</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>E7D17D17B624404B9404C6A0</key>
+		<key>D76258F2641C4FC4B03DF27F</key>
 		<dict>
 			<key>buildSettings</key>
 			<dict>
@@ -842,40 +795,87 @@
 			<key>name</key>
 			<string>Release</string>
 		</dict>
-		<key>E94F94F174344016AF3AEE6D</key>
+		<key>DCC2DD151C034A288A0A3B7D</key>
+		<dict>
+			<key>includeInIndex</key>
+			<string>1</string>
+			<key>isa</key>
+			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>sourcecode.c.h</string>
+			<key>name</key>
+			<string>NSData+SRB64Additions.h</string>
+			<key>path</key>
+			<string>SocketRocket/NSData+SRB64Additions.h</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
+		</dict>
+		<key>DF56046E7B574D818CFAED05</key>
+		<dict>
+			<key>isa</key>
+			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>wrapper.framework</string>
+			<key>name</key>
+			<string>Cocoa.framework</string>
+			<key>path</key>
+			<string>Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework</string>
+			<key>sourceTree</key>
+			<string>DEVELOPER_DIR</string>
+		</dict>
+		<key>E995FACC38FA4B19ABFA8394</key>
+		<dict>
+			<key>includeInIndex</key>
+			<string>1</string>
+			<key>isa</key>
+			<string>PBXFileReference</string>
+			<key>path</key>
+			<string>jukebox.png</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
+		</dict>
+		<key>EDE3AE35122D41FD8DA5EF18</key>
+		<dict>
+			<key>includeInIndex</key>
+			<string>1</string>
+			<key>isa</key>
+			<string>PBXFileReference</string>
+			<key>lastKnownFileType</key>
+			<string>file.xib</string>
+			<key>path</key>
+			<string>Preferences.xib</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
+		</dict>
+		<key>EFC446AF6B3E46E88F074DE7</key>
 		<dict>
 			<key>children</key>
 			<array>
-				<string>AC704A8A2CB041B285854C48</string>
-				<string>B24B1E9AF8A646A6BF6FE9A4</string>
-				<string>144B8815E2BF4417B582EC8A</string>
-				<string>70E3BEC285E24226A41ABAA1</string>
-				<string>00E9851F8AFA4BB9A7EFB67C</string>
-				<string>2B5D235A63634D89AEC5F8EC</string>
-				<string>5FA2582996EA48EB927C5F30</string>
-				<string>24B88BFF53DD450797C75E79</string>
-				<string>91E30869F54A44F183460124</string>
-				<string>93484FC2184C4E96953BF9B0</string>
-				<string>73C70C59707D402E9C35BAE1</string>
+				<string>DF56046E7B574D818CFAED05</string>
+				<string>989C742BF6424874A7F6777F</string>
+				<string>3C65871CCA0A4C73AE5F2ADB</string>
+				<string>38D70B184CFD4CAF97DECB04</string>
 			</array>
 			<key>isa</key>
 			<string>PBXGroup</string>
 			<key>name</key>
-			<string>Resources</string>
-			<key>path</key>
-			<string>resources</string>
+			<string>OS X</string>
 			<key>sourceTree</key>
 			<string>&lt;group&gt;</string>
 		</dict>
-		<key>F3B5D4E20F2F471B8E56544B</key>
+		<key>F72B49FFB30F4C3CB5F2F4C7</key>
 		<dict>
-			<key>fileRef</key>
-			<string>C7D50B78258E41AAA181DA6A</string>
+			<key>includeInIndex</key>
+			<string>1</string>
 			<key>isa</key>
-			<string>PBXBuildFile</string>
+			<string>PBXFileReference</string>
+			<key>path</key>
+			<string>missing_artwork.png</string>
+			<key>sourceTree</key>
+			<string>&lt;group&gt;</string>
 		</dict>
 	</dict>
 	<key>rootObject</key>
-	<string>504E8CA0ECEF4255931EEA51</string>
+	<string>968666874E754B108B3A850F</string>
 </dict>
 </plist>
diff --git a/ib.xcodeproj/project.xcworkspace/xcuserdata/duncan.xcuserdatad/UserInterfaceState.xcuserstate b/ib.xcodeproj/project.xcworkspace/xcuserdata/duncan.xcuserdatad/UserInterfaceState.xcuserstate
index 439b0e8..8f0db72 100644
Binary files a/ib.xcodeproj/project.xcworkspace/xcuserdata/duncan.xcuserdatad/UserInterfaceState.xcuserstate and b/ib.xcodeproj/project.xcworkspace/xcuserdata/duncan.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ib.xcodeproj/xcuserdata/duncan.xcuserdatad/xcschemes/xcschememanagement.plist b/ib.xcodeproj/xcuserdata/duncan.xcuserdatad/xcschemes/xcschememanagement.plist
index 6a1eb39..f8f7924 100644
--- a/ib.xcodeproj/xcuserdata/duncan.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/ib.xcodeproj/xcuserdata/duncan.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -27,6 +27,36 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>7712566F02B8460BAAB92966</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>83493AEE5C0D45A7884E3E8E</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>9BC03126A2C04CEDA11D674B</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>C3900FF4548F4EE483480675</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>EA05158828C240349470CD36</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>F8A5EC05FD584912B241FD91</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>
diff --git a/resources/Preferences.xib b/resources/Preferences.xib
index de4d234..d79343a 100644
--- a/resources/Preferences.xib
+++ b/resources/Preferences.xib
@@ -15,14 +15,14 @@
         <customObject id="-3" userLabel="Application"/>
         <window title="KyanBar Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" wantsToBeColor="NO" appearanceType="aqua" animationBehavior="default" id="1" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
-            <rect key="contentRect" x="196" y="240" width="411" height="256"/>
+            <rect key="contentRect" x="196" y="240" width="411" height="288"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="411" height="256"/>
+                <rect key="frame" x="0.0" y="0.0" width="411" height="288"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kuZ-hG-CA5">
-                        <rect key="frame" x="18" y="216" width="225" height="18"/>
+                        <rect key="frame" x="18" y="248" width="225" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="LJO-ap-bIT">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -33,7 +33,7 @@
                         </connections>
                     </button>
                     <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0uH-RX-QUa">
-                        <rect key="frame" x="247" y="212" width="147" height="26"/>
+                        <rect key="frame" x="247" y="244" width="147" height="26"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="xWA-OK-Enm">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -53,7 +53,7 @@
                         </connections>
                     </popUpButton>
                     <textField appearanceType="aqua" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Sub-b7-u3Z">
-                        <rect key="frame" x="95" y="132" width="296" height="22"/>
+                        <rect key="frame" x="95" y="134" width="296" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="please enter your username" drawsBackground="YES" usesSingleLineMode="YES" id="dIB-uO-xig">
                             <font key="font" metaFont="cellTitle"/>
@@ -69,7 +69,7 @@
                         </connections>
                     </textField>
                     <textField appearanceType="aqua" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XP5-qN-yfl">
-                        <rect key="frame" x="18" y="135" width="71" height="17"/>
+                        <rect key="frame" x="18" y="137" width="71" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Username:" id="DVI-ra-6GF">
                             <font key="font" metaFont="system"/>
@@ -78,7 +78,7 @@
                         </textFieldCell>
                     </textField>
                     <textField appearanceType="aqua" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Fcd-zR-2JW">
-                        <rect key="frame" x="19" y="47" width="70" height="17"/>
+                        <rect key="frame" x="19" y="49" width="70" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Vote up:" id="cru-cy-lOB">
                             <font key="font" metaFont="system"/>
@@ -87,7 +87,7 @@
                         </textFieldCell>
                     </textField>
                     <textField appearanceType="aqua" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hmg-Bs-OzK">
-                        <rect key="frame" x="18" y="104" width="71" height="17"/>
+                        <rect key="frame" x="18" y="106" width="71" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Password:" id="GPB-VN-ixZ">
                             <font key="font" metaFont="system"/>
@@ -96,7 +96,7 @@
                         </textFieldCell>
                     </textField>
                     <textField appearanceType="aqua" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zil-wr-w1V">
-                        <rect key="frame" x="20" y="161" width="373" height="17"/>
+                        <rect key="frame" x="20" y="163" width="373" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Jukebox Credentials" id="ktu-b0-Q4o">
                             <font key="font" size="11" name="LucidaGrande"/>
@@ -105,7 +105,7 @@
                         </textFieldCell>
                     </textField>
                     <textField appearanceType="aqua" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bSe-tt-Qx1">
-                        <rect key="frame" x="20" y="72" width="373" height="17"/>
+                        <rect key="frame" x="20" y="74" width="373" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Customise Keys" id="DrE-2l-whV">
                             <font key="font" size="11" name="LucidaGrande"/>
@@ -114,7 +114,7 @@
                         </textFieldCell>
                     </textField>
                     <secureTextField appearanceType="aqua" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hdl-x6-f9B">
-                        <rect key="frame" x="95" y="101" width="296" height="22"/>
+                        <rect key="frame" x="95" y="103" width="296" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="please enter your password" drawsBackground="YES" usesSingleLineMode="YES" id="8Oy-Um-Mo3">
                             <font key="font" metaFont="cellTitle"/>
@@ -133,7 +133,7 @@
                         </connections>
                     </secureTextField>
                     <button appearanceType="aqua" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jae-Oz-Ju1">
-                        <rect key="frame" x="18" y="189" width="374" height="18"/>
+                        <rect key="frame" x="18" y="221" width="374" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Jukebox remote window always on top" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="GD4-Yt-sPK">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -148,12 +148,29 @@
                             </binding>
                         </connections>
                     </button>
+                    <button appearanceType="aqua" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m3z-Rs-bNL">
+                        <rect key="frame" x="18" y="195" width="374" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="Always show votes" bezelStyle="regularSquare" imagePosition="left" inset="2" id="UUC-wI-aAk">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="toggle_always_show_votes:" target="-2" id="6O9-i2-6Zi"/>
+                            <binding destination="62v-zO-hda" name="value" keyPath="values.alwaysShowVotes" id="DcC-fR-5ij">
+                                <dictionary key="options">
+                                    <bool key="NSValidatesImmediately" value="YES"/>
+                                    <bool key="NSConditionallySetsEnabled" value="NO"/>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </button>
                     <customView appearanceType="aqua" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Rc0-q2-3Fy" customClass="MASShortcutView">
-                        <rect key="frame" x="95" y="44" width="295" height="19"/>
+                        <rect key="frame" x="95" y="46" width="295" height="19"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     </customView>
                     <textField appearanceType="aqua" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nah-bw-OmD">
-                        <rect key="frame" x="20" y="22" width="75" height="17"/>
+                        <rect key="frame" x="20" y="24" width="75" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Vote down:" id="3tJ-i7-gax">
                             <font key="font" metaFont="system"/>
@@ -162,7 +179,7 @@
                         </textFieldCell>
                     </textField>
                     <customView appearanceType="aqua" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Pf1-n4-DnP" customClass="MASShortcutView">
-                        <rect key="frame" x="96" y="19" width="294" height="19"/>
+                        <rect key="frame" x="96" y="21" width="294" height="19"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     </customView>
                 </subviews>