diff --git a/AppController.m b/AppController.m
index d38e533..f5525cd 100644
--- a/AppController.m
+++ b/AppController.m
@@ -184,7 +184,7 @@ - (void)userDefaultsLoad
 		device = [NSKeyedUnarchiver unarchiveObjectWithData:deviceAsData];
 		[device retain];
 		[deviceName setStringValue:[NSString stringWithFormat:@"%@ (%@)",
-									[device getName], [device getAddressString]]];
+									[device name], [device addressString]]];
 		
 		if( [self isInRange] )
 		{			
@@ -306,8 +306,8 @@ - (IBAction)changeDevice:(id)sender
 	[device retain];
 	
 	[deviceName setStringValue:[NSString stringWithFormat:@"%@ (%@)",
-								[device getName],
-								[device getAddressString]]];    
+								[device name],
+								[device addressString]]];    
 }
 
 - (IBAction)checkConnectivity:(id)sender
@@ -355,10 +355,17 @@ - (IBAction)enableMonitoring:(id)sender
 - (IBAction)inRangeScriptChange:(id)sender
 {
 	NSOpenPanel *op = [NSOpenPanel openPanel];
-	[op runModalForDirectory:@"~" file:nil types:[NSArray arrayWithObject:@"scpt"]];
-	
-	NSArray *filenames = [op filenames];
-	[inRangeScriptPath setStringValue:[filenames objectAtIndex:0]];	
+  
+  NSArray *fileTypesArray;
+  fileTypesArray = [NSArray arrayWithObjects:@"scpt", nil];
+  
+  [op setCanChooseFiles:YES];
+  [op setAllowedFileTypes:fileTypesArray];
+  
+  if ( [op runModal] == NSOKButton ) {
+    NSArray *filenames = [op URLs];    
+  	[inRangeScriptPath setStringValue:[[filenames objectAtIndex:0] path]];
+  }
 }
 
 - (IBAction)inRangeScriptClear:(id)sender
@@ -374,10 +381,17 @@ - (IBAction)inRangeScriptTest:(id)sender
 - (IBAction)outOfRangeScriptChange:(id)sender
 {
 	NSOpenPanel *op = [NSOpenPanel openPanel];
-	[op runModalForDirectory:@"~" file:nil types:[NSArray arrayWithObject:@"scpt"]];
-	
-	NSArray *filenames = [op filenames];
-	[outOfRangeScriptPath setStringValue:[filenames objectAtIndex:0]];    
+  
+  NSArray *fileTypesArray;
+  fileTypesArray = [NSArray arrayWithObjects:@"scpt", nil];
+  
+  [op setCanChooseFiles:YES];
+  [op setAllowedFileTypes:fileTypesArray];
+  
+  if ( [op runModal] == NSOKButton ) {
+    NSArray *filenames = [op URLs];    
+  	[outOfRangeScriptPath setStringValue:[[filenames objectAtIndex:0] path]];
+  }
 }
 
 - (IBAction)outOfRangeScriptClear:(id)sender
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index c539edd..52c97cb 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1,29 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1040</int>
-		<string key="IBDocument.SystemVersion">9G55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">677</string>
-		<string key="IBDocument.AppKitVersion">949.43</string>
-		<string key="IBDocument.HIToolboxVersion">353.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">2182</string>
+		</object>
+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="372"/>
-			<integer value="57"/>
+			<string>NSView</string>
+			<string>NSMenu</string>
+			<string>NSWindowTemplate</string>
+			<string>NSMenuItem</string>
+			<string>NSCustomObject</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSProgressIndicator</string>
+			<string>NSButtonCell</string>
+			<string>NSButton</string>
+			<string>NSBox</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilderKit</string>
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -80,7 +87,7 @@
 								</object>
 								<object class="NSMenuItem" id="609285721">
 									<reference key="NSMenu" ref="110575045"/>
-									<string type="base64-UTF8" key="NSTitle">UHJlZmVyZW5jZXPigKY</string>
+									<string key="NSTitle">Preferences…</string>
 									<string key="NSKeyEquiv">,</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -188,7 +195,7 @@
 				<string key="NSWindowTitle">Proximity Preferences</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="439893737">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -201,7 +208,7 @@
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSView" id="932999745">
 									<reference key="NSNextResponder" ref="356640811"/>
-									<int key="NSvFlags">256</int>
+									<int key="NSvFlags">274</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<object class="NSBox" id="791818698">
@@ -211,7 +218,7 @@
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSView" id="962136670">
 													<reference key="NSNextResponder" ref="791818698"/>
-													<int key="NSvFlags">256</int>
+													<int key="NSvFlags">274</int>
 													<object class="NSMutableArray" key="NSSubviews">
 														<bool key="EncodedWithXMLCoder">YES</bool>
 														<object class="NSTextField" id="306610514">
@@ -219,6 +226,8 @@
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{15, 14}, {382, 17}}</string>
 															<reference key="NSSuperview" ref="962136670"/>
+															<reference key="NSWindow"/>
+															<reference key="NSNextKeyView" ref="973417033"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="764220188">
 																<int key="NSCellFlags">68288064</int>
@@ -226,7 +235,7 @@
 																<string key="NSContents">A Bluetooth-enabled device has not been selected</string>
 																<object class="NSFont" key="NSSupport" id="705591581">
 																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">1.300000e+01</double>
+																	<double key="NSSize">13</double>
 																	<int key="NSfFlags">1044</int>
 																</object>
 																<reference key="NSControlView" ref="306610514"/>
@@ -236,7 +245,7 @@
 																	<string key="NSColorName">controlColor</string>
 																	<object class="NSColor" key="NSColor">
 																		<int key="NSColorSpace">3</int>
-																		<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+																		<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 																	</object>
 																</object>
 																<object class="NSColor" key="NSTextColor" id="856612820">
@@ -253,10 +262,14 @@
 													</object>
 													<string key="NSFrame">{{1, 1}, {412, 42}}</string>
 													<reference key="NSSuperview" ref="791818698"/>
+													<reference key="NSWindow"/>
+													<reference key="NSNextKeyView" ref="306610514"/>
 												</object>
 											</object>
 											<string key="NSFrame">{{15, 35}, {414, 44}}</string>
 											<reference key="NSSuperview" ref="932999745"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="962136670"/>
 											<string key="NSOffsets">{0, 0}</string>
 											<object class="NSTextFieldCell" key="NSTitleCell">
 												<int key="NSCellFlags">67239424</int>
@@ -264,7 +277,7 @@
 												<string key="NSContents">Box</string>
 												<object class="NSFont" key="NSSupport" id="26">
 													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">1.100000e+01</double>
+													<double key="NSSize">11</double>
 													<int key="NSfFlags">3100</int>
 												</object>
 												<object class="NSColor" key="NSBackgroundColor" id="360342671">
@@ -292,6 +305,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 12}, {126, 19}}</string>
 											<reference key="NSSuperview" ref="932999745"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="816038747"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="431709628">
 												<int key="NSCellFlags">67239424</int>
@@ -299,12 +314,12 @@
 												<string key="NSContents">Check Connectivity</string>
 												<object class="NSFont" key="NSSupport" id="138396186">
 													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">1.200000e+01</double>
+													<double key="NSSize">12</double>
 													<int key="NSfFlags">16</int>
 												</object>
 												<reference key="NSControlView" ref="973417033"/>
 												<int key="NSButtonFlags">-2038152961</int>
-												<int key="NSButtonFlags2">164</int>
+												<int key="NSButtonFlags2">36</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -316,6 +331,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{326, 12}, {100, 19}}</string>
 											<reference key="NSSuperview" ref="932999745"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="169712618"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="847961988">
 												<int key="NSCellFlags">67239424</int>
@@ -324,7 +341,7 @@
 												<reference key="NSSupport" ref="138396186"/>
 												<reference key="NSControlView" ref="433503410"/>
 												<int key="NSButtonFlags">-2038152961</int>
-												<int key="NSButtonFlags2">164</int>
+												<int key="NSButtonFlags2">36</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -337,17 +354,23 @@
 											<object class="NSPSMatrix" key="NSDrawMatrix"/>
 											<string key="NSFrame">{{152, 14}, {16, 16}}</string>
 											<reference key="NSSuperview" ref="932999745"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="433503410"/>
 											<int key="NSpiFlags">20746</int>
-											<double key="NSMinValue">1.600000e+01</double>
-											<double key="NSMaxValue">1.000000e+02</double>
+											<double key="NSMinValue">16</double>
+											<double key="NSMaxValue">100</double>
 										</object>
 									</object>
 									<string key="NSFrame">{{1, 1}, {444, 87}}</string>
 									<reference key="NSSuperview" ref="356640811"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="791818698"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 207}, {446, 103}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="932999745"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -373,7 +396,7 @@
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSView" id="25415773">
 									<reference key="NSNextResponder" ref="340204799"/>
-									<int key="NSvFlags">256</int>
+									<int key="NSvFlags">274</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<object class="NSButton" id="122493207">
@@ -381,6 +404,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{16, 54}, {287, 18}}</string>
 											<reference key="NSSuperview" ref="25415773"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="92212994"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="755749994">
 												<int key="NSCellFlags">-2080244224</int>
@@ -389,7 +414,7 @@
 												<reference key="NSSupport" ref="705591581"/>
 												<reference key="NSControlView" ref="122493207"/>
 												<int key="NSButtonFlags">1211912703</int>
-												<int key="NSButtonFlags2">130</int>
+												<int key="NSButtonFlags2">2</int>
 												<object class="NSCustomResource" key="NSNormalImage" id="310268118">
 													<string key="NSClassName">NSImage</string>
 													<string key="NSResourceName">NSSwitch</string>
@@ -408,6 +433,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{306, 53}, {51, 22}}</string>
 											<reference key="NSSuperview" ref="25415773"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="465930646"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="921680833">
 												<int key="NSCellFlags">-1804468671</int>
@@ -430,6 +457,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{359, 55}, {56, 17}}</string>
 											<reference key="NSSuperview" ref="25415773"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1034410535"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="175798335">
 												<int key="NSCellFlags">68288064</int>
@@ -446,6 +475,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{16, 14}, {207, 18}}</string>
 											<reference key="NSSuperview" ref="25415773"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="908941237"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="730337219">
 												<int key="NSCellFlags">-2080244224</int>
@@ -454,7 +485,7 @@
 												<reference key="NSSupport" ref="705591581"/>
 												<reference key="NSControlView" ref="706022217"/>
 												<int key="NSButtonFlags">1211912703</int>
-												<int key="NSButtonFlags2">130</int>
+												<int key="NSButtonFlags2">2</int>
 												<reference key="NSNormalImage" ref="310268118"/>
 												<reference key="NSAlternateImage" ref="591418700"/>
 												<string key="NSAlternateContents"/>
@@ -468,6 +499,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{229, 12}, {122, 19}}</string>
 											<reference key="NSSuperview" ref="25415773"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="356640811"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="581479032">
 												<int key="NSCellFlags">-2080244224</int>
@@ -476,7 +509,7 @@
 												<reference key="NSSupport" ref="138396186"/>
 												<reference key="NSControlView" ref="908941237"/>
 												<int key="NSButtonFlags">-2038152961</int>
-												<int key="NSButtonFlags2">164</int>
+												<int key="NSButtonFlags2">36</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -488,6 +521,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{16, 34}, {412, 18}}</string>
 											<reference key="NSSuperview" ref="25415773"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="706022217"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="214578626">
 												<int key="NSCellFlags">-2080244224</int>
@@ -496,7 +531,7 @@
 												<reference key="NSSupport" ref="705591581"/>
 												<reference key="NSControlView" ref="1034410535"/>
 												<int key="NSButtonFlags">1211912703</int>
-												<int key="NSButtonFlags2">130</int>
+												<int key="NSButtonFlags2">2</int>
 												<reference key="NSNormalImage" ref="310268118"/>
 												<reference key="NSAlternateImage" ref="591418700"/>
 												<string key="NSAlternateContents"/>
@@ -508,10 +543,14 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {444, 80}}</string>
 									<reference key="NSSuperview" ref="340204799"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="122493207"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 314}, {446, 96}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="25415773"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -537,7 +576,7 @@
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSView" id="114734999">
 									<reference key="NSNextResponder" ref="169712618"/>
-									<int key="NSvFlags">256</int>
+									<int key="NSvFlags">274</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<object class="NSTextField" id="476541536">
@@ -545,6 +584,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 108}, {127, 17}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="467050240"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="480242380">
 												<int key="NSCellFlags">68288064</int>
@@ -561,6 +602,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 78}, {404, 22}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="276076598"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="744484">
 												<int key="NSCellFlags">-1804468671</int>
@@ -578,6 +621,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{265, 105}, {44, 19}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="309601400"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="49776040">
 												<int key="NSCellFlags">-2080244224</int>
@@ -586,7 +631,7 @@
 												<reference key="NSSupport" ref="138396186"/>
 												<reference key="NSControlView" ref="467050240"/>
 												<int key="NSButtonFlags">-2038152961</int>
-												<int key="NSButtonFlags2">164</int>
+												<int key="NSButtonFlags2">36</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -598,6 +643,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{317, 105}, {39, 19}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="883057787"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="440909092">
 												<int key="NSCellFlags">-2080244224</int>
@@ -606,7 +653,7 @@
 												<reference key="NSSupport" ref="138396186"/>
 												<reference key="NSControlView" ref="309601400"/>
 												<int key="NSButtonFlags">-2038152961</int>
-												<int key="NSButtonFlags2">164</int>
+												<int key="NSButtonFlags2">36</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -618,6 +665,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{364, 105}, {58, 19}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="122639043"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="170456102">
 												<int key="NSCellFlags">-2080244224</int>
@@ -626,7 +675,7 @@
 												<reference key="NSSupport" ref="138396186"/>
 												<reference key="NSControlView" ref="883057787"/>
 												<int key="NSButtonFlags">-2038152961</int>
-												<int key="NSButtonFlags2">164</int>
+												<int key="NSButtonFlags2">36</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -638,6 +687,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 53}, {99, 17}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="650173311"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="164510039">
 												<int key="NSCellFlags">68288064</int>
@@ -654,6 +705,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 23}, {404, 22}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="509429233"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="917449628">
 												<int key="NSCellFlags">-1804468671</int>
@@ -671,6 +724,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{265, 50}, {44, 19}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="963728948"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="293092147">
 												<int key="NSCellFlags">-2080244224</int>
@@ -679,7 +734,7 @@
 												<reference key="NSSupport" ref="138396186"/>
 												<reference key="NSControlView" ref="650173311"/>
 												<int key="NSButtonFlags">-2038152961</int>
-												<int key="NSButtonFlags2">164</int>
+												<int key="NSButtonFlags2">36</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -691,6 +746,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{317, 50}, {39, 19}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="703549185"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="940606346">
 												<int key="NSCellFlags">-2080244224</int>
@@ -699,7 +756,7 @@
 												<reference key="NSSupport" ref="138396186"/>
 												<reference key="NSControlView" ref="963728948"/>
 												<int key="NSButtonFlags">-2038152961</int>
-												<int key="NSButtonFlags2">164</int>
+												<int key="NSButtonFlags2">36</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -711,6 +768,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{364, 50}, {58, 19}}</string>
 											<reference key="NSSuperview" ref="114734999"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="346909374"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="310756046">
 												<int key="NSCellFlags">-2080244224</int>
@@ -719,7 +778,7 @@
 												<reference key="NSSupport" ref="138396186"/>
 												<reference key="NSControlView" ref="703549185"/>
 												<int key="NSButtonFlags">-2038152961</int>
-												<int key="NSButtonFlags2">164</int>
+												<int key="NSButtonFlags2">36</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">400</int>
@@ -729,10 +788,14 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {444, 135}}</string>
 									<reference key="NSSuperview" ref="169712618"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="476541536"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 52}, {446, 151}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="114734999"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -756,6 +819,8 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 20}, {261, 28}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="681803823"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="602692548">
 								<int key="NSCellFlags">67239424</int>
@@ -763,7 +828,7 @@
 								<string key="NSContents">Proximity is donation-ware. If you find this application useful, please consider a donation.</string>
 								<object class="NSFont" key="NSSupport">
 									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">1.100000e+01</double>
+									<double key="NSSize">11</double>
 									<int key="NSfFlags">16</int>
 								</object>
 								<reference key="NSControlView" ref="509429233"/>
@@ -776,6 +841,8 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{306, 23}, {154, 19}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="749920310">
 								<int key="NSCellFlags">-2080244224</int>
@@ -784,7 +851,7 @@
 								<reference key="NSSupport" ref="138396186"/>
 								<reference key="NSControlView" ref="681803823"/>
 								<int key="NSButtonFlags">-2038152961</int>
-								<int key="NSButtonFlags2">164</int>
+								<int key="NSButtonFlags2">36</int>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent"/>
 								<int key="NSPeriodicDelay">400</int>
@@ -794,9 +861,12 @@
 					</object>
 					<string key="NSFrameSize">{480, 430}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="340204799"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSCustomObject" id="755631768">
 				<string key="NSClassName">NSFontManager</string>
@@ -808,6 +878,14 @@
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="1050"/>
+						<reference key="destination" ref="632727374"/>
+					</object>
+					<int key="connectionID">449</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">orderFrontStandardAboutPanel:</string>
@@ -841,12 +919,12 @@
 					<int key="connectionID">370</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="972006081"/>
+						<reference key="destination" ref="498528719"/>
 					</object>
-					<int key="connectionID">449</int>
+					<int key="connectionID">596</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -968,14 +1046,6 @@
 					</object>
 					<int key="connectionID">592</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="972006081"/>
-						<reference key="destination" ref="498528719"/>
-					</object>
-					<int key="connectionID">596</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">enableMonitoring:</string>
@@ -1040,7 +1110,7 @@
 						<int key="objectID">-2</int>
 						<reference key="object" ref="1021"/>
 						<reference key="parent" ref="1049"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+						<string key="objectName">File's Owner</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-1</int>
@@ -1550,44 +1620,26 @@
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
+				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>-1.IBPluginDependency</string>
 					<string>-2.IBPluginDependency</string>
 					<string>-3.IBPluginDependency</string>
 					<string>129.IBPluginDependency</string>
-					<string>129.ImportedFromIB2</string>
 					<string>130.IBPluginDependency</string>
-					<string>130.ImportedFromIB2</string>
-					<string>130.editorWindowContentRectSynchronizationRect</string>
 					<string>131.IBPluginDependency</string>
-					<string>131.ImportedFromIB2</string>
 					<string>134.IBPluginDependency</string>
-					<string>134.ImportedFromIB2</string>
 					<string>136.IBPluginDependency</string>
-					<string>136.ImportedFromIB2</string>
 					<string>143.IBPluginDependency</string>
-					<string>143.ImportedFromIB2</string>
 					<string>144.IBPluginDependency</string>
-					<string>144.ImportedFromIB2</string>
 					<string>145.IBPluginDependency</string>
-					<string>145.ImportedFromIB2</string>
 					<string>149.IBPluginDependency</string>
-					<string>149.ImportedFromIB2</string>
 					<string>150.IBPluginDependency</string>
-					<string>150.ImportedFromIB2</string>
 					<string>236.IBPluginDependency</string>
-					<string>236.ImportedFromIB2</string>
-					<string>29.IBEditorWindowLastContentRect</string>
 					<string>29.IBPluginDependency</string>
-					<string>29.ImportedFromIB2</string>
-					<string>29.WindowOrigin</string>
-					<string>29.editorWindowContentRectSynchronizationRect</string>
-					<string>371.IBEditorWindowLastContentRect</string>
+					<string>371.IBPluginDependency</string>
 					<string>371.IBWindowTemplateEditedContentRect</string>
 					<string>371.NSWindowTemplate.visibleAtLaunch</string>
-					<string>371.editorWindowContentRectSynchronizationRect</string>
-					<string>371.windowTemplate.maxSize</string>
 					<string>372.IBPluginDependency</string>
 					<string>420.IBPluginDependency</string>
 					<string>450.IBPluginDependency</string>
@@ -1623,7 +1675,6 @@
 					<string>558.IBPluginDependency</string>
 					<string>559.IBPluginDependency</string>
 					<string>56.IBPluginDependency</string>
-					<string>56.ImportedFromIB2</string>
 					<string>560.IBPluginDependency</string>
 					<string>561.IBPluginDependency</string>
 					<string>562.IBPluginDependency</string>
@@ -1634,10 +1685,7 @@
 					<string>567.IBPluginDependency</string>
 					<string>568.IBPluginDependency</string>
 					<string>569.IBPluginDependency</string>
-					<string>57.IBEditorWindowLastContentRect</string>
 					<string>57.IBPluginDependency</string>
-					<string>57.ImportedFromIB2</string>
-					<string>57.editorWindowContentRectSynchronizationRect</string>
 					<string>570.IBPluginDependency</string>
 					<string>571.IBPluginDependency</string>
 					<string>573.IBPluginDependency</string>
@@ -1645,46 +1693,27 @@
 					<string>575.IBPluginDependency</string>
 					<string>576.IBPluginDependency</string>
 					<string>58.IBPluginDependency</string>
-					<string>58.ImportedFromIB2</string>
 				</object>
-				<object class="NSMutableArray" key="dict.values">
+				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilderKit</string>
-					<string>com.apple.InterfaceBuilderKit</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1" id="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{436, 809}, {64, 6}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{220, 348}, {111, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{74, 862}</string>
-					<string>{{6, 978}, {478, 20}}</string>
-					<string>{{312, 419}, {480, 430}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{312, 419}, {480, 430}}</string>
 					<boolean value="NO"/>
-					<string>{{33, 99}, {480, 360}}</string>
-					<string>{3.40282e+38, 3.40282e+38}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1720,7 +1749,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1731,10 +1759,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{232, 165}, {203, 183}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>{{23, 794}, {245, 183}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1742,27 +1767,18 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.sortedKeys" ref="1049"/>
+				<reference key="dict.values" ref="1049"/>
 			</object>
 			<nil key="activeLocalization"/>
 			<object class="NSMutableDictionary" key="localizations">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.sortedKeys" ref="1049"/>
+				<reference key="dict.values" ref="1049"/>
 			</object>
 			<nil key="sourceID"/>
 			<int key="maxID">604</int>
@@ -1775,7 +1791,7 @@
 					<string key="superclassName">NSObject</string>
 					<object class="NSMutableDictionary" key="actions">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
+						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>changeDevice:</string>
 							<string>checkConnectivity:</string>
@@ -1790,7 +1806,7 @@
 							<string>outOfRangeScriptTest:</string>
 							<string>showWindow:</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
@@ -1806,9 +1822,78 @@
 							<string>id</string>
 						</object>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>changeDevice:</string>
+							<string>checkConnectivity:</string>
+							<string>checkForUpdates:</string>
+							<string>donate:</string>
+							<string>enableMonitoring:</string>
+							<string>inRangeScriptChange:</string>
+							<string>inRangeScriptClear:</string>
+							<string>inRangeScriptTest:</string>
+							<string>outOfRangeScriptChange:</string>
+							<string>outOfRangeScriptClear:</string>
+							<string>outOfRangeScriptTest:</string>
+							<string>showWindow:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">changeDevice:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">checkConnectivity:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">checkForUpdates:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">donate:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">enableMonitoring:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">inRangeScriptChange:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">inRangeScriptClear:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">inRangeScriptTest:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">outOfRangeScriptChange:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">outOfRangeScriptClear:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">outOfRangeScriptTest:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">showWindow:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
+						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>checkUpdatesOnStartup</string>
 							<string>deviceName</string>
@@ -1820,7 +1905,7 @@
 							<string>runScriptsOnStartup</string>
 							<string>timerInterval</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
@@ -1833,23 +1918,93 @@
 							<string>id</string>
 						</object>
 					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">AppController.h</string>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>checkUpdatesOnStartup</string>
+							<string>deviceName</string>
+							<string>inRangeScriptPath</string>
+							<string>monitoringEnabled</string>
+							<string>outOfRangeScriptPath</string>
+							<string>prefsWindow</string>
+							<string>progressIndicator</string>
+							<string>runScriptsOnStartup</string>
+							<string>timerInterval</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">checkUpdatesOnStartup</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">deviceName</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">inRangeScriptPath</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">monitoringEnabled</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">outOfRangeScriptPath</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">prefsWindow</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">progressIndicator</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">runScriptsOnStartup</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">timerInterval</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
 					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AppController.h</string>
 					</object>
 				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../Proximity.xcodeproj</string>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1040" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="3000" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>NSMenuCheckmark</string>
+				<string>NSMenuMixedState</string>
+				<string>NSSwitch</string>
+			</object>
+			<object class="NSArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{11, 11}</string>
+				<string>{10, 3}</string>
+				<string>{15, 15}</string>
+			</object>
+		</object>
 	</data>
 </archive>
diff --git a/Info.plist b/Info.plist
index d9c1ff8..fbaf6e1 100644
--- a/Info.plist
+++ b/Info.plist
@@ -6,6 +6,8 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>1.5</string>
 	<key>CFBundleIconFile</key>
 	<string>AppIcon</string>
 	<key>CFBundleIdentifier</key>
@@ -13,22 +15,22 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>Proximity</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5</string>
+	<string>1.6</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
+	<key>LSUIElement</key>
+	<true/>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>LSUIElement</key>
-	<true/>
-	<key>CFBundleShortVersionString</key>
-	<string>1.5</string>
-	<key>CFBundleGetInfoString</key>
-	<string>1.5</string>
 </dict>
 </plist>
diff --git a/Proximity.xcodeproj/project.pbxproj b/Proximity.xcodeproj/project.pbxproj
index 15dd84d..3513f68 100644
--- a/Proximity.xcodeproj/project.pbxproj
+++ b/Proximity.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -165,9 +165,16 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0430;
+			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Proximity" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* Proximity */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -230,19 +237,20 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Proximity_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = Proximity;
 			};
 			name = Debug;
@@ -251,6 +259,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -261,6 +270,7 @@
 				GCC_PREFIX_HEADER = Proximity_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = Proximity;
 			};
 			name = Release;
@@ -268,26 +278,24 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.4;
+				ONLY_ACTIVE_ARCH = NO;
+				SDKROOT = "";
 			};
 			name = Debug;
 		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.4;
+				SDKROOT = "";
 			};
 			name = Release;
 		};
diff --git a/Proximity.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Proximity.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..24ab27b
--- /dev/null
+++ b/Proximity.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "container:">
+   </FileRef>
+</Workspace>
diff --git a/Proximity.xcodeproj/project.xcworkspace/xcuserdata/fluxaugur.xcuserdatad/UserInterfaceState.xcuserstate b/Proximity.xcodeproj/project.xcworkspace/xcuserdata/fluxaugur.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..e0069c8
Binary files /dev/null and b/Proximity.xcodeproj/project.xcworkspace/xcuserdata/fluxaugur.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Proximity.xcodeproj/project.xcworkspace/xcuserdata/fluxaugur.xcuserdatad/WorkspaceSettings.xcsettings b/Proximity.xcodeproj/project.xcworkspace/xcuserdata/fluxaugur.xcuserdatad/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000..28f6741
--- /dev/null
+++ b/Proximity.xcodeproj/project.xcworkspace/xcuserdata/fluxaugur.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,22 @@
+<?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>BuildLocationStyle</key>
+	<string>UseAppPreferences</string>
+	<key>CustomBuildLocationType</key>
+	<string>RelativeToDerivedData</string>
+	<key>DerivedDataLocationStyle</key>
+	<string>Default</string>
+	<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+	<true/>
+	<key>IssueFilterStyle</key>
+	<string>ShowActiveSchemeOnly</string>
+	<key>LiveSourceIssuesEnabled</key>
+	<true/>
+	<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
+	<true/>
+	<key>SnapshotLocationStyle</key>
+	<string>Default</string>
+</dict>
+</plist>
diff --git a/Proximity.xcodeproj/xcuserdata/fluxaugur.xcuserdatad/xcschemes/Proximity.xcscheme b/Proximity.xcodeproj/xcuserdata/fluxaugur.xcuserdatad/xcschemes/Proximity.xcscheme
new file mode 100644
index 0000000..4e533ef
--- /dev/null
+++ b/Proximity.xcodeproj/xcuserdata/fluxaugur.xcuserdatad/xcschemes/Proximity.xcscheme
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8D1107260486CEB800E47090"
+               BuildableName = "Proximity.app"
+               BlueprintName = "Proximity"
+               ReferencedContainer = "container:Proximity.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8D1107260486CEB800E47090"
+            BuildableName = "Proximity.app"
+            BlueprintName = "Proximity"
+            ReferencedContainer = "container:Proximity.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8D1107260486CEB800E47090"
+            BuildableName = "Proximity.app"
+            BlueprintName = "Proximity"
+            ReferencedContainer = "container:Proximity.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8D1107260486CEB800E47090"
+            BuildableName = "Proximity.app"
+            BlueprintName = "Proximity"
+            ReferencedContainer = "container:Proximity.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Proximity.xcodeproj/xcuserdata/fluxaugur.xcuserdatad/xcschemes/xcschememanagement.plist b/Proximity.xcodeproj/xcuserdata/fluxaugur.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..c664934
--- /dev/null
+++ b/Proximity.xcodeproj/xcuserdata/fluxaugur.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,22 @@
+<?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>SchemeUserState</key>
+	<dict>
+		<key>Proximity.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>8D1107260486CEB800E47090</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>