Index: /trunk/ICeCoffEE/ICeCoffEE/APEMain.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/APEMain.m	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/APEMain.m	(revision 142)
@@ -130,5 +130,4 @@
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "mouseUp:") &&
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "draggingEntered:") &&
-            ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "draggingExited:") &&
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "_optionClickEvent:::") ,
             ICapeprintf("ICeCoffEE APE: loaded in TermSubview for Terminal!\n");
@@ -190,4 +189,21 @@
 }
 
+void ICCF_GetCFTypePref(CFStringRef prefKey, CFTypeRef *val, CFTypeID type) {
+    if (*val != NULL) {
+        CFRelease(*val);
+        *val = NULL;
+    }
+    
+    *val = CFPreferencesCopyAppValue(prefKey, kICBundleIdentifier);
+
+    if (*val == NULL) return;
+
+    if (CFGetTypeID(*val) != type) {
+        CFRelease(*val);
+        *val = NULL;
+        return;
+    }
+}
+
 // to test: defaults write net.sabi.ICeCoffEE "Excluded Applications" -array '{CFBundleID = "com.apple.projectbuilder"; }' '{CFBundleID = "net.sabi.Pester"; }' '{CFBundleID = "com.apple.foobar"; }'
 static void ICCF_MigratePrefs() {
@@ -230,5 +246,5 @@
                 excludedAppBundle = CFBundleCreate(NULL, excludedAppURL);
                 if (excludedAppBundle != NULL) {
-                    APEToolsAddToExcludeList(kICBundleIdentifier, excludedAppBundle);
+                    APEToolsAddToExcludeList(kICBundleIdentifier, excludedAppBundle, CFSTR("Migrated from ICeCoffEE 1.0-1.2"), NO);
                 } else postponeMigrationForApp = YES; // can't create bundle
             } else postponeMigrationForApp = YES; // can't find app
@@ -256,4 +272,6 @@
     ICCF_prefs.servicesInContextualMenu = ICCF_GetBooleanPref(kICServicesInContextualMenu, YES);
     ICCF_prefs.servicesInMenuBar = ICCF_GetBooleanPref(kICServicesInMenuBar, NO);
+    ICCF_GetCFTypePref(kICServiceOptions, (CFTypeRef *)&ICCF_prefs.serviceOptions, CFDictionaryGetTypeID());
+    ICCF_prefs.terminalRequireOptionForSelfDrag = ICCF_GetBooleanPref(kICTerminalRequireOptionForSelfDrag, NO);
     ICCF_prefs.errorSoundEnabled = ICCF_GetBooleanPref(kICErrorSoundEnabled, NO);
     ICCF_prefs.errorDialogEnabled = ICCF_GetBooleanPref(kICErrorDialogEnabled, YES);
Index: /trunk/ICeCoffEE/ICeCoffEE/English.lproj/APE Manager plugin.nib/classes.nib
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/English.lproj/APE Manager plugin.nib/classes.nib	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/English.lproj/APE Manager plugin.nib/classes.nib	(revision 142)
@@ -5,8 +5,10 @@
             ACTIONS = {
                 commandClickEnabled = id; 
+                editContextualServices = id; 
                 errorDialogEnabled = id; 
                 errorSoundEnabled = id; 
                 servicesInContextualMenu = id; 
                 servicesInMenuBar = id; 
+                terminalRequireOptionForSelfDrag = id; 
                 textBlinkCount = id; 
                 textBlinkEnabled = id; 
@@ -16,4 +18,5 @@
             OUTLETS = {
                 commandClickEnabled = NSButton; 
+                editContextualServices = NSButton; 
                 errorDialogEnabled = NSButton; 
                 errorSoundEnabled = NSButton; 
@@ -21,4 +24,5 @@
                 servicesInMenuBar = NSButton; 
                 tabView = NSTabView; 
+                terminalRequireOptionForSelfDrag = NSButton; 
                 textBlinkCount = NSPopUpButton; 
                 textBlinkEnabled = NSButton; 
Index: /trunk/ICeCoffEE/ICeCoffEE/English.lproj/APE Manager plugin.nib/info.nib
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/English.lproj/APE Manager plugin.nib/info.nib	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/English.lproj/APE Manager plugin.nib/info.nib	(revision 142)
@@ -29,5 +29,5 @@
 	</array>
 	<key>IBSystem Version</key>
-	<string>6I32</string>
+	<string>6L60</string>
 	<key>IBUserGuides</key>
 	<dict>
Index: /trunk/ICeCoffEE/ICeCoffEE/English.lproj/Select services.nib/classes.nib
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/English.lproj/Select services.nib/classes.nib	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/English.lproj/Select services.nib/classes.nib	(revision 142)
@@ -0,0 +1,24 @@
+{
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            CLASS = ICeCoffEENonHighlightingOutlineView; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSOutlineView; 
+        }, 
+        {
+            CLASS = ICeCoffEEServiceDataSource; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {serviceOutline = NSOutlineView; }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {cancel = id; hideAll = id; saveChanges = id; showAll = id; }; 
+            CLASS = ICeCoffEEServicePrefController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {serviceOutline = NSOutlineView; }; 
+            SUPERCLASS = NSWindowController; 
+        }
+    ); 
+    IBVersion = 1; 
+}
Index: /trunk/ICeCoffEE/ICeCoffEE/English.lproj/Select services.nib/info.nib
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/English.lproj/Select services.nib/info.nib	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/English.lproj/Select services.nib/info.nib	(revision 142)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>99 33 356 240 0 0 1280 832 </string>
+	<key>IBFramework Version</key>
+	<string>291.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>21</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>6L60</string>
+</dict>
+</plist>
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE APE.pbproj/nicholas.pbxuser
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE APE.pbproj/nicholas.pbxuser	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE APE.pbproj/nicholas.pbxuser	(revision 142)
@@ -3,8 +3,8 @@
 	29B97313FDCFA39411CA2CEA = {
 		activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA;
-		activeExecutable = E136EAA103E42F7500050002;
+		activeExecutable = E1317A3503DF242100050002;
 		activeTarget = F5CD5E9D02DAE2C901AA4DA5;
 		addToTargets = (
-			E1BF159B03DBA71000050002,
+			F57E31A00379599E01AA4DA5,
 		);
 		breakpoints = (
@@ -28,5 +28,5 @@
 		);
 		perUserDictionary = {
-			PBXPerProjectTemplateStateSaveDate = 76052899;
+			PBXPerProjectTemplateStateSaveDate = 76926874;
 			PBXWorkspaceContents = (
 				{
@@ -35,5 +35,5 @@
 							Split0 = {
 								NavContent0 = {
-									bookmark = E14B42B7048879E300C57841;
+									bookmark = E14A9A5304964E8800AEFBF9;
 									history = (
 										E11854FB03F27D4A00050002,
@@ -57,8 +57,6 @@
 										E16C834903F759D800050002,
 										E16C834A03F759D800050002,
-										E16C834C03F759D800050002,
 										E16C834D03F759D800050002,
 										E16C834E03F759D800050002,
-										E16C834F03F759D800050002,
 										E1ABE98F040D4E8F00050002,
 										E1ABE990040D4E8F00050002,
@@ -77,5 +75,4 @@
 										E11CB71E0482E6930053A3E6,
 										E11CB71F0482E6930053A3E6,
-										E11CB7200482E6930053A3E6,
 										E11CB7210482E6930053A3E6,
 										E11CB7220482E6930053A3E6,
@@ -92,5 +89,4 @@
 										E12C91CF048543B2001C25E0,
 										E12C91D0048543B2001C25E0,
-										E12C91D2048543B2001C25E0,
 										E12C91D7048543B2001C25E0,
 										E12C91D8048543B2001C25E0,
@@ -98,29 +94,41 @@
 										E12C91DC048543B2001C25E0,
 										E1BF4A310487C75E00C20906,
-										E1BF4A320487C75E00C20906,
-										E1BF4B57048872D400C20906,
 										E1BF4B58048872D400C20906,
-										E1BF4B59048872D400C20906,
-										E1BF4B5A048872D400C20906,
-										E1BF4B5B048872D400C20906,
 										E1BF4B5C048872D400C20906,
 										E1BF4B5D048872D400C20906,
 										E1BF4B5E048872D400C20906,
-										E1BF4B5F048872D400C20906,
 										E1BF4B60048872D400C20906,
-										E1BF4B61048872D400C20906,
 										E1BF4B62048872D400C20906,
-										E1BF4B63048872D400C20906,
-										E1BF4B64048872D400C20906,
-										E1BF4B65048872D400C20906,
-										E1BF4B67048872D400C20906,
-										E1BF4B68048872D400C20906,
-										E1BF4B6A048872D400C20906,
 										E1BF4B6B048872D400C20906,
 										E1BF4B6C048872D400C20906,
-										E12CF5D204887679004E167F,
-										E14B42B3048879E300C57841,
-										E14B42B4048879E300C57841,
-										E1BF4B69048872D400C20906,
+										E17758550489E635007FD8E8,
+										E1D3379F049183A700000A8E,
+										E131770D0491BC7A00000A8E,
+										E131793D0491D2BC00000A8E,
+										E13179540491DBEF00000A8E,
+										E12FEC690495AFC400AEFBF9,
+										E12FEC6A0495AFC400AEFBF9,
+										E12FEC6B0495AFC400AEFBF9,
+										E12FEC6C0495AFC400AEFBF9,
+										E12FEC6D0495AFC400AEFBF9,
+										E12FEC6E0495AFC400AEFBF9,
+										E12FEC6F0495AFC400AEFBF9,
+										E12FEC700495AFC400AEFBF9,
+										E12FEC750495AFC400AEFBF9,
+										E12FEC760495AFC400AEFBF9,
+										E12FEC770495AFC400AEFBF9,
+										E12FEC780495AFC400AEFBF9,
+										E12FEC790495AFC400AEFBF9,
+										E12FEC7A0495AFC400AEFBF9,
+										E12FEC7D0495AFC400AEFBF9,
+										E12FEC7F0495AFC400AEFBF9,
+										E140B69E0495B20E00AEFBF9,
+										E140B69F0495B20E00AEFBF9,
+										E140B6A00495B20E00AEFBF9,
+										E140B6A10495B20E00AEFBF9,
+										E140B6A20495B20E00AEFBF9,
+										E140B6A30495B20E00AEFBF9,
+										E140B6A40495B20E00AEFBF9,
+										E140B6AA0495B20E00AEFBF9,
 									);
 									prevStack = (
@@ -579,4 +587,111 @@
 										E14B42B5048879E300C57841,
 										E14B42B6048879E300C57841,
+										E177585A0489E635007FD8E8,
+										E177585B0489E635007FD8E8,
+										E177585C0489E635007FD8E8,
+										E177585D0489E635007FD8E8,
+										E177585E0489E635007FD8E8,
+										E177585F0489E635007FD8E8,
+										E17758600489E635007FD8E8,
+										E1D337A2049183A700000A8E,
+										E1D337A3049183A700000A8E,
+										E1D337A4049183A700000A8E,
+										E13176040491B26700000A8E,
+										E13177100491BC7A00000A8E,
+										E13177110491BC7A00000A8E,
+										E13177120491BC7A00000A8E,
+										E13179400491D2BC00000A8E,
+										E13179410491D2BC00000A8E,
+										E13179420491D2BC00000A8E,
+										E13179430491D2BC00000A8E,
+										E13179440491D2BC00000A8E,
+										E13179450491D2BC00000A8E,
+										E13179460491D2BC00000A8E,
+										E13179470491D2BC00000A8E,
+										E13179480491D2BC00000A8E,
+										E13179490491D2BC00000A8E,
+										E131794A0491D2BC00000A8E,
+										E131794B0491D2BC00000A8E,
+										E13179570491DBEF00000A8E,
+										E13179580491DBEF00000A8E,
+										E13179590491DBEF00000A8E,
+										E131795A0491DBEF00000A8E,
+										E131795B0491DBEF00000A8E,
+										E131795C0491DBEF00000A8E,
+										E131795D0491DBEF00000A8E,
+										E131795E0491DBEF00000A8E,
+										E131795F0491DBEF00000A8E,
+										E13179600491DBEF00000A8E,
+										E13179610491DBEF00000A8E,
+										E13179620491DBEF00000A8E,
+										E12FEC810495AFC400AEFBF9,
+										E12FEC820495AFC400AEFBF9,
+										E12FEC830495AFC400AEFBF9,
+										E12FEC840495AFC400AEFBF9,
+										E12FEC850495AFC400AEFBF9,
+										E12FEC860495AFC400AEFBF9,
+										E12FEC870495AFC400AEFBF9,
+										E12FEC880495AFC400AEFBF9,
+										E12FEC890495AFC400AEFBF9,
+										E12FEC8A0495AFC400AEFBF9,
+										E12FEC8B0495AFC400AEFBF9,
+										E12FEC8C0495AFC400AEFBF9,
+										E12FEC8D0495AFC400AEFBF9,
+										E12FEC8E0495AFC400AEFBF9,
+										E12FEC8F0495AFC400AEFBF9,
+										E12FEC900495AFC400AEFBF9,
+										E12FEC910495AFC400AEFBF9,
+										E12FEC920495AFC400AEFBF9,
+										E12FEC930495AFC400AEFBF9,
+										E12FEC940495AFC400AEFBF9,
+										E12FEC950495AFC400AEFBF9,
+										E12FEC960495AFC400AEFBF9,
+										E12FEC970495AFC400AEFBF9,
+										E12FEC980495AFC400AEFBF9,
+										E12FEC990495AFC400AEFBF9,
+										E12FEC9A0495AFC400AEFBF9,
+										E12FEC9B0495AFC400AEFBF9,
+										E12FEC9C0495AFC400AEFBF9,
+										E12FEC9D0495AFC400AEFBF9,
+										E12FEC9E0495AFC400AEFBF9,
+										E12FEC9F0495AFC400AEFBF9,
+										E12FECA00495AFC400AEFBF9,
+										E12FECA10495AFC400AEFBF9,
+										E12FECA20495AFC400AEFBF9,
+										E12FECA30495AFC400AEFBF9,
+										E12FECA40495AFC400AEFBF9,
+										E12FECA50495AFC400AEFBF9,
+										E12FECA60495AFC400AEFBF9,
+										E12FECA70495AFC400AEFBF9,
+										E12FECA80495AFC400AEFBF9,
+										E12FECA90495AFC400AEFBF9,
+										E12FECAA0495AFC400AEFBF9,
+										E12FECAB0495AFC400AEFBF9,
+										E12FECAC0495AFC400AEFBF9,
+										E12FECAD0495AFC400AEFBF9,
+										E12FECAE0495AFC400AEFBF9,
+										E12FECAF0495AFC400AEFBF9,
+										E12FECB00495AFC400AEFBF9,
+										E12FECB10495AFC400AEFBF9,
+										E12FECB20495AFC400AEFBF9,
+										E12FECB30495AFC400AEFBF9,
+										E12FECB40495AFC400AEFBF9,
+										E12FECB50495AFC400AEFBF9,
+										E12FECB60495AFC400AEFBF9,
+										E12FECB70495AFC400AEFBF9,
+										E12FECB80495AFC400AEFBF9,
+										E12FECB90495AFC400AEFBF9,
+										E12FECBA0495AFC400AEFBF9,
+										E12FECBB0495AFC400AEFBF9,
+										E12FECBC0495AFC400AEFBF9,
+										E12FECBD0495AFC400AEFBF9,
+										E12FECBE0495AFC400AEFBF9,
+										E12FECBF0495AFC400AEFBF9,
+										E12FECC00495AFC400AEFBF9,
+										E140B6A50495B20E00AEFBF9,
+										E140B6A60495B20E00AEFBF9,
+										E140B6A70495B20E00AEFBF9,
+										E140B6A80495B20E00AEFBF9,
+										E140B6A90495B20E00AEFBF9,
 									);
 								};
@@ -653,13 +768,7 @@
 						Split0 = {
 							Split0 = {
-								NavContent0 = {
-									bookmark = E14B42B9048879E300C57841;
-									history = (
-										E14B42B8048879E300C57841,
-									);
-								};
 								NavCount = 1;
 								NavGeometry0 = {
-									Frame = "{{0, 0}, {665, 293}}";
+									Frame = "{{0, 0}, {594, 150}}";
 									NavBarVisible = YES;
 								};
@@ -810,5 +919,5 @@
 								31,
 							);
-							Frame = "{{0, 0}, {250, 668}}";
+							Frame = "{{0, 0}, {250, 661}}";
 						};
 						TabCount = 5;
@@ -819,5 +928,5 @@
 					Template = 64ABBB4501FA494900185B06;
 					ToolbarVisible = YES;
-					WindowLocation = "{12, 81}";
+					WindowLocation = "{25, 86}";
 				},
 				{
@@ -881,6 +990,6 @@
 							};
 							Tab3 = {
-								BuildMessageFrame = "{{0, 0}, {687, 262}}";
-								BuildTranscriptFrame = "{{0, 271}, {687, 2}}";
+								BuildMessageFrame = "{{0, 0}, {687, 264}}";
+								BuildTranscriptFrame = "{{0, 273}, {687, 0}}";
 								BuildTranscriptFrameExpanded = YES;
 								Frame = "{{0, 0}, {685, 295}}";
@@ -950,28 +1059,28 @@
 				},
 				{
-					ContentSize = "{665, 594}";
+					ContentSize = "{594, 303}";
 					LeftSlideOut = {
 						Collapsed = NO;
-						Frame = "{{0, 0}, {665, 594}}";
+						Frame = "{{0, 23}, {594, 280}}";
 						Split0 = {
-							ActiveTab = 3;
-							ActiveTabName = PBXProjectFindModule;
-							Collapsed = NO;
-							Frame = "{{0, 0}, {665, 594}}";
+							ActiveTab = 1;
+							ActiveTabName = PBXRunSessionModule;
+							Collapsed = YES;
+							Frame = "{{0, 0}, {594, 280}}";
 							Split0 = {
-								Frame = "{{0, 301}, {665, 293}}";
+								Frame = "{{1e+06, 1e+06}, {594, 0}}";
 							};
 							SplitCount = 1;
 							Tab0 = {
-								Frame = "{{0, 0}, {484, 208}}";
+								Frame = "{{0, 0}, {804, 321}}";
 							};
 							Tab1 = {
 								Debugger = {
 									Collapsed = NO;
-									Frame = "{{0, 0}, {664, 208}}";
+									Frame = "{{0, 0}, {594, 274}}";
 									Split0 = {
-										Frame = "{{0, 24}, {664, 184}}";
+										Frame = "{{0, 24}, {594, 250}}";
 										Split0 = {
-											Frame = "{{0, 0}, {325, 184}}";
+											Frame = "{{0, 0}, {290, 250}}";
 										};
 										Split1 = {
@@ -982,7 +1091,7 @@
 												85,
 												Summary,
-												96.123,
+												62.123,
 											);
-											Frame = "{{334, 0}, {330, 184}}";
+											Frame = "{{299, 0}, {295, 250}}";
 										};
 										SplitCount = 2;
@@ -998,22 +1107,22 @@
 									TabsVisible = YES;
 								};
-								Frame = "{{0, 0}, {664, 208}}";
+								Frame = "{{0, 0}, {594, 274}}";
 								LauncherConfigVersion = 7;
 							};
 							Tab2 = {
-								Frame = "{{0, 0}, {664, 50}}";
+								Frame = "{{0, 0}, {594, 274}}";
 								LauncherConfigVersion = 3;
 								Runner = {
-									Frame = "{{0, 0}, {664, 50}}";
+									Frame = "{{0, 0}, {594, 274}}";
 								};
 							};
 							Tab3 = {
-								BuildMessageFrame = "{{0, 0}, {667, 265}}";
-								BuildTranscriptFrame = "{{0, 274}, {667, 2}}";
+								BuildMessageFrame = "{{0, 0}, {614, 262}}";
+								BuildTranscriptFrame = "{{0, 271}, {614, 2}}";
 								BuildTranscriptFrameExpanded = YES;
-								Frame = "{{0, 0}, {665, 298}}";
+								Frame = "{{0, 0}, {612, 295}}";
 							};
 							Tab4 = {
-								Frame = "{{0, 0}, {665, 295}}";
+								Frame = "{{0, 0}, {612, 295}}";
 							};
 							TabCount = 5;
@@ -1022,10 +1131,10 @@
 						SplitCount = 1;
 						Tab0 = {
-							Frame = "{{0, 0}, {313, 531}}";
+							Frame = "{{0, 0}, {300, 533}}";
 							GroupTreeTableConfiguration = (
 								TargetStatusColumn,
 								18,
 								MainColumn,
-								280,
+								267,
 							);
 						};
@@ -1051,5 +1160,5 @@
 						};
 						Tab3 = {
-							Frame = "{{0, 0}, {200, 557}}";
+							Frame = "{{0, 0}, {200, 386}}";
 							TargetTableConfiguration = (
 								ActiveObject,
@@ -1066,5 +1175,5 @@
 								31,
 							);
-							Frame = "{{0, 0}, {250, 100}}";
+							Frame = "{{0, 0}, {250, 386}}";
 						};
 						TabCount = 5;
@@ -1072,11 +1181,11 @@
 					};
 					NavBarShownByDefault = YES;
-					StatusViewVisible = NO;
-					Template = F5CA7EC9015C08ED0DCA290F;
-					ToolbarVisible = NO;
-					WindowLocation = "{457, 76}";
+					StatusViewVisible = YES;
+					Template = F5534CB2020F3F8A0DCA290F;
+					ToolbarVisible = YES;
+					WindowLocation = "{4, 467}";
 				},
 			);
-			PBXWorkspaceStateSaveDate = 76052899;
+			PBXWorkspaceStateSaveDate = 76926874;
 		};
 		perUserProjectItems = {
@@ -1126,5 +1235,4 @@
 			E11CB71E0482E6930053A3E6 = E11CB71E0482E6930053A3E6;
 			E11CB71F0482E6930053A3E6 = E11CB71F0482E6930053A3E6;
-			E11CB7200482E6930053A3E6 = E11CB7200482E6930053A3E6;
 			E11CB7210482E6930053A3E6 = E11CB7210482E6930053A3E6;
 			E11CB7220482E6930053A3E6 = E11CB7220482E6930053A3E6;
@@ -1307,5 +1415,4 @@
 			E12C91CF048543B2001C25E0 = E12C91CF048543B2001C25E0;
 			E12C91D0048543B2001C25E0 = E12C91D0048543B2001C25E0;
-			E12C91D2048543B2001C25E0 = E12C91D2048543B2001C25E0;
 			E12C91D7048543B2001C25E0 = E12C91D7048543B2001C25E0;
 			E12C91D8048543B2001C25E0 = E12C91D8048543B2001C25E0;
@@ -1354,17 +1461,136 @@
 			E12C9207048543B2001C25E0 = E12C9207048543B2001C25E0;
 			E12C9208048543B2001C25E0 = E12C9208048543B2001C25E0;
-			E12CF5D204887679004E167F = E12CF5D204887679004E167F;
 			E12CF5D304887679004E167F = E12CF5D304887679004E167F;
+			E12FEC690495AFC400AEFBF9 = E12FEC690495AFC400AEFBF9;
+			E12FEC6A0495AFC400AEFBF9 = E12FEC6A0495AFC400AEFBF9;
+			E12FEC6B0495AFC400AEFBF9 = E12FEC6B0495AFC400AEFBF9;
+			E12FEC6C0495AFC400AEFBF9 = E12FEC6C0495AFC400AEFBF9;
+			E12FEC6D0495AFC400AEFBF9 = E12FEC6D0495AFC400AEFBF9;
+			E12FEC6E0495AFC400AEFBF9 = E12FEC6E0495AFC400AEFBF9;
+			E12FEC6F0495AFC400AEFBF9 = E12FEC6F0495AFC400AEFBF9;
+			E12FEC700495AFC400AEFBF9 = E12FEC700495AFC400AEFBF9;
+			E12FEC750495AFC400AEFBF9 = E12FEC750495AFC400AEFBF9;
+			E12FEC760495AFC400AEFBF9 = E12FEC760495AFC400AEFBF9;
+			E12FEC770495AFC400AEFBF9 = E12FEC770495AFC400AEFBF9;
+			E12FEC780495AFC400AEFBF9 = E12FEC780495AFC400AEFBF9;
+			E12FEC790495AFC400AEFBF9 = E12FEC790495AFC400AEFBF9;
+			E12FEC7A0495AFC400AEFBF9 = E12FEC7A0495AFC400AEFBF9;
+			E12FEC7D0495AFC400AEFBF9 = E12FEC7D0495AFC400AEFBF9;
+			E12FEC7F0495AFC400AEFBF9 = E12FEC7F0495AFC400AEFBF9;
+			E12FEC810495AFC400AEFBF9 = E12FEC810495AFC400AEFBF9;
+			E12FEC820495AFC400AEFBF9 = E12FEC820495AFC400AEFBF9;
+			E12FEC830495AFC400AEFBF9 = E12FEC830495AFC400AEFBF9;
+			E12FEC840495AFC400AEFBF9 = E12FEC840495AFC400AEFBF9;
+			E12FEC850495AFC400AEFBF9 = E12FEC850495AFC400AEFBF9;
+			E12FEC860495AFC400AEFBF9 = E12FEC860495AFC400AEFBF9;
+			E12FEC870495AFC400AEFBF9 = E12FEC870495AFC400AEFBF9;
+			E12FEC880495AFC400AEFBF9 = E12FEC880495AFC400AEFBF9;
+			E12FEC890495AFC400AEFBF9 = E12FEC890495AFC400AEFBF9;
+			E12FEC8A0495AFC400AEFBF9 = E12FEC8A0495AFC400AEFBF9;
+			E12FEC8B0495AFC400AEFBF9 = E12FEC8B0495AFC400AEFBF9;
+			E12FEC8C0495AFC400AEFBF9 = E12FEC8C0495AFC400AEFBF9;
+			E12FEC8D0495AFC400AEFBF9 = E12FEC8D0495AFC400AEFBF9;
+			E12FEC8E0495AFC400AEFBF9 = E12FEC8E0495AFC400AEFBF9;
+			E12FEC8F0495AFC400AEFBF9 = E12FEC8F0495AFC400AEFBF9;
+			E12FEC900495AFC400AEFBF9 = E12FEC900495AFC400AEFBF9;
+			E12FEC910495AFC400AEFBF9 = E12FEC910495AFC400AEFBF9;
+			E12FEC920495AFC400AEFBF9 = E12FEC920495AFC400AEFBF9;
+			E12FEC930495AFC400AEFBF9 = E12FEC930495AFC400AEFBF9;
+			E12FEC940495AFC400AEFBF9 = E12FEC940495AFC400AEFBF9;
+			E12FEC950495AFC400AEFBF9 = E12FEC950495AFC400AEFBF9;
+			E12FEC960495AFC400AEFBF9 = E12FEC960495AFC400AEFBF9;
+			E12FEC970495AFC400AEFBF9 = E12FEC970495AFC400AEFBF9;
+			E12FEC980495AFC400AEFBF9 = E12FEC980495AFC400AEFBF9;
+			E12FEC990495AFC400AEFBF9 = E12FEC990495AFC400AEFBF9;
+			E12FEC9A0495AFC400AEFBF9 = E12FEC9A0495AFC400AEFBF9;
+			E12FEC9B0495AFC400AEFBF9 = E12FEC9B0495AFC400AEFBF9;
+			E12FEC9C0495AFC400AEFBF9 = E12FEC9C0495AFC400AEFBF9;
+			E12FEC9D0495AFC400AEFBF9 = E12FEC9D0495AFC400AEFBF9;
+			E12FEC9E0495AFC400AEFBF9 = E12FEC9E0495AFC400AEFBF9;
+			E12FEC9F0495AFC400AEFBF9 = E12FEC9F0495AFC400AEFBF9;
+			E12FECA00495AFC400AEFBF9 = E12FECA00495AFC400AEFBF9;
+			E12FECA10495AFC400AEFBF9 = E12FECA10495AFC400AEFBF9;
+			E12FECA20495AFC400AEFBF9 = E12FECA20495AFC400AEFBF9;
+			E12FECA30495AFC400AEFBF9 = E12FECA30495AFC400AEFBF9;
+			E12FECA40495AFC400AEFBF9 = E12FECA40495AFC400AEFBF9;
+			E12FECA50495AFC400AEFBF9 = E12FECA50495AFC400AEFBF9;
+			E12FECA60495AFC400AEFBF9 = E12FECA60495AFC400AEFBF9;
+			E12FECA70495AFC400AEFBF9 = E12FECA70495AFC400AEFBF9;
+			E12FECA80495AFC400AEFBF9 = E12FECA80495AFC400AEFBF9;
+			E12FECA90495AFC400AEFBF9 = E12FECA90495AFC400AEFBF9;
+			E12FECAA0495AFC400AEFBF9 = E12FECAA0495AFC400AEFBF9;
+			E12FECAB0495AFC400AEFBF9 = E12FECAB0495AFC400AEFBF9;
+			E12FECAC0495AFC400AEFBF9 = E12FECAC0495AFC400AEFBF9;
+			E12FECAD0495AFC400AEFBF9 = E12FECAD0495AFC400AEFBF9;
+			E12FECAE0495AFC400AEFBF9 = E12FECAE0495AFC400AEFBF9;
+			E12FECAF0495AFC400AEFBF9 = E12FECAF0495AFC400AEFBF9;
+			E12FECB00495AFC400AEFBF9 = E12FECB00495AFC400AEFBF9;
+			E12FECB10495AFC400AEFBF9 = E12FECB10495AFC400AEFBF9;
+			E12FECB20495AFC400AEFBF9 = E12FECB20495AFC400AEFBF9;
+			E12FECB30495AFC400AEFBF9 = E12FECB30495AFC400AEFBF9;
+			E12FECB40495AFC400AEFBF9 = E12FECB40495AFC400AEFBF9;
+			E12FECB50495AFC400AEFBF9 = E12FECB50495AFC400AEFBF9;
+			E12FECB60495AFC400AEFBF9 = E12FECB60495AFC400AEFBF9;
+			E12FECB70495AFC400AEFBF9 = E12FECB70495AFC400AEFBF9;
+			E12FECB80495AFC400AEFBF9 = E12FECB80495AFC400AEFBF9;
+			E12FECB90495AFC400AEFBF9 = E12FECB90495AFC400AEFBF9;
+			E12FECBA0495AFC400AEFBF9 = E12FECBA0495AFC400AEFBF9;
+			E12FECBB0495AFC400AEFBF9 = E12FECBB0495AFC400AEFBF9;
+			E12FECBC0495AFC400AEFBF9 = E12FECBC0495AFC400AEFBF9;
+			E12FECBD0495AFC400AEFBF9 = E12FECBD0495AFC400AEFBF9;
+			E12FECBE0495AFC400AEFBF9 = E12FECBE0495AFC400AEFBF9;
+			E12FECBF0495AFC400AEFBF9 = E12FECBF0495AFC400AEFBF9;
+			E12FECC00495AFC400AEFBF9 = E12FECC00495AFC400AEFBF9;
+			E13176040491B26700000A8E = E13176040491B26700000A8E;
+			E131770D0491BC7A00000A8E = E131770D0491BC7A00000A8E;
+			E13177100491BC7A00000A8E = E13177100491BC7A00000A8E;
+			E13177110491BC7A00000A8E = E13177110491BC7A00000A8E;
+			E13177120491BC7A00000A8E = E13177120491BC7A00000A8E;
+			E131793D0491D2BC00000A8E = E131793D0491D2BC00000A8E;
+			E13179400491D2BC00000A8E = E13179400491D2BC00000A8E;
+			E13179410491D2BC00000A8E = E13179410491D2BC00000A8E;
+			E13179420491D2BC00000A8E = E13179420491D2BC00000A8E;
+			E13179430491D2BC00000A8E = E13179430491D2BC00000A8E;
+			E13179440491D2BC00000A8E = E13179440491D2BC00000A8E;
+			E13179450491D2BC00000A8E = E13179450491D2BC00000A8E;
+			E13179460491D2BC00000A8E = E13179460491D2BC00000A8E;
+			E13179470491D2BC00000A8E = E13179470491D2BC00000A8E;
+			E13179480491D2BC00000A8E = E13179480491D2BC00000A8E;
+			E13179490491D2BC00000A8E = E13179490491D2BC00000A8E;
+			E131794A0491D2BC00000A8E = E131794A0491D2BC00000A8E;
+			E131794B0491D2BC00000A8E = E131794B0491D2BC00000A8E;
+			E13179540491DBEF00000A8E = E13179540491DBEF00000A8E;
+			E13179570491DBEF00000A8E = E13179570491DBEF00000A8E;
+			E13179580491DBEF00000A8E = E13179580491DBEF00000A8E;
+			E13179590491DBEF00000A8E = E13179590491DBEF00000A8E;
+			E131795A0491DBEF00000A8E = E131795A0491DBEF00000A8E;
+			E131795B0491DBEF00000A8E = E131795B0491DBEF00000A8E;
+			E131795C0491DBEF00000A8E = E131795C0491DBEF00000A8E;
+			E131795D0491DBEF00000A8E = E131795D0491DBEF00000A8E;
+			E131795E0491DBEF00000A8E = E131795E0491DBEF00000A8E;
+			E131795F0491DBEF00000A8E = E131795F0491DBEF00000A8E;
+			E13179600491DBEF00000A8E = E13179600491DBEF00000A8E;
+			E13179610491DBEF00000A8E = E13179610491DBEF00000A8E;
+			E13179620491DBEF00000A8E = E13179620491DBEF00000A8E;
 			E1373453041FE49500050002 = E1373453041FE49500050002;
+			E140B69E0495B20E00AEFBF9 = E140B69E0495B20E00AEFBF9;
+			E140B69F0495B20E00AEFBF9 = E140B69F0495B20E00AEFBF9;
+			E140B6A00495B20E00AEFBF9 = E140B6A00495B20E00AEFBF9;
+			E140B6A10495B20E00AEFBF9 = E140B6A10495B20E00AEFBF9;
+			E140B6A20495B20E00AEFBF9 = E140B6A20495B20E00AEFBF9;
+			E140B6A30495B20E00AEFBF9 = E140B6A30495B20E00AEFBF9;
+			E140B6A40495B20E00AEFBF9 = E140B6A40495B20E00AEFBF9;
+			E140B6A50495B20E00AEFBF9 = E140B6A50495B20E00AEFBF9;
+			E140B6A60495B20E00AEFBF9 = E140B6A60495B20E00AEFBF9;
+			E140B6A70495B20E00AEFBF9 = E140B6A70495B20E00AEFBF9;
+			E140B6A80495B20E00AEFBF9 = E140B6A80495B20E00AEFBF9;
+			E140B6A90495B20E00AEFBF9 = E140B6A90495B20E00AEFBF9;
+			E140B6AA0495B20E00AEFBF9 = E140B6AA0495B20E00AEFBF9;
 			E1448271041D4AB700050002 = E1448271041D4AB700050002;
 			E1448272041D4AB700050002 = E1448272041D4AB700050002;
 			E1448273041D4AB700050002 = E1448273041D4AB700050002;
-			E14B42B3048879E300C57841 = E14B42B3048879E300C57841;
-			E14B42B4048879E300C57841 = E14B42B4048879E300C57841;
+			E14A9A5304964E8800AEFBF9 = E14A9A5304964E8800AEFBF9;
 			E14B42B5048879E300C57841 = E14B42B5048879E300C57841;
 			E14B42B6048879E300C57841 = E14B42B6048879E300C57841;
-			E14B42B7048879E300C57841 = E14B42B7048879E300C57841;
-			E14B42B8048879E300C57841 = E14B42B8048879E300C57841;
-			E14B42B9048879E300C57841 = E14B42B9048879E300C57841;
 			E157EE6D03F059E300050002 = E157EE6D03F059E300050002;
 			E157EE6F03F059E300050002 = E157EE6F03F059E300050002;
@@ -1396,8 +1622,6 @@
 			E16C834903F759D800050002 = E16C834903F759D800050002;
 			E16C834A03F759D800050002 = E16C834A03F759D800050002;
-			E16C834C03F759D800050002 = E16C834C03F759D800050002;
 			E16C834D03F759D800050002 = E16C834D03F759D800050002;
 			E16C834E03F759D800050002 = E16C834E03F759D800050002;
-			E16C834F03F759D800050002 = E16C834F03F759D800050002;
 			E16C835803F759D800050002 = E16C835803F759D800050002;
 			E16C835A03F759D800050002 = E16C835A03F759D800050002;
@@ -1473,4 +1697,12 @@
 			E16C83A903F759D800050002 = E16C83A903F759D800050002;
 			E16C842703FB6A7200050002 = E16C842703FB6A7200050002;
+			E17758550489E635007FD8E8 = E17758550489E635007FD8E8;
+			E177585A0489E635007FD8E8 = E177585A0489E635007FD8E8;
+			E177585B0489E635007FD8E8 = E177585B0489E635007FD8E8;
+			E177585C0489E635007FD8E8 = E177585C0489E635007FD8E8;
+			E177585D0489E635007FD8E8 = E177585D0489E635007FD8E8;
+			E177585E0489E635007FD8E8 = E177585E0489E635007FD8E8;
+			E177585F0489E635007FD8E8 = E177585F0489E635007FD8E8;
+			E17758600489E635007FD8E8 = E17758600489E635007FD8E8;
 			E1937CF1040C300300050002 = E1937CF1040C300300050002;
 			E1937CF2040C300300050002 = E1937CF2040C300300050002;
@@ -1488,5 +1720,4 @@
 			E1ABE99E040D623300050002 = E1ABE99E040D623300050002;
 			E1BF4A310487C75E00C20906 = E1BF4A310487C75E00C20906;
-			E1BF4A320487C75E00C20906 = E1BF4A320487C75E00C20906;
 			E1BF4A380487C75E00C20906 = E1BF4A380487C75E00C20906;
 			E1BF4A390487C75E00C20906 = E1BF4A390487C75E00C20906;
@@ -1506,23 +1737,10 @@
 			E1BF4A530487C7B400C20906 = E1BF4A530487C7B400C20906;
 			E1BF4A540487C7B400C20906 = E1BF4A540487C7B400C20906;
-			E1BF4B57048872D400C20906 = E1BF4B57048872D400C20906;
 			E1BF4B58048872D400C20906 = E1BF4B58048872D400C20906;
-			E1BF4B59048872D400C20906 = E1BF4B59048872D400C20906;
-			E1BF4B5A048872D400C20906 = E1BF4B5A048872D400C20906;
-			E1BF4B5B048872D400C20906 = E1BF4B5B048872D400C20906;
 			E1BF4B5C048872D400C20906 = E1BF4B5C048872D400C20906;
 			E1BF4B5D048872D400C20906 = E1BF4B5D048872D400C20906;
 			E1BF4B5E048872D400C20906 = E1BF4B5E048872D400C20906;
-			E1BF4B5F048872D400C20906 = E1BF4B5F048872D400C20906;
 			E1BF4B60048872D400C20906 = E1BF4B60048872D400C20906;
-			E1BF4B61048872D400C20906 = E1BF4B61048872D400C20906;
 			E1BF4B62048872D400C20906 = E1BF4B62048872D400C20906;
-			E1BF4B63048872D400C20906 = E1BF4B63048872D400C20906;
-			E1BF4B64048872D400C20906 = E1BF4B64048872D400C20906;
-			E1BF4B65048872D400C20906 = E1BF4B65048872D400C20906;
-			E1BF4B67048872D400C20906 = E1BF4B67048872D400C20906;
-			E1BF4B68048872D400C20906 = E1BF4B68048872D400C20906;
-			E1BF4B69048872D400C20906 = E1BF4B69048872D400C20906;
-			E1BF4B6A048872D400C20906 = E1BF4B6A048872D400C20906;
 			E1BF4B6B048872D400C20906 = E1BF4B6B048872D400C20906;
 			E1BF4B6C048872D400C20906 = E1BF4B6C048872D400C20906;
@@ -1572,4 +1790,8 @@
 			E1BFDA5D0418987900050002 = E1BFDA5D0418987900050002;
 			E1C59B0403FDE6DD00050002 = E1C59B0403FDE6DD00050002;
+			E1D3379F049183A700000A8E = E1D3379F049183A700000A8E;
+			E1D337A2049183A700000A8E = E1D337A2049183A700000A8E;
+			E1D337A3049183A700000A8E = E1D337A3049183A700000A8E;
+			E1D337A4049183A700000A8E = E1D337A4049183A700000A8E;
 			E1DEF10F03FF95C900050002 = E1DEF10F03FF95C900050002;
 			E1DEF11003FF95C900050002 = E1DEF11003FF95C900050002;
@@ -1692,5 +1914,5 @@
 		name = "ICeCoffEE.m: ICCF_ConsolidateServicesMenu";
 		rLen = 0;
-		rLoc = 17650;
+		rLoc = 18010;
 		rType = 0;
 		vrLen = 2004;
@@ -1955,5 +2177,5 @@
 		name = "APEMain.m: ICCF_ReloadPrefs";
 		rLen = 0;
-		rLoc = 11836;
+		rLoc = 12133;
 		rType = 0;
 		vrLen = 1497;
@@ -2193,14 +2415,4 @@
 		vrLoc = 9337;
 	};
-	E11CB7200482E6930053A3E6 = {
-		fRef = E1BB268F03DB74B700050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEMenuOnly.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 256;
-		vrLoc = 0;
-	};
 	E11CB7210482E6930053A3E6 = {
 		fRef = E1BB269003DB74B700050002;
@@ -2298,5 +2510,5 @@
 		name = "ICeCoffEE.m: ICCF_ConsolidateServicesMenu";
 		rLen = 0;
-		rLoc = 16746;
+		rLoc = 16813;
 		rType = 0;
 		vrLen = 1972;
@@ -2368,5 +2580,5 @@
 		name = "ICeCoffEETerminal.m: draggingSourceOperationMaskForLocal:";
 		rLen = 0;
-		rLoc = 16497;
+		rLoc = 16484;
 		rType = 0;
 		vrLen = 1656;
@@ -2408,5 +2620,5 @@
 		name = "ICeCoffEETerminal.m: mouseDown:";
 		rLen = 0;
-		rLoc = 15630;
+		rLoc = 15569;
 		rType = 0;
 		vrLen = 1853;
@@ -2418,5 +2630,5 @@
 		name = "APEMain.m: APEBundleMessage";
 		rLen = 0;
-		rLoc = 7548;
+		rLoc = 7432;
 		rType = 0;
 		vrLen = 1991;
@@ -2438,5 +2650,5 @@
 		name = "ICeCoffEETerminal.m: dragImage:at:offset:event:pasteboard:source:slideBack:";
 		rLen = 0;
-		rLoc = 16497;
+		rLoc = 16484;
 		rType = 0;
 		vrLen = 1858;
@@ -2458,5 +2670,5 @@
 		name = "ICeCoffEETerminal.m: dragImage:at:offset:event:pasteboard:source:slideBack:";
 		rLen = 0;
-		rLoc = 16497;
+		rLoc = 16484;
 		rType = 0;
 		vrLen = 1858;
@@ -2478,5 +2690,5 @@
 		name = "ICeCoffEETerminal.m: dragImage:at:offset:event:pasteboard:source:slideBack:";
 		rLen = 0;
-		rLoc = 16497;
+		rLoc = 16484;
 		rType = 0;
 		vrLen = 1858;
@@ -2548,5 +2760,5 @@
 		name = "ICeCoffEE.m: IC_addRemoveServicesMenu";
 		rLen = 0;
-		rLoc = 19748;
+		rLoc = 20151;
 		rType = 0;
 		vrLen = 1787;
@@ -2618,5 +2830,5 @@
 		name = "ICeCoffEETerminal.m: dragImage:at:offset:event:pasteboard:source:slideBack:";
 		rLen = 0;
-		rLoc = 16497;
+		rLoc = 16484;
 		rType = 0;
 		vrLen = 1681;
@@ -2638,5 +2850,5 @@
 		name = "ICeCoffEETerminal.m: dragImage:at:offset:event:pasteboard:source:slideBack:";
 		rLen = 0;
-		rLoc = 2242;
+		rLoc = 2181;
 		rType = 0;
 		vrLen = 1512;
@@ -2668,5 +2880,5 @@
 		name = "ICeCoffEETerminal.m: 438";
 		rLen = 0;
-		rLoc = 16497;
+		rLoc = 16484;
 		rType = 0;
 		vrLen = 1571;
@@ -2678,5 +2890,5 @@
 		name = "ICeCoffEE.m: IC_addRemoveServicesMenu";
 		rLen = 0;
-		rLoc = 19748;
+		rLoc = 20151;
 		rType = 0;
 		vrLen = 1787;
@@ -2688,5 +2900,5 @@
 		name = "ICeCoffEETerminal.m: 438";
 		rLen = 0;
-		rLoc = 16497;
+		rLoc = 16484;
 		rType = 0;
 		vrLen = 1626;
@@ -2698,5 +2910,5 @@
 		name = "ICeCoffEE.m: menuForEvent:";
 		rLen = 39;
-		rLoc = 20245;
+		rLoc = 20648;
 		rType = 0;
 		vrLen = 1721;
@@ -2708,5 +2920,5 @@
 		name = "ICeCoffEETerminal.m: draggingSourceOperationMaskForLocal:";
 		rLen = 0;
-		rLoc = 16497;
+		rLoc = 16484;
 		rType = 0;
 		vrLen = 1764;
@@ -2738,5 +2950,5 @@
 		name = "ICeCoffEE.m: menuForEvent:";
 		rLen = 39;
-		rLoc = 20245;
+		rLoc = 20648;
 		rType = 0;
 		vrLen = 1721;
@@ -2778,5 +2990,5 @@
 		name = "ICeCoffEETerminal.m: 454";
 		rLen = 0;
-		rLoc = 16497;
+		rLoc = 16484;
 		rType = 0;
 		vrLen = 1567;
@@ -2788,5 +3000,5 @@
 		name = "ICeCoffEE.m: menuForEvent:";
 		rLen = 39;
-		rLoc = 20245;
+		rLoc = 20648;
 		rType = 0;
 		vrLen = 1858;
@@ -2798,5 +3010,5 @@
 		name = "APEMain.m: APEBundleMain";
 		rLen = 0;
-		rLoc = 5653;
+		rLoc = 5544;
 		rType = 0;
 		vrLen = 2518;
@@ -2956,5 +3168,5 @@
 		fileReference = E14343B403DB4CF200050002;
 		isa = PBXFileBreakpoint;
-		lineNumber = 484;
+		lineNumber = 489;
 		state = 1;
 	};
@@ -3004,5 +3216,5 @@
 		name = "ICeCoffEEConfig.h: 59";
 		rLen = 0;
-		rLoc = 1644;
+		rLoc = 1726;
 		rType = 0;
 		vrLen = 1507;
@@ -3024,5 +3236,5 @@
 		name = "ICeCoffEEConfig.h: 59";
 		rLen = 0;
-		rLoc = 1644;
+		rLoc = 1726;
 		rType = 0;
 		vrLen = 1507;
@@ -3044,5 +3256,5 @@
 		name = "ICeCoffEEConfig.h: 45";
 		rLen = 0;
-		rLoc = 970;
+		rLoc = 1052;
 		rType = 0;
 		vrLen = 1507;
@@ -3074,5 +3286,5 @@
 		name = "ICeCoffEEConfig.h: 42";
 		rLen = 0;
-		rLoc = 970;
+		rLoc = 1052;
 		rType = 0;
 		vrLen = 1650;
@@ -3094,5 +3306,5 @@
 		name = "ICeCoffEEConfig.h: 53";
 		rLen = 0;
-		rLoc = 1644;
+		rLoc = 1726;
 		rType = 0;
 		vrLen = 1672;
@@ -3304,5 +3516,5 @@
 		name = "ICeCoffEEConfig.h: 30";
 		rLen = 0;
-		rLoc = 716;
+		rLoc = 798;
 		rType = 0;
 		vrLen = 1321;
@@ -3354,5 +3566,5 @@
 		name = "ICeCoffEEConfig.h: 59";
 		rLen = 31;
-		rLoc = 2076;
+		rLoc = 2158;
 		rType = 0;
 		vrLen = 1672;
@@ -3464,5 +3676,5 @@
 		name = "ICeCoffEETerminal.m: ICCF_LaunchURLFromTerminal";
 		rLen = 0;
-		rLoc = 13218;
+		rLoc = 13157;
 		rType = 0;
 		vrLen = 1520;
@@ -3514,5 +3726,5 @@
 		name = "ICeCoffEEConfig.h: 59";
 		rLen = 31;
-		rLoc = 2076;
+		rLoc = 2158;
 		rType = 0;
 		vrLen = 1672;
@@ -3544,5 +3756,5 @@
 		name = "APEMain.m: APEBundleMain";
 		rLen = 0;
-		rLoc = 5999;
+		rLoc = 5883;
 		rType = 0;
 		vrLen = 2172;
@@ -3584,5 +3796,5 @@
 		name = "APEMain.m: APEBundleMain";
 		rLen = 0;
-		rLoc = 6398;
+		rLoc = 6282;
 		rType = 0;
 		vrLen = 2182;
@@ -3644,5 +3856,5 @@
 		name = "ICeCoffEE.m: mouseDown:";
 		rLen = 0;
-		rLoc = 19063;
+		rLoc = 19466;
 		rType = 0;
 		vrLen = 1490;
@@ -3654,5 +3866,5 @@
 		name = "ICeCoffEETerminal.m: rangeWithTerminal:pt0:pt1:";
 		rLen = 0;
-		rLoc = 13896;
+		rLoc = 13835;
 		rType = 0;
 		vrLen = 1580;
@@ -3692,7 +3904,7 @@
 		name = "VERSION: 1";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 6;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -4027,14 +4239,4 @@
 		vrLoc = 106;
 	};
-	E12C91D2048543B2001C25E0 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 5";
-		rLen = 0;
-		rLoc = 155;
-		rType = 0;
-		vrLen = 238;
-		vrLoc = 0;
-	};
 	E12C91D7048543B2001C25E0 = {
 		fRef = E1BF166D03DBE27000050002;
@@ -4079,5 +4281,5 @@
 		name = "ICeCoffEETerminal.m: ICCF_LaunchURLFromTerminal";
 		rLen = 0;
-		rLoc = 13893;
+		rLoc = 13832;
 		rType = 0;
 		vrLen = 1535;
@@ -4099,5 +4301,5 @@
 		name = "ICeCoffEETerminal.m: draggingUpdated:";
 		rLen = 0;
-		rLoc = 16496;
+		rLoc = 16483;
 		rType = 0;
 		vrLen = 983;
@@ -4129,5 +4331,5 @@
 		name = "ICeCoffEEShared.h: 47";
 		rLen = 0;
-		rLoc = 1307;
+		rLoc = 1686;
 		rType = 0;
 		vrLen = 1369;
@@ -4139,5 +4341,5 @@
 		name = "APEMain.m: APEBundleMain";
 		rLen = 0;
-		rLoc = 5653;
+		rLoc = 5544;
 		rType = 0;
 		vrLen = 1436;
@@ -4149,7 +4351,7 @@
 		name = "VERSION: 2";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 8;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -4165,5 +4367,5 @@
 		rLoc = 155;
 		rType = 0;
-		vrLen = 238;
+		vrLen = 234;
 		vrLoc = 0;
 	};
@@ -4205,5 +4407,5 @@
 		rLoc = 155;
 		rType = 0;
-		vrLen = 238;
+		vrLen = 234;
 		vrLoc = 0;
 	};
@@ -4213,5 +4415,5 @@
 		name = "ICeCoffEEShared.h: 47";
 		rLen = 0;
-		rLoc = 1307;
+		rLoc = 1686;
 		rType = 0;
 		vrLen = 1369;
@@ -4233,5 +4435,5 @@
 		name = "ICeCoffEEConfig.h: 58";
 		rLen = 0;
-		rLoc = 2075;
+		rLoc = 2157;
 		rType = 0;
 		vrLen = 1672;
@@ -4243,5 +4445,5 @@
 		name = "ICeCoffEEShared.h: 47";
 		rLen = 0;
-		rLoc = 1307;
+		rLoc = 1686;
 		rType = 0;
 		vrLen = 1369;
@@ -4273,5 +4475,5 @@
 		name = "ICeCoffEEShared.h: 43";
 		rLen = 0;
-		rLoc = 1221;
+		rLoc = 1600;
 		rType = 0;
 		vrLen = 1369;
@@ -4283,5 +4485,5 @@
 		name = "ICeCoffEEConfig.h: 56";
 		rLen = 0;
-		rLoc = 1819;
+		rLoc = 1901;
 		rType = 0;
 		vrLen = 1672;
@@ -4313,5 +4515,5 @@
 		name = "ICeCoffEETerminal.m: draggingUpdated:";
 		rLen = 0;
-		rLoc = 16496;
+		rLoc = 16483;
 		rType = 0;
 		vrLen = 983;
@@ -4363,5 +4565,5 @@
 		name = "ICeCoffEE.m: mouseDown:";
 		rLen = 0;
-		rLoc = 21674;
+		rLoc = 22077;
 		rType = 0;
 		vrLen = 1490;
@@ -4383,5 +4585,5 @@
 		name = "APEMain.m: APEBundleMain";
 		rLen = 0;
-		rLoc = 5653;
+		rLoc = 5544;
 		rType = 0;
 		vrLen = 1390;
@@ -4403,5 +4605,5 @@
 		name = "ICeCoffEEShared.h: 43";
 		rLen = 0;
-		rLoc = 1221;
+		rLoc = 1600;
 		rType = 0;
 		vrLen = 1338;
@@ -4413,5 +4615,5 @@
 		name = "ICeCoffEEConfig.h: 56";
 		rLen = 0;
-		rLoc = 1819;
+		rLoc = 1901;
 		rType = 0;
 		vrLen = 1672;
@@ -4539,5 +4741,5 @@
 		refType = 0;
 	};
-	E12CF5D204887679004E167F = {
+	E12CF5D304887679004E167F = {
 		fRef = E1CBC99803E7602700050002;
 		isa = PBXTextBookmark;
@@ -4549,13 +4751,1095 @@
 		vrLoc = 895;
 	};
-	E12CF5D304887679004E167F = {
+	E12FEC690495AFC400AEFBF9 = {
+		fRef = E11854F703F2709E00050002;
+		isa = PBXTextBookmark;
+		name = "CPS.h: CPSGetProcessInfo";
+		rLen = 4;
+		rLoc = 4510;
+		rType = 0;
+		vrLen = 1278;
+		vrLoc = 3841;
+	};
+	E12FEC6A0495AFC400AEFBF9 = {
+		fRef = E12FEC4204959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEENonHighlightingOutlineView.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 281;
+		vrLoc = 0;
+	};
+	E12FEC6B0495AFC400AEFBF9 = {
+		fRef = E12FEC4404959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEENonHighlightingButtonCell.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 279;
+		vrLoc = 0;
+	};
+	E12FEC6C0495AFC400AEFBF9 = {
+		fRef = E1317B2F03DFC4DE00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEETerminal.m: draggingEntered:";
+		rLen = 0;
+		rLoc = 16059;
+		rType = 0;
+		vrLen = 2048;
+		vrLoc = 14441;
+	};
+	E12FEC6D0495AFC400AEFBF9 = {
+		isa = PBXTargetBookmark;
+		trg = F5CD5E9D02DAE2C901AA4DA5;
+	};
+	E12FEC6E0495AFC400AEFBF9 = {
 		fRef = E1CBC99803E7602700050002;
 		isa = PBXTextBookmark;
-		name = "English: 69";
-		rLen = 0;
-		rLoc = 2364;
-		rType = 0;
-		vrLen = 1873;
-		vrLoc = 895;
+		name = "English: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1306;
+		vrLoc = 0;
+	};
+	E12FEC6F0495AFC400AEFBF9 = {
+		fRef = 089C165DFE840E0CC02AAC07;
+		isa = PBXTextBookmark;
+		name = "English: 5";
+		rLen = 0;
+		rLoc = 151;
+		rType = 0;
+		vrLen = 234;
+		vrLoc = 0;
+	};
+	E12FEC700495AFC400AEFBF9 = {
+		fRef = E1BF15BF03DBBE8900050002;
+		isa = PBXTextBookmark;
+		name = "VERSION: 1";
+		rLen = 0;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
+		vrLoc = 0;
+	};
+	E12FEC750495AFC400AEFBF9 = {
+		fRef = E165AB3603E7A7FC00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEAction.c: 19";
+		rLen = 0;
+		rLoc = 508;
+		rType = 0;
+		vrLen = 1764;
+		vrLoc = 0;
+	};
+	E12FEC760495AFC400AEFBF9 = {
+		fRef = E12FEC4504959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEKeyEquivalents.m: 37";
+		rLen = 0;
+		rLoc = 1300;
+		rType = 0;
+		vrLen = 1512;
+		vrLoc = 0;
+	};
+	E12FEC770495AFC400AEFBF9 = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: __VERSION__";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1390;
+		vrLoc = 0;
+	};
+	E12FEC780495AFC400AEFBF9 = {
+		fRef = E169DBA703E4F6A400050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEConfig.h: 29";
+		rLen = 0;
+		rLoc = 719;
+		rType = 0;
+		vrLen = 1816;
+		vrLoc = 341;
+	};
+	E12FEC790495AFC400AEFBF9 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 2";
+		rLen = 0;
+		rLoc = 40;
+		rType = 0;
+		vrLen = 1518;
+		vrLoc = 0;
+	};
+	E12FEC7A0495AFC400AEFBF9 = {
+		fRef = E12FECC20495AFC400AEFBF9;
+		isa = PBXTextBookmark;
+		name = "NSWindowController.h: 20";
+		rLen = 0;
+		rLoc = 463;
+		rType = 0;
+		vrLen = 1600;
+		vrLoc = 0;
+	};
+	E12FEC7D0495AFC400AEFBF9 = {
+		fRef = F9A6987003BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.h: servicesInMenuBar:";
+		rLen = 0;
+		rLoc = 1137;
+		rType = 0;
+		vrLen = 1414;
+		vrLoc = 0;
+	};
+	E12FEC7F0495AFC400AEFBF9 = {
+		fRef = E12FEC6204959FB800AEFBF9;
+		isa = PBXBookmark;
+	};
+	E12FEC810495AFC400AEFBF9 = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: ICCF_MigratePrefs";
+		rLen = 0;
+		rLoc = 11540;
+		rType = 0;
+		vrLen = 2435;
+		vrLoc = 10224;
+	};
+	E12FEC820495AFC400AEFBF9 = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: 30";
+		rLen = 0;
+		rLoc = 1614;
+		rType = 0;
+		vrLen = 1994;
+		vrLoc = 0;
+	};
+	E12FEC830495AFC400AEFBF9 = {
+		fRef = E135625E03DC9FC200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.h: kICErrorSoundEnabled";
+		rLen = 84;
+		rLoc = 1142;
+		rType = 0;
+		vrLen = 1575;
+		vrLoc = 25;
+	};
+	E12FEC840495AFC400AEFBF9 = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: 30";
+		rLen = 0;
+		rLoc = 1614;
+		rType = 0;
+		vrLen = 1994;
+		vrLoc = 0;
+	};
+	E12FEC850495AFC400AEFBF9 = {
+		fRef = E135625E03DC9FC200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.h: kICErrorSoundEnabled";
+		rLen = 84;
+		rLoc = 1142;
+		rType = 0;
+		vrLen = 1515;
+		vrLoc = 25;
+	};
+	E12FEC860495AFC400AEFBF9 = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: kICErrorSoundEnabled";
+		rLen = 35;
+		rLoc = 1306;
+		rType = 0;
+		vrLen = 2124;
+		vrLoc = 0;
+	};
+	E12FEC870495AFC400AEFBF9 = {
+		fRef = E11854F703F2709E00050002;
+		isa = PBXTextBookmark;
+		name = "CPS.h: CPSGetProcessInfo";
+		rLen = 4;
+		rLoc = 4510;
+		rType = 0;
+		vrLen = 1278;
+		vrLoc = 3841;
+	};
+	E12FEC880495AFC400AEFBF9 = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: ICCF_ReloadPrefs";
+		rLen = 0;
+		rLoc = 11813;
+		rType = 0;
+		vrLen = 2427;
+		vrLoc = 10344;
+	};
+	E12FEC890495AFC400AEFBF9 = {
+		fRef = E12FEC4404959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEENonHighlightingButtonCell.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 279;
+		vrLoc = 0;
+	};
+	E12FEC8A0495AFC400AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1554;
+		vrLoc = 0;
+	};
+	E12FEC8B0495AFC400AEFBF9 = {
+		fRef = E12FEC4204959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEENonHighlightingOutlineView.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 281;
+		vrLoc = 0;
+	};
+	E12FEC8C0495AFC400AEFBF9 = {
+		fRef = E12FEC4404959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEENonHighlightingButtonCell.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 279;
+		vrLoc = 0;
+	};
+	E12FEC8D0495AFC400AEFBF9 = {
+		fRef = E12FEC4504959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEKeyEquivalents.m: 16";
+		rLen = 0;
+		rLoc = 439;
+		rType = 0;
+		vrLen = 1530;
+		vrLoc = 0;
+	};
+	E12FEC8E0495AFC400AEFBF9 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 52";
+		rLen = 0;
+		rLoc = 3066;
+		rType = 0;
+		vrLen = 2222;
+		vrLoc = 1425;
+	};
+	E12FEC8F0495AFC400AEFBF9 = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: __VERSION__";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1574;
+		vrLoc = 0;
+	};
+	E12FEC900495AFC400AEFBF9 = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: ICCF_ReloadPrefs";
+		rLen = 43;
+		rLoc = 12404;
+		rType = 0;
+		vrLen = 2427;
+		vrLoc = 10344;
+	};
+	E12FEC910495AFC400AEFBF9 = {
+		fRef = E1317B2F03DFC4DE00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEETerminal.m: 448";
+		rLen = 0;
+		rLoc = 16489;
+		rType = 0;
+		vrLen = 2047;
+		vrLoc = 14441;
+	};
+	E12FEC920495AFC400AEFBF9 = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: prefExcludedApps";
+		rLen = 0;
+		rLoc = 9088;
+		rType = 0;
+		vrLen = 1945;
+		vrLoc = 6785;
+	};
+	E12FEC930495AFC400AEFBF9 = {
+		fRef = E1317B2F03DFC4DE00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEETerminal.m: draggingEntered:";
+		rLen = 0;
+		rLoc = 16059;
+		rType = 0;
+		vrLen = 2048;
+		vrLoc = 14441;
+	};
+	E12FEC940495AFC400AEFBF9 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 123";
+		rLen = 0;
+		rLoc = 8226;
+		rType = 0;
+		vrLen = 2173;
+		vrLoc = 7814;
+	};
+	E12FEC950495AFC400AEFBF9 = {
+		isa = PBXTargetBookmark;
+		trg = F5CD5E9D02DAE2C901AA4DA5;
+	};
+	E12FEC960495AFC400AEFBF9 = {
+		fRef = 089C165DFE840E0CC02AAC07;
+		isa = PBXTextBookmark;
+		name = "English: 5";
+		rLen = 0;
+		rLoc = 151;
+		rType = 0;
+		vrLen = 234;
+		vrLoc = 0;
+	};
+	E12FEC970495AFC400AEFBF9 = {
+		fRef = E1CBC99803E7602700050002;
+		isa = PBXTextBookmark;
+		name = "English: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1306;
+		vrLoc = 0;
+	};
+	E12FEC980495AFC400AEFBF9 = {
+		fRef = 089C165DFE840E0CC02AAC07;
+		isa = PBXTextBookmark;
+		name = "English: 5";
+		rLen = 0;
+		rLoc = 151;
+		rType = 0;
+		vrLen = 234;
+		vrLoc = 0;
+	};
+	E12FEC990495AFC400AEFBF9 = {
+		fRef = E1BF15BF03DBBE8900050002;
+		isa = PBXTextBookmark;
+		name = "VERSION: 1";
+		rLen = 0;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
+		vrLoc = 0;
+	};
+	E12FEC9A0495AFC400AEFBF9 = {
+		fRef = E1BF15A503DBAA5600050002;
+		isa = PBXTextBookmark;
+		name = "ui.plist: 44";
+		rLen = 0;
+		rLoc = 1281;
+		rType = 0;
+		vrLen = 1316;
+		vrLoc = 0;
+	};
+	E12FEC9B0495AFC400AEFBF9 = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: kICTerminalRequireOptionForSelfDrag";
+		rLen = 35;
+		rLoc = 1306;
+		rType = 0;
+		vrLen = 2124;
+		vrLoc = 0;
+	};
+	E12FEC9C0495AFC400AEFBF9 = {
+		fRef = E135625E03DC9FC200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.h: 53";
+		rLen = 0;
+		rLoc = 1670;
+		rType = 0;
+		vrLen = 1533;
+		vrLoc = 262;
+	};
+	E12FEC9D0495AFC400AEFBF9 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 4";
+		rLen = 0;
+		rLoc = 146;
+		rType = 0;
+		vrLen = 1517;
+		vrLoc = 0;
+	};
+	E12FEC9E0495AFC400AEFBF9 = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: 16";
+		rLen = 0;
+		rLoc = 362;
+		rType = 0;
+		vrLen = 2124;
+		vrLoc = 0;
+	};
+	E12FEC9F0495AFC400AEFBF9 = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: value";
+		rLen = 0;
+		rLoc = 7749;
+		rType = 0;
+		vrLen = 1908;
+		vrLoc = 6785;
+	};
+	E12FECA00495AFC400AEFBF9 = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: __VERSION__";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1574;
+		vrLoc = 0;
+	};
+	E12FECA10495AFC400AEFBF9 = {
+		fRef = E165AB3603E7A7FC00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEAction.c: 19";
+		rLen = 0;
+		rLoc = 508;
+		rType = 0;
+		vrLen = 1764;
+		vrLoc = 0;
+	};
+	E12FECA20495AFC400AEFBF9 = {
+		fRef = E12FEC3E04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.h: 9";
+		rLen = 0;
+		rLoc = 197;
+		rType = 0;
+		vrLen = 462;
+		vrLoc = 0;
+	};
+	E12FECA30495AFC400AEFBF9 = {
+		fRef = E12FEC4504959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEKeyEquivalents.m: 37";
+		rLen = 0;
+		rLoc = 1300;
+		rType = 0;
+		vrLen = 1512;
+		vrLoc = 0;
+	};
+	E12FECA40495AFC400AEFBF9 = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: __VERSION__";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1390;
+		vrLoc = 0;
+	};
+	E12FECA50495AFC400AEFBF9 = {
+		fRef = E169DBA703E4F6A400050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEConfig.h: 29";
+		rLen = 0;
+		rLoc = 719;
+		rType = 0;
+		vrLen = 1816;
+		vrLoc = 341;
+	};
+	E12FECA60495AFC400AEFBF9 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 2";
+		rLen = 0;
+		rLoc = 40;
+		rType = 0;
+		vrLen = 1518;
+		vrLoc = 0;
+	};
+	E12FECA70495AFC400AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: initialize";
+		rLen = 0;
+		rLoc = 6203;
+		rType = 0;
+		vrLen = 1630;
+		vrLoc = 4851;
+	};
+	E12FECA80495AFC400AEFBF9 = {
+		fRef = E12FEC3E04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.h: 12";
+		rLen = 0;
+		rLoc = 265;
+		rType = 0;
+		vrLen = 472;
+		vrLoc = 0;
+	};
+	E12FECA90495AFC400AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: showAll:";
+		rLen = 0;
+		rLoc = 6309;
+		rType = 0;
+		vrLen = 1596;
+		vrLoc = 4849;
+	};
+	E12FECAA0495AFC400AEFBF9 = {
+		fRef = E12FEC3E04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.h: 12";
+		rLen = 0;
+		rLoc = 265;
+		rType = 0;
+		vrLen = 472;
+		vrLoc = 0;
+	};
+	E12FECAB0495AFC400AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: showAll:";
+		rLen = 0;
+		rLoc = 6309;
+		rType = 0;
+		vrLen = 1595;
+		vrLoc = 4849;
+	};
+	E12FECAC0495AFC400AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: NSLocalizedString_";
+		rLen = 0;
+		rLoc = 585;
+		rType = 0;
+		vrLen = 1359;
+		vrLoc = 0;
+	};
+	E12FECAD0495AFC400AEFBF9 = {
+		fRef = F9A6987003BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.h: 34";
+		rLen = 120;
+		rLoc = 1187;
+		rType = 0;
+		vrLen = 1414;
+		vrLoc = 0;
+	};
+	E12FECAE0495AFC400AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: errorSoundEnabled:";
+		rLen = 0;
+		rLoc = 4917;
+		rType = 0;
+		vrLen = 1539;
+		vrLoc = 3602;
+	};
+	E12FECAF0495AFC400AEFBF9 = {
+		fRef = F9A6987003BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.h: 34";
+		rLen = 120;
+		rLoc = 1187;
+		rType = 0;
+		vrLen = 1414;
+		vrLoc = 0;
+	};
+	E12FECB00495AFC400AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: 16";
+		rLen = 0;
+		rLoc = 457;
+		rType = 0;
+		vrLen = 1401;
+		vrLoc = 0;
+	};
+	E12FECB10495AFC400AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: initWithParentWindow:";
+		rLen = 47;
+		rLoc = 4885;
+		rType = 0;
+		vrLen = 1595;
+		vrLoc = 4849;
+	};
+	E12FECB20495AFC400AEFBF9 = {
+		fRef = E12FEC3E04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.h: 18";
+		rLen = 0;
+		rLoc = 388;
+		rType = 0;
+		vrLen = 520;
+		vrLoc = 0;
+	};
+	E12FECB30495AFC400AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: saveChanges:";
+		rLen = 39;
+		rLoc = 6765;
+		rType = 0;
+		vrLen = 1469;
+		vrLoc = 6113;
+	};
+	E12FECB40495AFC400AEFBF9 = {
+		fRef = E12FEC3E04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.h: 26";
+		rLen = 0;
+		rLoc = 559;
+		rType = 0;
+		vrLen = 559;
+		vrLoc = 0;
+	};
+	E12FECB50495AFC400AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: 16";
+		rLen = 0;
+		rLoc = 457;
+		rType = 0;
+		vrLen = 1401;
+		vrLoc = 0;
+	};
+	E12FECB60495AFC400AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: initWithParentWindow:";
+		rLen = 0;
+		rLoc = 6119;
+		rType = 0;
+		vrLen = 1823;
+		vrLoc = 4399;
+	};
+	E12FECB70495AFC400AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: prefPaneHandlerForAPE:andBundle:";
+		rLen = 0;
+		rLoc = 885;
+		rType = 0;
+		vrLen = 1401;
+		vrLoc = 0;
+	};
+	E12FECB80495AFC400AEFBF9 = {
+		fRef = F9A6987003BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.h: servicesInMenuBar:";
+		rLen = 0;
+		rLoc = 1137;
+		rType = 0;
+		vrLen = 1414;
+		vrLoc = 0;
+	};
+	E12FECB90495AFC400AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: editContextualServices:";
+		rLen = 0;
+		rLoc = 4919;
+		rType = 0;
+		vrLen = 1433;
+		vrLoc = 3942;
+	};
+	E12FECBA0495AFC400AEFBF9 = {
+		fRef = F9A6987003BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.h: servicesInMenuBar:";
+		rLen = 0;
+		rLoc = 1137;
+		rType = 0;
+		vrLen = 1414;
+		vrLoc = 0;
+	};
+	E12FECBB0495AFC400AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: editContextualServices:";
+		rLen = 0;
+		rLoc = 4887;
+		rType = 0;
+		vrLen = 1447;
+		vrLoc = 3944;
+	};
+	E12FECBC0495AFC400AEFBF9 = {
+		fRef = F9A6987003BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.h: servicesInMenuBar:";
+		rLen = 0;
+		rLoc = 1137;
+		rType = 0;
+		vrLen = 1414;
+		vrLoc = 0;
+	};
+	E12FECBD0495AFC400AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: editContextualServices:";
+		rLen = 0;
+		rLoc = 4773;
+		rType = 0;
+		vrLen = 1447;
+		vrLoc = 3944;
+	};
+	E12FECBE0495AFC400AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: dealloc";
+		rLen = 0;
+		rLoc = 6270;
+		rType = 0;
+		vrLen = 1716;
+		vrLoc = 4714;
+	};
+	E12FECBF0495AFC400AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: errorSoundEnabled:";
+		rLen = 0;
+		rLoc = 5174;
+		rType = 0;
+		vrLen = 1499;
+		vrLoc = 3944;
+	};
+	E12FECC00495AFC400AEFBF9 = {
+		fRef = E12FEC6204959FB800AEFBF9;
+		isa = PBXBookmark;
+	};
+	E12FECC20495AFC400AEFBF9 = {
+		isa = PBXFileReference;
+		name = NSWindowController.h;
+		path = /System/Library/Frameworks/AppKit.framework/Versions/C/Headers/NSWindowController.h;
+		refType = 0;
+	};
+	E13176040491B26700000A8E = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 365";
+		rLen = 0;
+		rLoc = 14020;
+		rType = 0;
+		vrLen = 2110;
+		vrLoc = 13212;
+	};
+	E131770D0491BC7A00000A8E = {
+		fRef = E169DBA103E4EF5E00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEETextEdit.c: 178";
+		rLen = 6;
+		rLoc = 8572;
+		rType = 0;
+		vrLen = 1528;
+		vrLoc = 7524;
+	};
+	E13177100491BC7A00000A8E = {
+		fRef = E169DBA103E4EF5E00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEETextEdit.c: 178";
+		rLen = 6;
+		rLoc = 8572;
+		rType = 0;
+		vrLen = 1528;
+		vrLoc = 7524;
+	};
+	E13177110491BC7A00000A8E = {
+		fRef = E135625E03DC9FC200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.h: 19";
+		rLen = 0;
+		rLoc = 341;
+		rType = 0;
+		vrLen = 1260;
+		vrLoc = 156;
+	};
+	E13177120491BC7A00000A8E = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: 14";
+		rLen = 0;
+		rLoc = 303;
+		rType = 0;
+		vrLen = 1587;
+		vrLoc = 0;
+	};
+	E131793D0491D2BC00000A8E = {
+		fRef = E165AB3503E7A7FC00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEAction.h: 24";
+		rLen = 0;
+		rLoc = 533;
+		rType = 0;
+		vrLen = 536;
+		vrLoc = 0;
+	};
+	E13179400491D2BC00000A8E = {
+		fRef = E169DBA703E4F6A400050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEConfig.h: 60";
+		rLen = 0;
+		rLoc = 2124;
+		rType = 0;
+		vrLen = 1765;
+		vrLoc = 342;
+	};
+	E13179410491D2BC00000A8E = {
+		fRef = E165AB3603E7A7FC00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEAction.c: 22";
+		rLen = 0;
+		rLoc = 678;
+		rType = 0;
+		vrLen = 1764;
+		vrLoc = 0;
+	};
+	E13179420491D2BC00000A8E = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 365";
+		rLen = 0;
+		rLoc = 14020;
+		rType = 0;
+		vrLen = 1998;
+		vrLoc = 14451;
+	};
+	E13179430491D2BC00000A8E = {
+		fRef = E169DBA703E4F6A400050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEConfig.h: 60";
+		rLen = 0;
+		rLoc = 2124;
+		rType = 0;
+		vrLen = 1765;
+		vrLoc = 342;
+	};
+	E13179440491D2BC00000A8E = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: 128";
+		rLen = 0;
+		rLoc = 5127;
+		rType = 0;
+		vrLen = 2782;
+		vrLoc = 3809;
+	};
+	E13179450491D2BC00000A8E = {
+		fRef = E14343B303DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.h: 14";
+		rLen = 0;
+		rLoc = 594;
+		rType = 0;
+		vrLen = 1761;
+		vrLoc = 0;
+	};
+	E13179460491D2BC00000A8E = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 395";
+		rLen = 0;
+		rLoc = 15243;
+		rType = 0;
+		vrLen = 2464;
+		vrLoc = 11862;
+	};
+	E13179470491D2BC00000A8E = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: 54";
+		rLen = 0;
+		rLoc = 1625;
+		rType = 0;
+		vrLen = 1510;
+		vrLoc = 1219;
+	};
+	E13179480491D2BC00000A8E = {
+		fRef = F9A6987003BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.h: 24";
+		rLen = 78;
+		rLoc = 826;
+		rType = 0;
+		vrLen = 1190;
+		vrLoc = 0;
+	};
+	E13179490491D2BC00000A8E = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: 9";
+		rLen = 0;
+		rLoc = 219;
+		rType = 0;
+		vrLen = 1359;
+		vrLoc = 0;
+	};
+	E131794A0491D2BC00000A8E = {
+		fRef = E165AB3503E7A7FC00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEAction.h: 24";
+		rLen = 0;
+		rLoc = 533;
+		rType = 0;
+		vrLen = 536;
+		vrLoc = 0;
+	};
+	E131794B0491D2BC00000A8E = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 424";
+		rLen = 0;
+		rLoc = 16538;
+		rType = 0;
+		vrLen = 1925;
+		vrLoc = 16067;
+	};
+	E13179540491DBEF00000A8E = {
+		fRef = E14343B303DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.h: 5";
+		rLen = 0;
+		rLoc = 89;
+		rType = 0;
+		vrLen = 1761;
+		vrLoc = 0;
+	};
+	E13179570491DBEF00000A8E = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: 252";
+		rLen = 19;
+		rLoc = 11906;
+		rType = 0;
+		vrLen = 2329;
+		vrLoc = 9808;
+	};
+	E13179580491DBEF00000A8E = {
+		fRef = E135625E03DC9FC200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.h: 19";
+		rLen = 0;
+		rLoc = 341;
+		rType = 0;
+		vrLen = 1495;
+		vrLoc = 43;
+	};
+	E13179590491DBEF00000A8E = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: 14";
+		rLen = 0;
+		rLoc = 303;
+		rType = 0;
+		vrLen = 1994;
+		vrLoc = 0;
+	};
+	E131795A0491DBEF00000A8E = {
+		fRef = E135625E03DC9FC200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.h: 19";
+		rLen = 0;
+		rLoc = 341;
+		rType = 0;
+		vrLen = 1474;
+		vrLoc = 43;
+	};
+	E131795B0491DBEF00000A8E = {
+		fRef = E169DBA703E4F6A400050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEConfig.h: 44";
+		rLen = 0;
+		rLoc = 1113;
+		rType = 0;
+		vrLen = 1765;
+		vrLoc = 342;
+	};
+	E131795C0491DBEF00000A8E = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 424";
+		rLen = 0;
+		rLoc = 16538;
+		rType = 0;
+		vrLen = 1869;
+		vrLoc = 16067;
+	};
+	E131795D0491DBEF00000A8E = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: 14";
+		rLen = 0;
+		rLoc = 303;
+		rType = 0;
+		vrLen = 1994;
+		vrLoc = 0;
+	};
+	E131795E0491DBEF00000A8E = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 424";
+		rLen = 0;
+		rLoc = 16538;
+		rType = 0;
+		vrLen = 1869;
+		vrLoc = 16067;
+	};
+	E131795F0491DBEF00000A8E = {
+		fRef = E169DBA703E4F6A400050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEConfig.h: 50";
+		rLen = 0;
+		rLoc = 1565;
+		rType = 0;
+		vrLen = 1765;
+		vrLoc = 342;
+	};
+	E13179600491DBEF00000A8E = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 424";
+		rLen = 0;
+		rLoc = 16538;
+		rType = 0;
+		vrLen = 1869;
+		vrLoc = 16067;
+	};
+	E13179610491DBEF00000A8E = {
+		fRef = E14343B303DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.h: 5";
+		rLen = 0;
+		rLoc = 89;
+		rType = 0;
+		vrLen = 1761;
+		vrLoc = 0;
+	};
+	E13179620491DBEF00000A8E = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1574;
+		vrLoc = 0;
 	};
 	E1317A3503DF242100050002 = {
@@ -4628,5 +5912,5 @@
 		name = "ICeCoffEETerminal.m: 98";
 		rLen = 0;
-		rLoc = 6837;
+		rLoc = 6776;
 		rType = 0;
 		vrLen = 763;
@@ -4680,5 +5964,5 @@
 		name = "ICeCoffEETerminal.m: mouseUp:";
 		rLen = 0;
-		rLoc = 14255;
+		rLoc = 14194;
 		rType = 0;
 		vrLen = 25;
@@ -4688,5 +5972,5 @@
 		fileReference = E1317B2F03DFC4DE00050002;
 		isa = PBXFileBreakpoint;
-		lineNumber = 311;
+		lineNumber = 307;
 		state = 1;
 	};
@@ -4701,4 +5985,140 @@
 		vrLoc = 0;
 	};
+	E140B69E0495B20E00AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: servicesInMenuBar:";
+		rLen = 0;
+		rLoc = 4716;
+		rType = 0;
+		vrLen = 1453;
+		vrLoc = 3995;
+	};
+	E140B69F0495B20E00AEFBF9 = {
+		fRef = E12FEC3E04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.h: 26";
+		rLen = 0;
+		rLoc = 559;
+		rType = 0;
+		vrLen = 559;
+		vrLoc = 0;
+	};
+	E140B6A00495B20E00AEFBF9 = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: ICCF_ErrString";
+		rLen = 0;
+		rLoc = 913;
+		rType = 0;
+		vrLen = 1614;
+		vrLoc = 6328;
+	};
+	E140B6A10495B20E00AEFBF9 = {
+		fRef = E140B6AB0495B20E00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "NSApplication.h: 116";
+		rLen = 0;
+		rLoc = 3646;
+		rType = 0;
+		vrLen = 1911;
+		vrLoc = 4651;
+	};
+	E140B6A20495B20E00AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: hideAll:";
+		rLen = 0;
+		rLoc = 6580;
+		rType = 0;
+		vrLen = 1491;
+		vrLoc = 6296;
+	};
+	E140B6A30495B20E00AEFBF9 = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: 16";
+		rLen = 0;
+		rLoc = 362;
+		rType = 0;
+		vrLen = 2124;
+		vrLoc = 0;
+	};
+	E140B6A40495B20E00AEFBF9 = {
+		fRef = E135625E03DC9FC200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.h: ICCF_DEBUG";
+		rLen = 0;
+		rLoc = 283;
+		rType = 0;
+		vrLen = 1576;
+		vrLoc = 219;
+	};
+	E140B6A50495B20E00AEFBF9 = {
+		fRef = F9A6987103BE1DFF00AA4DA5;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEController.m: servicesInMenuBar:";
+		rLen = 0;
+		rLoc = 4716;
+		rType = 0;
+		vrLen = 1453;
+		vrLoc = 3995;
+	};
+	E140B6A60495B20E00AEFBF9 = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: ICCF_ErrString";
+		rLen = 0;
+		rLoc = 913;
+		rType = 0;
+		vrLen = 1614;
+		vrLoc = 6328;
+	};
+	E140B6A70495B20E00AEFBF9 = {
+		fRef = E12FEC3D04959F5A00AEFBF9;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEServicePrefController.m: hideAll:";
+		rLen = 0;
+		rLoc = 6580;
+		rType = 0;
+		vrLen = 1491;
+		vrLoc = 6296;
+	};
+	E140B6A80495B20E00AEFBF9 = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: 16";
+		rLen = 0;
+		rLoc = 362;
+		rType = 0;
+		vrLen = 2124;
+		vrLoc = 0;
+	};
+	E140B6A90495B20E00AEFBF9 = {
+		fRef = E135625E03DC9FC200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.h: ICCF_DEBUG";
+		rLen = 0;
+		rLoc = 283;
+		rType = 0;
+		vrLen = 1576;
+		vrLoc = 219;
+	};
+	E140B6AA0495B20E00AEFBF9 = {
+		fRef = E1BF15A503DBAA5600050002;
+		isa = PBXTextBookmark;
+		name = "ui.plist: 38";
+		rLen = 0;
+		rLoc = 1111;
+		rType = 0;
+		vrLen = 1316;
+		vrLoc = 0;
+	};
+	E140B6AB0495B20E00AEFBF9 = {
+		isa = PBXFileReference;
+		name = NSApplication.h;
+		path = /System/Library/Frameworks/AppKit.framework/Versions/C/Headers/NSApplication.h;
+		refType = 0;
+	};
 	E1448271041D4AB700050002 = {
 		fRef = E1BF15A503DBAA5600050002;
@@ -4736,27 +6156,17 @@
 		name = "ICeCoffEEController.m: textBlinkCount:";
 		rLen = 52;
-		rLoc = 4163;
+		rLoc = 4210;
 		rType = 0;
 		vrLen = 1360;
 		vrLoc = 2804;
 	};
-	E14B42B3048879E300C57841 = {
+	E14A9A5304964E8800AEFBF9 = {
 		fRef = E1BF15A503DBAA5600050002;
 		isa = PBXTextBookmark;
-		name = "ui.plist: 25";
-		rLen = 0;
-		rLoc = 722;
+		name = "ui.plist: 21";
+		rLen = 0;
+		rLoc = 588;
 		rType = 0;
 		vrLen = 1316;
-		vrLoc = 0;
-	};
-	E14B42B4048879E300C57841 = {
-		fRef = E182C8F603DE817F00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEShared.m: 14";
-		rLen = 0;
-		rLoc = 303;
-		rType = 0;
-		vrLen = 1587;
 		vrLoc = 0;
 	};
@@ -4780,31 +6190,4 @@
 		vrLen = 1587;
 		vrLoc = 0;
-	};
-	E14B42B7048879E300C57841 = {
-		fRef = E135625E03DC9FC200050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEShared.h: 19";
-		rLen = 0;
-		rLoc = 341;
-		rType = 0;
-		vrLen = 1320;
-		vrLoc = 96;
-	};
-	E14B42B8048879E300C57841 = {
-		fRef = F9A6986E03BE1DF000AA4DA5;
-		isa = PBXTextBookmark;
-		rLen = 7;
-		rLoc = 7468;
-		rType = 0;
-	};
-	E14B42B9048879E300C57841 = {
-		fRef = F9A6986E03BE1DF000AA4DA5;
-		isa = PBXTextBookmark;
-		name = "APEMain.m: 164";
-		rLen = 11;
-		rLoc = 7440;
-		rType = 0;
-		vrLen = 837;
-		vrLoc = 6889;
 	};
 	E157EE6D03F059E300050002 = {
@@ -4862,5 +6245,5 @@
 		name = "ICeCoffEETerminal.m: ICCF_LaunchURLFromTerminal";
 		rLen = 0;
-		rLoc = 13794;
+		rLoc = 13733;
 		rType = 0;
 		vrLen = 1355;
@@ -4876,7 +6259,7 @@
 		name = "VERSION: 1";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 6;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -4906,7 +6289,7 @@
 		name = "VERSION: 1";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 6;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -5034,5 +6417,5 @@
 		name = "English: 6";
 		rLen = 0;
-		rLoc = 238;
+		rLoc = 234;
 		rType = 0;
 		vrLen = 234;
@@ -5054,5 +6437,5 @@
 		name = "APEMain.m: excludedAppIndex";
 		rLen = 0;
-		rLoc = 9030;
+		rLoc = 9281;
 		rType = 0;
 		vrLen = 1840;
@@ -5171,14 +6554,4 @@
 		vrLoc = 1699;
 	};
-	E16C834C03F759D800050002 = {
-		fRef = F9A6987003BE1DFF00AA4DA5;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEController.h: setAPEBundle:prefPaneBundle:";
-		rLen = 78;
-		rLoc = 722;
-		rType = 0;
-		vrLen = 1190;
-		vrLoc = 0;
-	};
 	E16C834D03F759D800050002 = {
 		fRef = E16C83BD03F759D800050002;
@@ -5201,14 +6574,4 @@
 		vrLoc = 0;
 	};
-	E16C834F03F759D800050002 = {
-		fRef = F9A6987103BE1DFF00AA4DA5;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEController.m: apeBundle";
-		rLen = 0;
-		rLoc = 1967;
-		rType = 0;
-		vrLen = 1561;
-		vrLoc = 1219;
-	};
 	E16C835803F759D800050002 = {
 		fRef = E1BF15A503DBAA5600050002;
@@ -5236,7 +6599,7 @@
 		name = "VERSION: 1";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 6;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -5276,7 +6639,7 @@
 		name = "VERSION: 1";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 6;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -5306,5 +6669,5 @@
 		name = "ICeCoffEEController.m: 67";
 		rLen = 0;
-		rLoc = 2355;
+		rLoc = 2402;
 		rType = 0;
 		vrLen = 1527;
@@ -5336,5 +6699,5 @@
 		name = "ICeCoffEEController.m: prefPaneHandlerForAPE:andBundle:";
 		rLen = 0;
-		rLoc = 1680;
+		rLoc = 1727;
 		rType = 0;
 		vrLen = 1533;
@@ -5386,5 +6749,5 @@
 		name = "ICeCoffEEController.m: prefPaneHandlerForAPE:andBundle:";
 		rLen = 0;
-		rLoc = 1680;
+		rLoc = 1727;
 		rType = 0;
 		vrLen = 1382;
@@ -5456,5 +6819,5 @@
 		name = "ICeCoffEEController.m: commandClickEnabled:";
 		rLen = 0;
-		rLoc = 3745;
+		rLoc = 3792;
 		rType = 0;
 		vrLen = 1523;
@@ -5476,7 +6839,7 @@
 		name = "VERSION: 1";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 6;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -5510,5 +6873,5 @@
 		name = "ICeCoffEEController.m: commandClickEnabled:";
 		rLen = 0;
-		rLoc = 3745;
+		rLoc = 3792;
 		rType = 0;
 		vrLen = 1526;
@@ -5530,5 +6893,5 @@
 		name = "APEMain.m: ICCF_ReloadPrefs";
 		rLen = 16;
-		rLoc = 11172;
+		rLoc = 11469;
 		rType = 0;
 		vrLen = 2080;
@@ -5570,5 +6933,5 @@
 		name = "APEMain.m: ICCF_ReloadPrefs";
 		rLen = 16;
-		rLoc = 11172;
+		rLoc = 11469;
 		rType = 0;
 		vrLen = 1876;
@@ -5640,5 +7003,5 @@
 		name = "ICeCoffEEController.m: 23";
 		rLen = 1;
-		rLoc = 727;
+		rLoc = 770;
 		rType = 0;
 		vrLen = 1455;
@@ -5670,5 +7033,5 @@
 		name = "ICeCoffEEController.m: initWithAPE:andBundle:";
 		rLen = 0;
-		rLoc = 1092;
+		rLoc = 1139;
 		rType = 0;
 		vrLen = 1449;
@@ -5680,5 +7043,5 @@
 		name = "ICeCoffEEController.h: setBundle:";
 		rLen = 0;
-		rLoc = 799;
+		rLoc = 903;
 		rType = 0;
 		vrLen = 1164;
@@ -5690,5 +7053,5 @@
 		name = "ICeCoffEEController.m: initWithAPE:andBundle:";
 		rLen = 0;
-		rLoc = 1092;
+		rLoc = 1139;
 		rType = 0;
 		vrLen = 1449;
@@ -5700,5 +7063,5 @@
 		name = "ICeCoffEEController.h: bundle";
 		rLen = 78;
-		rLoc = 722;
+		rLoc = 826;
 		rType = 0;
 		vrLen = 1190;
@@ -5710,5 +7073,5 @@
 		name = "ICeCoffEEController.m: prefPaneHandlerForAPE:andBundle:";
 		rLen = 78;
-		rLoc = 3111;
+		rLoc = 3158;
 		rType = 0;
 		vrLen = 1630;
@@ -5720,5 +7083,5 @@
 		name = "ICeCoffEEController.h: bundle";
 		rLen = 78;
-		rLoc = 722;
+		rLoc = 826;
 		rType = 0;
 		vrLen = 1190;
@@ -5730,5 +7093,5 @@
 		name = "ICeCoffEEController.m: setAPEBundle:prefPaneBundle:";
 		rLen = 0;
-		rLoc = 3261;
+		rLoc = 3308;
 		rType = 0;
 		vrLen = 1671;
@@ -5740,5 +7103,5 @@
 		name = "ICeCoffEEController.m: awakeFromNib";
 		rLen = 0;
-		rLoc = 2157;
+		rLoc = 2204;
 		rType = 0;
 		vrLen = 1706;
@@ -5780,5 +7143,5 @@
 		name = "ICeCoffEEController.m: awakeFromNib";
 		rLen = 13;
-		rLoc = 2077;
+		rLoc = 2124;
 		rType = 0;
 		vrLen = 1726;
@@ -5810,5 +7173,5 @@
 		name = "ICeCoffEEController.m: awakeFromNib";
 		rLen = 24;
-		rLoc = 2119;
+		rLoc = 2166;
 		rType = 0;
 		vrLen = 1747;
@@ -5820,5 +7183,5 @@
 		name = "ICeCoffEEController.h: setAPEBundle:prefPaneBundle:";
 		rLen = 78;
-		rLoc = 722;
+		rLoc = 826;
 		rType = 0;
 		vrLen = 1190;
@@ -5830,5 +7193,5 @@
 		name = "ICeCoffEEController.m: apeBundle";
 		rLen = 0;
-		rLoc = 1967;
+		rLoc = 2014;
 		rType = 0;
 		vrLen = 1561;
@@ -5850,7 +7213,7 @@
 		name = "VERSION: 1";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 6;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -5900,7 +7263,7 @@
 		name = "VERSION: 1";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 6;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -6004,4 +7367,84 @@
 		refType = 0;
 	};
+	E17758550489E635007FD8E8 = {
+		fRef = E1BB268F03DB74B700050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEMenuOnly.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 256;
+		vrLoc = 0;
+	};
+	E177585A0489E635007FD8E8 = {
+		fRef = E135625E03DC9FC200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.h: 19";
+		rLen = 0;
+		rLoc = 341;
+		rType = 0;
+		vrLen = 1260;
+		vrLoc = 156;
+	};
+	E177585B0489E635007FD8E8 = {
+		fRef = E1BB268F03DB74B700050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEMenuOnly.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 256;
+		vrLoc = 0;
+	};
+	E177585C0489E635007FD8E8 = {
+		fRef = E1317B2F03DFC4DE00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEETerminal.m: 440";
+		rLen = 0;
+		rLoc = 15766;
+		rType = 0;
+		vrLen = 2113;
+		vrLoc = 14328;
+	};
+	E177585D0489E635007FD8E8 = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 303";
+		rLen = 0;
+		rLoc = 10870;
+		rType = 0;
+		vrLen = 1797;
+		vrLoc = 9857;
+	};
+	E177585E0489E635007FD8E8 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 130";
+		rLen = 0;
+		rLoc = 8682;
+		rType = 0;
+		vrLen = 2225;
+		vrLoc = 6459;
+	};
+	E177585F0489E635007FD8E8 = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: 318";
+		rLen = 0;
+		rLoc = 11351;
+		rType = 0;
+		vrLen = 1957;
+		vrLoc = 10090;
+	};
+	E17758600489E635007FD8E8 = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: 128";
+		rLen = 0;
+		rLoc = 5127;
+		rType = 0;
+		vrLen = 1691;
+		vrLoc = 4295;
+	};
 	E182C8ED03DE6ED300050002 = {
 		children = (
@@ -6226,5 +7669,5 @@
 		fileReference = E1317B2F03DFC4DE00050002;
 		isa = PBXFileBreakpoint;
-		lineNumber = 447;
+		lineNumber = 443;
 		state = 1;
 	};
@@ -6239,14 +7682,4 @@
 		vrLoc = 0;
 	};
-	E1BF4A320487C75E00C20906 = {
-		fRef = E1317B2F03DFC4DE00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEETerminal.m: rangeWithTerminal:pt0:pt1:";
-		rLen = 0;
-		rLoc = 15827;
-		rType = 0;
-		vrLen = 2168;
-		vrLoc = 14328;
-	};
 	E1BF4A380487C75E00C20906 = {
 		fRef = E14343B403DB4CF200050002;
@@ -6264,5 +7697,5 @@
 		name = "ICeCoffEETerminal.m: draggingEntered:";
 		rLen = 0;
-		rLoc = 15966;
+		rLoc = 15905;
 		rType = 0;
 		vrLen = 1823;
@@ -6284,7 +7717,7 @@
 		name = "ICeCoffEETerminal.m: rangeWithTerminal:pt0:pt1:";
 		rLen = 0;
-		rLoc = 15827;
-		rType = 0;
-		vrLen = 2168;
+		rLoc = 15766;
+		rType = 0;
+		vrLen = 2113;
 		vrLoc = 14328;
 	};
@@ -6354,5 +7787,5 @@
 		name = "ICeCoffEE.m: IC_addRemoveServicesMenu";
 		rLen = 0;
-		rLoc = 20221;
+		rLoc = 20624;
 		rType = 0;
 		vrLen = 1475;
@@ -6374,5 +7807,5 @@
 		name = "ICeCoffEE.m: IC_addRemoveServicesMenu";
 		rLen = 0;
-		rLoc = 20221;
+		rLoc = 20624;
 		rType = 0;
 		vrLen = 1767;
@@ -6431,8 +7864,4 @@
 		vrLoc = 0;
 	};
-	E1BF4B57048872D400C20906 = {
-		isa = PBXTargetBookmark;
-		trg = F5CD5E9D02DAE2C901AA4DA5;
-	};
 	E1BF4B58048872D400C20906 = {
 		fRef = E1BF4B99048872D500C20906;
@@ -6444,34 +7873,4 @@
 		vrLen = 2203;
 		vrLoc = 7945;
-	};
-	E1BF4B59048872D400C20906 = {
-		fRef = E11854F703F2709E00050002;
-		isa = PBXTextBookmark;
-		name = "CPS.h: CPSGetProcessInfo";
-		rLen = 4;
-		rLoc = 4510;
-		rType = 0;
-		vrLen = 1303;
-		vrLoc = 3841;
-	};
-	E1BF4B5A048872D400C20906 = {
-		fRef = E14343B303DB4CF200050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEE.h: 10";
-		rLen = 0;
-		rLoc = 309;
-		rType = 0;
-		vrLen = 1761;
-		vrLoc = 0;
-	};
-	E1BF4B5B048872D400C20906 = {
-		fRef = E165AB3503E7A7FC00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEAction.h: 24";
-		rLen = 0;
-		rLoc = 533;
-		rType = 0;
-		vrLen = 536;
-		vrLoc = 0;
 	};
 	E1BF4B5C048872D400C20906 = {
@@ -6502,14 +7901,4 @@
 		vrLoc = 815;
 	};
-	E1BF4B5F048872D400C20906 = {
-		fRef = E169DBA703E4F6A400050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEConfig.h: 60";
-		rLen = 0;
-		rLoc = 2042;
-		rType = 0;
-		vrLen = 1770;
-		vrLoc = 305;
-	};
 	E1BF4B60048872D400C20906 = {
 		fRef = E140C475040BB997009FF178;
@@ -6520,14 +7909,4 @@
 		rType = 0;
 		vrLen = 745;
-		vrLoc = 0;
-	};
-	E1BF4B61048872D400C20906 = {
-		fRef = E1BF4A4D0487C77C00C20906;
-		isa = PBXTextBookmark;
-		name = "German: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1653;
 		vrLoc = 0;
 	};
@@ -6542,35 +7921,125 @@
 		vrLoc = 0;
 	};
-	E1BF4B63048872D400C20906 = {
+	E1BF4B6B048872D400C20906 = {
+		fRef = E1BF4A570487CA5300C20906;
+		isa = PBXTextBookmark;
+		name = "German: 48";
+		rLen = 0;
+		rLoc = 1733;
+		rType = 0;
+		vrLen = 1512;
+		vrLoc = 246;
+	};
+	E1BF4B6C048872D400C20906 = {
+		fRef = E1F6E3AC040BCC5700050002;
+		isa = PBXTextBookmark;
+		name = "Japanese: 68";
+		rLen = 0;
+		rLoc = 2063;
+		rType = 0;
+		vrLen = 1462;
+		vrLoc = 823;
+	};
+	E1BF4B6E048872D400C20906 = {
+		fRef = E1BF4A4D0487C77C00C20906;
+		isa = PBXTextBookmark;
+		name = "German: 98";
+		rLen = 0;
+		rLoc = 5794;
+		rType = 0;
+		vrLen = 2003;
+		vrLoc = 4548;
+	};
+	E1BF4B6F048872D400C20906 = {
+		fRef = E1CBC99803E7602700050002;
+		isa = PBXTextBookmark;
+		name = "English: 102";
+		rLen = 0;
+		rLoc = 3322;
+		rType = 0;
+		vrLen = 1326;
+		vrLoc = 2301;
+	};
+	E1BF4B70048872D400C20906 = {
+		fRef = E1BF4A570487CA5300C20906;
+		isa = PBXTextBookmark;
+		name = "German: 40";
+		rLen = 0;
+		rLoc = 929;
+		rType = 0;
+		vrLen = 2306;
+		vrLoc = 763;
+	};
+	E1BF4B71048872D400C20906 = {
+		fRef = E1CBC99803E7602700050002;
+		isa = PBXTextBookmark;
+		name = "English: 91";
+		rLen = 0;
+		rLoc = 3050;
+		rType = 0;
+		vrLen = 1326;
+		vrLoc = 2301;
+	};
+	E1BF4B72048872D400C20906 = {
+		fRef = E1BF4A570487CA5300C20906;
+		isa = PBXTextBookmark;
+		name = "German: 65";
+		rLen = 0;
+		rLoc = 2012;
+		rType = 0;
+		vrLen = 2059;
+		vrLoc = 2668;
+	};
+	E1BF4B73048872D400C20906 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 99";
+		rLen = 0;
+		rLoc = 6408;
+		rType = 0;
+		vrLen = 2154;
+		vrLoc = 7160;
+	};
+	E1BF4B74048872D400C20906 = {
+		fRef = E1BF4A4D0487C77C00C20906;
+		isa = PBXTextBookmark;
+		name = "German: 23";
+		rLen = 0;
+		rLoc = 1036;
+		rType = 0;
+		vrLen = 1568;
+		vrLoc = 0;
+	};
+	E1BF4B75048872D400C20906 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 226";
+		rLen = 0;
+		rLoc = 13343;
+		rType = 0;
+		vrLen = 1785;
+		vrLoc = 12371;
+	};
+	E1BF4B76048872D400C20906 = {
 		fRef = E14343B403DB4CF200050002;
 		isa = PBXTextBookmark;
-		name = "ICeCoffEE.m: ICCF_HandleException";
-		rLen = 0;
-		rLoc = 10870;
-		rType = 0;
-		vrLen = 1798;
-		vrLoc = 9857;
-	};
-	E1BF4B64048872D400C20906 = {
-		fRef = E165AB3603E7A7FC00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEAction.c: urlString";
-		rLen = 0;
-		rLoc = 678;
-		rType = 0;
-		vrLen = 1764;
-		vrLoc = 0;
-	};
-	E1BF4B65048872D400C20906 = {
-		fRef = E169DBA103E4EF5E00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEETextEdit.c: ICCF_LaunchURLFromTEClick";
-		rLen = 0;
-		rLoc = 5618;
-		rType = 0;
-		vrLen = 2981;
-		vrLoc = 2866;
-	};
-	E1BF4B67048872D400C20906 = {
+		name = "ICeCoffEE.m: IC_addRemoveServicesMenu";
+		rLen = 0;
+		rLoc = 20329;
+		rType = 0;
+		vrLen = 1571;
+		vrLoc = 19157;
+	};
+	E1BF4B77048872D400C20906 = {
+		fRef = E14343B303DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.h: 39";
+		rLen = 0;
+		rLoc = 1575;
+		rType = 0;
+		vrLen = 1568;
+		vrLoc = 584;
+	};
+	E1BF4B78048872D400C20906 = {
 		fRef = F9A6986E03BE1DF000AA4DA5;
 		isa = PBXTextBookmark;
@@ -6579,158 +8048,108 @@
 		rLoc = 3450;
 		rType = 0;
-		vrLen = 1739;
-		vrLoc = 1025;
-	};
-	E1BF4B68048872D400C20906 = {
-		fRef = E1BF15BF03DBBE8900050002;
-		isa = PBXTextBookmark;
-		name = "VERSION: 2";
-		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 8;
-		vrLoc = 0;
-	};
-	E1BF4B69048872D400C20906 = {
+		vrLen = 2731;
+		vrLoc = 4963;
+	};
+	E1BF4B79048872D400C20906 = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: IC_addRemoveServicesMenu";
+		rLen = 0;
+		rLoc = 20329;
+		rType = 0;
+		vrLen = 1465;
+		vrLoc = 19157;
+	};
+	E1BF4B7A048872D400C20906 = {
+		fRef = E14343B303DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.h: 10";
+		rLen = 0;
+		rLoc = 309;
+		rType = 0;
+		vrLen = 1761;
+		vrLoc = 0;
+	};
+	E1BF4B7B048872D400C20906 = {
+		fRef = E165AB3603E7A7FC00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEAction.c: 19";
+		rLen = 0;
+		rLoc = 508;
+		rType = 0;
+		vrLen = 1764;
+		vrLoc = 0;
+	};
+	E1BF4B7C048872D400C20906 = {
+		fRef = E165AB3503E7A7FC00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEAction.h: 24";
+		rLen = 0;
+		rLoc = 533;
+		rType = 0;
+		vrLen = 536;
+		vrLoc = 0;
+	};
+	E1BF4B7D048872D400C20906 = {
+		fRef = E165AB3603E7A7FC00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEAction.c: 19";
+		rLen = 0;
+		rLoc = 508;
+		rType = 0;
+		vrLen = 1764;
+		vrLoc = 0;
+	};
+	E1BF4B7E048872D400C20906 = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: __OBJC__";
+		rLen = 0;
+		rLoc = 192;
+		rType = 0;
+		vrLen = 1587;
+		vrLoc = 0;
+	};
+	E1BF4B7F048872D400C20906 = {
 		fRef = E135625E03DC9FC200050002;
 		isa = PBXTextBookmark;
-		name = "ICeCoffEEShared.h: 21";
-		rLen = 0;
-		rLoc = 377;
-		rType = 0;
-		vrLen = 1319;
-		vrLoc = 96;
-	};
-	E1BF4B6A048872D400C20906 = {
-		fRef = F56276C20379923401AA4DA5;
-		isa = PBXTextBookmark;
-		name = "English: 123";
-		rLen = 0;
-		rLoc = 8192;
-		rType = 0;
-		vrLen = 2245;
-		vrLoc = 6203;
-	};
-	E1BF4B6B048872D400C20906 = {
-		fRef = E1BF4A570487CA5300C20906;
-		isa = PBXTextBookmark;
-		name = "German: 48";
-		rLen = 0;
-		rLoc = 1733;
-		rType = 0;
-		vrLen = 1512;
-		vrLoc = 246;
-	};
-	E1BF4B6C048872D400C20906 = {
-		fRef = E1F6E3AC040BCC5700050002;
-		isa = PBXTextBookmark;
-		name = "Japanese: 68";
-		rLen = 0;
-		rLoc = 2063;
-		rType = 0;
-		vrLen = 1462;
-		vrLoc = 823;
-	};
-	E1BF4B6E048872D400C20906 = {
-		fRef = E1BF4A4D0487C77C00C20906;
-		isa = PBXTextBookmark;
-		name = "German: 98";
-		rLen = 0;
-		rLoc = 5794;
-		rType = 0;
-		vrLen = 2003;
-		vrLoc = 4548;
-	};
-	E1BF4B6F048872D400C20906 = {
-		fRef = E1CBC99803E7602700050002;
-		isa = PBXTextBookmark;
-		name = "English: 102";
-		rLen = 0;
-		rLoc = 3322;
-		rType = 0;
-		vrLen = 1326;
-		vrLoc = 2301;
-	};
-	E1BF4B70048872D400C20906 = {
-		fRef = E1BF4A570487CA5300C20906;
-		isa = PBXTextBookmark;
-		name = "German: 40";
-		rLen = 0;
-		rLoc = 929;
-		rType = 0;
-		vrLen = 2306;
-		vrLoc = 763;
-	};
-	E1BF4B71048872D400C20906 = {
-		fRef = E1CBC99803E7602700050002;
-		isa = PBXTextBookmark;
-		name = "English: 91";
-		rLen = 0;
-		rLoc = 3050;
-		rType = 0;
-		vrLen = 1326;
-		vrLoc = 2301;
-	};
-	E1BF4B72048872D400C20906 = {
-		fRef = E1BF4A570487CA5300C20906;
-		isa = PBXTextBookmark;
-		name = "German: 65";
-		rLen = 0;
-		rLoc = 2012;
-		rType = 0;
-		vrLen = 2059;
-		vrLoc = 2668;
-	};
-	E1BF4B73048872D400C20906 = {
-		fRef = F56276C20379923401AA4DA5;
-		isa = PBXTextBookmark;
-		name = "English: 99";
-		rLen = 0;
-		rLoc = 6408;
-		rType = 0;
-		vrLen = 2154;
-		vrLoc = 7160;
-	};
-	E1BF4B74048872D400C20906 = {
-		fRef = E1BF4A4D0487C77C00C20906;
-		isa = PBXTextBookmark;
-		name = "German: 23";
-		rLen = 0;
-		rLoc = 1036;
-		rType = 0;
-		vrLen = 1568;
-		vrLoc = 0;
-	};
-	E1BF4B75048872D400C20906 = {
-		fRef = F56276C20379923401AA4DA5;
-		isa = PBXTextBookmark;
-		name = "English: 226";
-		rLen = 0;
-		rLoc = 13343;
-		rType = 0;
-		vrLen = 1785;
-		vrLoc = 12371;
-	};
-	E1BF4B76048872D400C20906 = {
+		name = "ICeCoffEEShared.h: ICCF_WEBKIT";
+		rLen = 0;
+		rLoc = 305;
+		rType = 0;
+		vrLen = 1340;
+		vrLoc = 43;
+	};
+	E1BF4B80048872D400C20906 = {
+		fRef = E182C8F603DE817F00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEShared.m: __OBJC__";
+		rLen = 0;
+		rLoc = 192;
+		rType = 0;
+		vrLen = 1587;
+		vrLoc = 0;
+	};
+	E1BF4B81048872D400C20906 = {
+		fRef = E169DBA703E4F6A400050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEEConfig.h: 57";
+		rLen = 18;
+		rLoc = 1958;
+		rType = 0;
+		vrLen = 1672;
+		vrLoc = 291;
+	};
+	E1BF4B82048872D400C20906 = {
 		fRef = E14343B403DB4CF200050002;
 		isa = PBXTextBookmark;
-		name = "ICeCoffEE.m: IC_addRemoveServicesMenu";
-		rLen = 0;
-		rLoc = 19926;
-		rType = 0;
-		vrLen = 1571;
-		vrLoc = 19157;
-	};
-	E1BF4B77048872D400C20906 = {
-		fRef = E14343B303DB4CF200050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEE.h: 39";
-		rLen = 0;
-		rLoc = 1575;
-		rType = 0;
-		vrLen = 1568;
-		vrLoc = 584;
-	};
-	E1BF4B78048872D400C20906 = {
+		name = "ICeCoffEE.m: ICCF_EventIsCommandMouseDown";
+		rLen = 33;
+		rLoc = 1921;
+		rType = 0;
+		vrLen = 1603;
+		vrLoc = 544;
+	};
+	E1BF4B83048872D400C20906 = {
 		fRef = F9A6986E03BE1DF000AA4DA5;
 		isa = PBXTextBookmark;
@@ -6739,108 +8158,138 @@
 		rLoc = 3450;
 		rType = 0;
-		vrLen = 2731;
-		vrLoc = 4963;
-	};
-	E1BF4B79048872D400C20906 = {
+		vrLen = 1739;
+		vrLoc = 1025;
+	};
+	E1BF4B84048872D400C20906 = {
 		fRef = E14343B403DB4CF200050002;
 		isa = PBXTextBookmark;
-		name = "ICeCoffEE.m: IC_addRemoveServicesMenu";
-		rLen = 0;
-		rLoc = 19926;
-		rType = 0;
-		vrLen = 1465;
-		vrLoc = 19157;
-	};
-	E1BF4B7A048872D400C20906 = {
-		fRef = E14343B303DB4CF200050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEE.h: 10";
-		rLen = 0;
-		rLoc = 309;
-		rType = 0;
-		vrLen = 1761;
-		vrLoc = 0;
-	};
-	E1BF4B7B048872D400C20906 = {
+		name = "ICeCoffEE.m: ICCF_GetHint";
+		rLen = 0;
+		rLoc = 5492;
+		rType = 0;
+		vrLen = 1415;
+		vrLoc = 4222;
+	};
+	E1BF4B85048872D400C20906 = {
+		fRef = E1CBC99803E7602700050002;
+		isa = PBXTextBookmark;
+		name = "English: 46";
+		rLen = 21;
+		rLoc = 1187;
+		rType = 0;
+		vrLen = 1873;
+		vrLoc = 896;
+	};
+	E1BF4B86048872D400C20906 = {
+		fRef = E1F6E3AC040BCC5700050002;
+		isa = PBXTextBookmark;
+		name = "Japanese: 46";
+		rLen = 0;
+		rLoc = 1195;
+		rType = 0;
+		vrLen = 1417;
+		vrLoc = 646;
+	};
+	E1BF4B87048872D400C20906 = {
+		fRef = E1BF4A570487CA5300C20906;
+		isa = PBXTextBookmark;
+		name = "German: 65";
+		rLen = 0;
+		rLoc = 2071;
+		rType = 0;
+		vrLen = 2372;
+		vrLoc = 1662;
+	};
+	E1BF4B88048872D400C20906 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 14";
+		rLen = 0;
+		rLoc = 522;
+		rType = 0;
+		vrLen = 1497;
+		vrLoc = 0;
+	};
+	E1BF4B89048872D400C20906 = {
+		fRef = E14343B403DB4CF200050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEE.m: ICCF_HandleException";
+		rLen = 0;
+		rLoc = 10870;
+		rType = 0;
+		vrLen = 1798;
+		vrLoc = 9857;
+	};
+	E1BF4B8A048872D400C20906 = {
 		fRef = E165AB3603E7A7FC00050002;
 		isa = PBXTextBookmark;
-		name = "ICeCoffEEAction.c: 19";
-		rLen = 0;
-		rLoc = 508;
+		name = "ICeCoffEEAction.c: urlString";
+		rLen = 0;
+		rLoc = 678;
 		rType = 0;
 		vrLen = 1764;
 		vrLoc = 0;
 	};
-	E1BF4B7C048872D400C20906 = {
-		fRef = E165AB3503E7A7FC00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEAction.h: 24";
-		rLen = 0;
-		rLoc = 533;
-		rType = 0;
-		vrLen = 536;
-		vrLoc = 0;
-	};
-	E1BF4B7D048872D400C20906 = {
-		fRef = E165AB3603E7A7FC00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEAction.c: 19";
-		rLen = 0;
-		rLoc = 508;
-		rType = 0;
-		vrLen = 1764;
-		vrLoc = 0;
-	};
-	E1BF4B7E048872D400C20906 = {
+	E1BF4B8B048872D400C20906 = {
+		fRef = E169DBA103E4EF5E00050002;
+		isa = PBXTextBookmark;
+		name = "ICeCoffEETextEdit.c: ICCF_LaunchURLFromTEClick";
+		rLen = 0;
+		rLoc = 5618;
+		rType = 0;
+		vrLen = 2981;
+		vrLoc = 2866;
+	};
+	E1BF4B8C048872D400C20906 = {
+		fRef = E1CBC99803E7602700050002;
+		isa = PBXTextBookmark;
+		name = "English: 46";
+		rLen = 0;
+		rLoc = 1302;
+		rType = 0;
+		vrLen = 1873;
+		vrLoc = 896;
+	};
+	E1BF4B8D048872D400C20906 = {
+		fRef = E1F6E3AC040BCC5700050002;
+		isa = PBXTextBookmark;
+		name = "Japanese: 46";
+		rLen = 0;
+		rLoc = 1195;
+		rType = 0;
+		vrLen = 1500;
+		vrLoc = 823;
+	};
+	E1BF4B8E048872D400C20906 = {
+		fRef = E1BF4A570487CA5300C20906;
+		isa = PBXTextBookmark;
+		name = "German: 30";
+		rLen = 0;
+		rLoc = 747;
+		rType = 0;
+		vrLen = 1458;
+		vrLoc = 0;
+	};
+	E1BF4B8F048872D400C20906 = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 24";
+		rLen = 0;
+		rLoc = 910;
+		rType = 0;
+		vrLen = 1497;
+		vrLoc = 0;
+	};
+	E1BF4B90048872D400C20906 = {
 		fRef = E182C8F603DE817F00050002;
 		isa = PBXTextBookmark;
-		name = "ICeCoffEEShared.m: __OBJC__";
-		rLen = 0;
-		rLoc = 192;
+		name = "ICeCoffEEShared.m: 11";
+		rLen = 0;
+		rLoc = 211;
 		rType = 0;
 		vrLen = 1587;
 		vrLoc = 0;
 	};
-	E1BF4B7F048872D400C20906 = {
-		fRef = E135625E03DC9FC200050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEShared.h: ICCF_WEBKIT";
-		rLen = 0;
-		rLoc = 305;
-		rType = 0;
-		vrLen = 1340;
-		vrLoc = 43;
-	};
-	E1BF4B80048872D400C20906 = {
-		fRef = E182C8F603DE817F00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEShared.m: __OBJC__";
-		rLen = 0;
-		rLoc = 192;
-		rType = 0;
-		vrLen = 1587;
-		vrLoc = 0;
-	};
-	E1BF4B81048872D400C20906 = {
-		fRef = E169DBA703E4F6A400050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEConfig.h: 57";
-		rLen = 18;
-		rLoc = 1876;
-		rType = 0;
-		vrLen = 1672;
-		vrLoc = 291;
-	};
-	E1BF4B82048872D400C20906 = {
-		fRef = E14343B403DB4CF200050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEE.m: ICCF_EventIsCommandMouseDown";
-		rLen = 33;
-		rLoc = 1921;
-		rType = 0;
-		vrLen = 1603;
-		vrLoc = 544;
-	};
-	E1BF4B83048872D400C20906 = {
+	E1BF4B91048872D400C20906 = {
 		fRef = F9A6986E03BE1DF000AA4DA5;
 		isa = PBXTextBookmark;
@@ -6852,144 +8301,4 @@
 		vrLoc = 1025;
 	};
-	E1BF4B84048872D400C20906 = {
-		fRef = E14343B403DB4CF200050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEE.m: ICCF_GetHint";
-		rLen = 0;
-		rLoc = 5492;
-		rType = 0;
-		vrLen = 1415;
-		vrLoc = 4222;
-	};
-	E1BF4B85048872D400C20906 = {
-		fRef = E1CBC99803E7602700050002;
-		isa = PBXTextBookmark;
-		name = "English: 46";
-		rLen = 21;
-		rLoc = 1187;
-		rType = 0;
-		vrLen = 1873;
-		vrLoc = 896;
-	};
-	E1BF4B86048872D400C20906 = {
-		fRef = E1F6E3AC040BCC5700050002;
-		isa = PBXTextBookmark;
-		name = "Japanese: 46";
-		rLen = 0;
-		rLoc = 1195;
-		rType = 0;
-		vrLen = 1417;
-		vrLoc = 646;
-	};
-	E1BF4B87048872D400C20906 = {
-		fRef = E1BF4A570487CA5300C20906;
-		isa = PBXTextBookmark;
-		name = "German: 65";
-		rLen = 0;
-		rLoc = 2071;
-		rType = 0;
-		vrLen = 2372;
-		vrLoc = 1662;
-	};
-	E1BF4B88048872D400C20906 = {
-		fRef = F56276C20379923401AA4DA5;
-		isa = PBXTextBookmark;
-		name = "English: 14";
-		rLen = 0;
-		rLoc = 522;
-		rType = 0;
-		vrLen = 1497;
-		vrLoc = 0;
-	};
-	E1BF4B89048872D400C20906 = {
-		fRef = E14343B403DB4CF200050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEE.m: ICCF_HandleException";
-		rLen = 0;
-		rLoc = 10870;
-		rType = 0;
-		vrLen = 1798;
-		vrLoc = 9857;
-	};
-	E1BF4B8A048872D400C20906 = {
-		fRef = E165AB3603E7A7FC00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEAction.c: urlString";
-		rLen = 0;
-		rLoc = 678;
-		rType = 0;
-		vrLen = 1764;
-		vrLoc = 0;
-	};
-	E1BF4B8B048872D400C20906 = {
-		fRef = E169DBA103E4EF5E00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEETextEdit.c: ICCF_LaunchURLFromTEClick";
-		rLen = 0;
-		rLoc = 5618;
-		rType = 0;
-		vrLen = 2981;
-		vrLoc = 2866;
-	};
-	E1BF4B8C048872D400C20906 = {
-		fRef = E1CBC99803E7602700050002;
-		isa = PBXTextBookmark;
-		name = "English: 46";
-		rLen = 0;
-		rLoc = 1302;
-		rType = 0;
-		vrLen = 1873;
-		vrLoc = 896;
-	};
-	E1BF4B8D048872D400C20906 = {
-		fRef = E1F6E3AC040BCC5700050002;
-		isa = PBXTextBookmark;
-		name = "Japanese: 46";
-		rLen = 0;
-		rLoc = 1195;
-		rType = 0;
-		vrLen = 1500;
-		vrLoc = 823;
-	};
-	E1BF4B8E048872D400C20906 = {
-		fRef = E1BF4A570487CA5300C20906;
-		isa = PBXTextBookmark;
-		name = "German: 30";
-		rLen = 0;
-		rLoc = 747;
-		rType = 0;
-		vrLen = 1458;
-		vrLoc = 0;
-	};
-	E1BF4B8F048872D400C20906 = {
-		fRef = F56276C20379923401AA4DA5;
-		isa = PBXTextBookmark;
-		name = "English: 24";
-		rLen = 0;
-		rLoc = 910;
-		rType = 0;
-		vrLen = 1497;
-		vrLoc = 0;
-	};
-	E1BF4B90048872D400C20906 = {
-		fRef = E182C8F603DE817F00050002;
-		isa = PBXTextBookmark;
-		name = "ICeCoffEEShared.m: 11";
-		rLen = 0;
-		rLoc = 211;
-		rType = 0;
-		vrLen = 1587;
-		vrLoc = 0;
-	};
-	E1BF4B91048872D400C20906 = {
-		fRef = F9A6986E03BE1DF000AA4DA5;
-		isa = PBXTextBookmark;
-		name = "APEMain.m: APEBundleMain";
-		rLen = 17;
-		rLoc = 3450;
-		rType = 0;
-		vrLen = 1739;
-		vrLoc = 1025;
-	};
 	E1BF4B92048872D400C20906 = {
 		fRef = E135625E03DC9FC200050002;
@@ -7007,7 +8316,7 @@
 		name = "VERSION: 2";
 		rLen = 0;
-		rLoc = 8;
-		rType = 0;
-		vrLen = 8;
+		rLoc = 5;
+		rType = 0;
+		vrLen = 5;
 		vrLoc = 0;
 	};
@@ -7112,4 +8421,44 @@
 		vrLoc = 2897;
 	};
+	E1D3379F049183A700000A8E = {
+		fRef = E1BF4A4D0487C77C00C20906;
+		isa = PBXTextBookmark;
+		name = "German: 25";
+		rLen = 0;
+		rLoc = 1095;
+		rType = 0;
+		vrLen = 1691;
+		vrLoc = 0;
+	};
+	E1D337A2049183A700000A8E = {
+		fRef = E1BF4A4D0487C77C00C20906;
+		isa = PBXTextBookmark;
+		name = "German: 25";
+		rLen = 0;
+		rLoc = 1095;
+		rType = 0;
+		vrLen = 1691;
+		vrLoc = 0;
+	};
+	E1D337A3049183A700000A8E = {
+		fRef = F9A6986E03BE1DF000AA4DA5;
+		isa = PBXTextBookmark;
+		name = "APEMain.m: 128";
+		rLen = 0;
+		rLoc = 5127;
+		rType = 0;
+		vrLen = 2783;
+		vrLoc = 3809;
+	};
+	E1D337A4049183A700000A8E = {
+		fRef = F56276C20379923401AA4DA5;
+		isa = PBXTextBookmark;
+		name = "English: 122";
+		rLen = 0;
+		rLoc = 8176;
+		rType = 0;
+		vrLen = 2209;
+		vrLoc = 7159;
+	};
 	E1DEF10F03FF95C900050002 = {
 		fRef = E165AB3603E7A7FC00050002;
@@ -7199,5 +8548,5 @@
 		name = "ICeCoffEEConfig.h: 31";
 		rLen = 0;
-		rLoc = 716;
+		rLoc = 798;
 		rType = 0;
 		vrLen = 1672;
@@ -7219,5 +8568,5 @@
 		name = "ICeCoffEETerminal.m: ICCF_LaunchURLFromTerminal";
 		rLen = 0;
-		rLoc = 12377;
+		rLoc = 12316;
 		rType = 0;
 		vrLen = 1846;
@@ -7249,5 +8598,5 @@
 		name = "APEMain.m: 147";
 		rLen = 0;
-		rLoc = 6706;
+		rLoc = 6590;
 		rType = 0;
 		vrLen = 1971;
@@ -7399,5 +8748,5 @@
 		name = "APEMain.m: APEBundleMain";
 		rLen = 0;
-		rLoc = 6398;
+		rLoc = 6282;
 		rType = 0;
 		vrLen = 2224;
@@ -7409,5 +8758,5 @@
 		name = "ICeCoffEE.m: mouseDown:";
 		rLen = 0;
-		rLoc = 19063;
+		rLoc = 19466;
 		rType = 0;
 		vrLen = 1708;
@@ -7419,5 +8768,5 @@
 		name = "ICeCoffEEConfig.h: 59";
 		rLen = 31;
-		rLoc = 2076;
+		rLoc = 2158;
 		rType = 0;
 		vrLen = 1672;
@@ -7489,5 +8838,5 @@
 		name = "APEMain.m: APEBundleMain";
 		rLen = 0;
-		rLoc = 6706;
+		rLoc = 6590;
 		rType = 0;
 		vrLen = 1971;
@@ -7551,5 +8900,5 @@
 		name = "ICeCoffEE.m: 490";
 		rLen = 0;
-		rLoc = 20371;
+		rLoc = 20774;
 		rType = 0;
 		vrLen = 1513;
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE APE.pbproj/project.pbxproj
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE APE.pbproj/project.pbxproj	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE APE.pbproj/project.pbxproj	(revision 142)
@@ -80,4 +80,5 @@
 				E14993A503DE868D00050002,
 				29B97315FDCFA39411CA2CEA,
+				E12FEC3C04959F1C00AEFBF9,
 				E14343AE03DB48F700050002,
 				E1BF159F03DBA81600050002,
@@ -118,4 +119,5 @@
 				E1BF15BF03DBBE8900050002,
 				29B97318FDCFA39411CA2CEA,
+				E12FEC6104959FB800AEFBF9,
 				089C165CFE840E0CC02AAC07,
 				E1CBC99A03E7603400050002,
@@ -214,4 +216,156 @@
 		E12C91C704849FDD001C25E0 = {
 			fileRef = E1BF166D03DBE27000050002;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC3C04959F1C00AEFBF9 = {
+			children = (
+				E12FEC3E04959F5A00AEFBF9,
+				E12FEC3D04959F5A00AEFBF9,
+				E12FEC4204959F5A00AEFBF9,
+				E12FEC4104959F5A00AEFBF9,
+				E12FEC4004959F5A00AEFBF9,
+				E12FEC3F04959F5A00AEFBF9,
+				E12FEC4404959F5A00AEFBF9,
+				E12FEC4304959F5A00AEFBF9,
+				E12FEC4504959F5A00AEFBF9,
+			);
+			isa = PBXGroup;
+			name = "Select Services sources";
+			path = "";
+			refType = 4;
+		};
+		E12FEC3D04959F5A00AEFBF9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = ICeCoffEEServicePrefController.m;
+			refType = 4;
+		};
+		E12FEC3E04959F5A00AEFBF9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = ICeCoffEEServicePrefController.h;
+			refType = 4;
+		};
+		E12FEC3F04959F5A00AEFBF9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = ICeCoffEENonHighlightingTextFieldCell.m;
+			refType = 4;
+		};
+		E12FEC4004959F5A00AEFBF9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = ICeCoffEENonHighlightingTextFieldCell.h;
+			refType = 4;
+		};
+		E12FEC4104959F5A00AEFBF9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = ICeCoffEENonHighlightingOutlineView.m;
+			refType = 4;
+		};
+		E12FEC4204959F5A00AEFBF9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = ICeCoffEENonHighlightingOutlineView.h;
+			refType = 4;
+		};
+		E12FEC4304959F5A00AEFBF9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = ICeCoffEENonHighlightingButtonCell.m;
+			refType = 4;
+		};
+		E12FEC4404959F5A00AEFBF9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = ICeCoffEENonHighlightingButtonCell.h;
+			refType = 4;
+		};
+		E12FEC4504959F5A00AEFBF9 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = ICeCoffEEKeyEquivalents.m;
+			refType = 4;
+		};
+		E12FEC5704959F7600AEFBF9 = {
+			fileRef = E12FEC3E04959F5A00AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC5804959F7600AEFBF9 = {
+			fileRef = E12FEC3D04959F5A00AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC5904959F7700AEFBF9 = {
+			fileRef = E12FEC4204959F5A00AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC5A04959F7700AEFBF9 = {
+			fileRef = E12FEC4104959F5A00AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC5B04959F7800AEFBF9 = {
+			fileRef = E12FEC4004959F5A00AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC5C04959F7800AEFBF9 = {
+			fileRef = E12FEC3F04959F5A00AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC5D04959F7900AEFBF9 = {
+			fileRef = E12FEC4404959F5A00AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC5E04959F7900AEFBF9 = {
+			fileRef = E12FEC4304959F5A00AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC5F04959F7A00AEFBF9 = {
+			fileRef = E12FEC4504959F5A00AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC6104959FB800AEFBF9 = {
+			children = (
+				E12FEC6204959FB800AEFBF9,
+			);
+			isa = PBXVariantGroup;
+			name = "Select services.nib";
+			path = "";
+			refType = 4;
+		};
+		E12FEC6204959FB800AEFBF9 = {
+			isa = PBXFileReference;
+			name = "Select services.nib";
+			path = "English.lproj/Select services.nib";
+			refType = 4;
+		};
+		E12FEC6304959FB800AEFBF9 = {
+			fileRef = E12FEC6104959FB800AEFBF9;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E12FEC640495A88500AEFBF9 = {
+			fileRef = E169DCAB03E4FF7A00050002;
 			isa = PBXBuildFile;
 			settings = {
@@ -1115,4 +1269,8 @@
 				F9A6987203BE1DFF00AA4DA5,
 				E14993B803DE872B00050002,
+				E12FEC5704959F7600AEFBF9,
+				E12FEC5904959F7700AEFBF9,
+				E12FEC5B04959F7800AEFBF9,
+				E12FEC5D04959F7900AEFBF9,
 			);
 			isa = PBXHeadersBuildPhase;
@@ -1123,4 +1281,5 @@
 			files = (
 				F57E31A703795CCF01AA4DA5,
+				E12FEC6304959FB800AEFBF9,
 			);
 			isa = PBXResourcesBuildPhase;
@@ -1133,4 +1292,9 @@
 				F9A6987303BE1DFF00AA4DA5,
 				E182C8FA03DE817F00050002,
+				E12FEC5804959F7600AEFBF9,
+				E12FEC5A04959F7700AEFBF9,
+				E12FEC5C04959F7800AEFBF9,
+				E12FEC5E04959F7900AEFBF9,
+				E12FEC5F04959F7A00AEFBF9,
 			);
 			isa = PBXSourcesBuildPhase;
@@ -1142,4 +1306,5 @@
 				F57E31A903795F0801AA4DA5,
 				F512509E038BEF1501AA4DA5,
+				E12FEC640495A88500AEFBF9,
 			);
 			isa = PBXFrameworksBuildPhase;
@@ -1359,5 +1524,5 @@
 	</dict>
 	<key>APEVersionRequired</key>
-	<string>1.2.1</string>
+	<string>1.3</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
@@ -1381,5 +1546,5 @@
 	<string>ICCF</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.3</string>
+	<string>1.4a1</string>
 </dict>
 </plist>
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m	(revision 142)
@@ -421,14 +421,19 @@
 
 // returns YES if menu contains useful items, NO otherwise
-BOOL ICCF_ConsolidateServicesMenu(NSMenu *menu) {
+BOOL ICCF_ConsolidateServicesMenu(NSMenu *menu, NSDictionary *serviceOptions) {
     [menu update]; // doesn't propagate to submenus, so we need to do this first
     NSEnumerator *enumerator = [[menu itemArray] objectEnumerator];
     NSMenuItem *menuItem;
     NSMenu *submenu;
+    NSDictionary *itemOptions = nil;
     BOOL shouldKeepItem = NO, shouldKeepMenu = NO;
 
     while ( (menuItem = [enumerator nextObject]) != nil) {
-        if ( (submenu = [menuItem submenu]) != nil) {
-            shouldKeepItem = ICCF_ConsolidateServicesMenu(submenu);
+        if (serviceOptions != nil)
+            itemOptions = [serviceOptions objectForKey: [menuItem title]];
+        if ([[itemOptions objectForKey: (NSString *)kICServiceHidden] boolValue]) {
+            shouldKeepItem = NO;
+        } else if ( (submenu = [menuItem submenu]) != nil) {
+            shouldKeepItem = ICCF_ConsolidateServicesMenu(submenu, [itemOptions objectForKey: (NSString *)kICServiceSubmenu]);
             if (shouldKeepItem && [submenu numberOfItems] == 1) { // consolidate
                 NSMenuItem *serviceItem = [[submenu itemAtIndex: 0] retain];
@@ -457,5 +462,5 @@
 NSMenuItem *ICCF_ContextualServicesMenuItem() {
     NSMenuItem *servicesItem = ICCF_ServicesMenuItem();
-    if (ICCF_ConsolidateServicesMenu([servicesItem submenu]))
+    if (ICCF_ConsolidateServicesMenu([servicesItem submenu], (NSDictionary *)ICCF_prefs.serviceOptions))
         return servicesItem;
     else
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEConfig.h
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEConfig.h	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEConfig.h	(revision 142)
@@ -26,4 +26,6 @@
     Boolean servicesInContextualMenu;
     Boolean servicesInMenuBar;
+    CFDictionaryRef serviceOptions;
+    Boolean terminalRequireOptionForSelfDrag;
     Boolean errorSoundEnabled;
     Boolean errorDialogEnabled;
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEController.h
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEController.h	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEController.h	(revision 142)
@@ -17,4 +17,6 @@
     IBOutlet NSButton *servicesInContextualMenu;
     IBOutlet NSButton *servicesInMenuBar;
+    IBOutlet NSButton *editContextualServices;
+    IBOutlet NSButton *terminalRequireOptionForSelfDrag;
     IBOutlet NSButton *errorSoundEnabled;
     IBOutlet NSButton *errorDialogEnabled;
@@ -30,4 +32,6 @@
 - (IBAction)servicesInContextualMenu:(NSButton *)sender;
 - (IBAction)servicesInMenuBar:(NSButton *)sender;
+- (IBAction)editContextualServices:(NSButton *)sender;
+- (IBAction)terminalRequireOptionForSelfDrag:(NSButton *)sender;
 - (IBAction)errorSoundEnabled:(NSButton *)sender;
 - (IBAction)errorDialogEnabled:(NSButton *)sender;
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEController.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEController.m	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEController.m	(revision 142)
@@ -14,4 +14,5 @@
 #import "ICeCoffEEController.h"
 #import "ICeCoffEEShared.h"
+#import "ICeCoffEEServicePrefController.h"
 
 // Just a handy macro for localized strings from our bundle; unused in this project.
@@ -25,5 +26,5 @@
 + (id)prefPaneHandlerForAPE:(NSBundle*)apeBundle andBundle:(NSBundle*)prefPaneBundle
 {
-    return [[self alloc] initWithAPE:apeBundle andBundle:prefPaneBundle];
+    return [[self alloc] initWithAPE: apeBundle andBundle: prefPaneBundle];
 }
 
@@ -31,7 +32,7 @@
 - (id)initWithAPE:(NSBundle*)apeBundle andBundle:(NSBundle*)prefPaneBundle
 {
-    [self setAPEBundle:apeBundle prefPaneBundle:prefPaneBundle];
+    [self setAPEBundle: apeBundle prefPaneBundle: prefPaneBundle];
     
-    [NSBundle loadNibNamed:@"APE Manager plugin" owner:self];	// load our nib file; it will call our awakeFromNib method
+    [NSBundle loadNibNamed:@"APE Manager plugin" owner:self]; // load our nib file; it will call our awakeFromNib method
     
     return self;
@@ -144,4 +145,13 @@
     [self prefsChanged];
 }
+- (IBAction)editContextualServices:(NSButton *)sender;
+{
+    [[ICeCoffEEServicePrefController alloc] performSelector: @selector(initWithParentWindow:) withObject: [NSApp mainWindow] afterDelay: 0.01];
+}
+- (IBAction)terminalRequireOptionForSelfDrag:(NSButton *)sender;
+{
+    [prefs setBool: [terminalRequireOptionForSelfDrag state] forKey: ICP(TerminalRequireOptionForSelfDrag)];
+    [self prefsChanged];
+}
 - (IBAction)errorSoundEnabled:(NSButton *)sender;
 {
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m	(revision 142)
@@ -0,0 +1,131 @@
+//
+//  ICeCoffEEKeyEquivalents.m
+//  ICeCoffEE APE
+//
+//  Created by Nicholas Riley on Mon Jun 9 2003.
+//  Copyright (c) 2002 Nicholas Riley. All rights reserved.
+//
+
+// Original implementations of these functions are in NSString-NJRExtensions
+// and NSFont-NJRExtensions from Pester.
+
+#import <Carbon/Carbon.h>
+#import <AppKit/AppKit.h>
+
+static NSFont *themeFont(ThemeFontID fontID) {
+    NSFont *themeFont = nil;
+    Str255 pstrFontName;
+    SInt16 fontSize = 0;
+    OSStatus status;
+    // can't simulate algorithmic styles in Cocoa in any case, so here's hoping nothing will be passed back - XXX guess this should at least accommodate the bold system font, but we don't need it
+    status = GetThemeFont(fontID, smSystemScript, pstrFontName, &fontSize, NULL);
+
+    if (status == noErr) {
+        NSString *fontName = (NSString *)CFStringCreateWithPascalString(NULL, pstrFontName, CFStringGetSystemEncoding());
+        themeFont = [NSFont fontWithName: fontName size: fontSize];
+        [fontName release];
+    }
+    if (themeFont == nil) {
+        themeFont = [NSFont systemFontOfSize: fontSize == 0 ? [NSFont systemFontSize] : fontSize];
+    }
+    return themeFont;
+}
+
+static NSString *stringWithCharacter(unichar character) {
+    return [NSString stringWithCharacters: &character length: 1];
+}
+
+static unichar combiningHelpChar[] = {0x003F, 0x20DD};
+
+static NSFont *menuItemCmdKeyFont = nil;
+static NSFont *menuItemFont = nil;
+static NSParagraphStyle *keyEquivParaStyle;
+
+static inline void initialize() {
+    if (menuItemCmdKeyFont != nil) return;
+
+    menuItemCmdKeyFont = [themeFont(kThemeMenuItemCmdKeyFont) retain];
+    menuItemFont = [themeFont(kThemeMenuItemFont) retain];
+
+    NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
+    [paraStyle setTabStops: [NSArray arrayWithObjects:
+        [[[NSTextTab alloc] initWithType: NSRightTabStopType location: 30] autorelease],
+        [[[NSTextTab alloc] initWithType: NSLeftTabStopType location: 30.01] autorelease],
+        nil]];
+    [paraStyle setLineBreakMode: NSLineBreakByClipping];
+    keyEquivParaStyle = [paraStyle copy];
+    [paraStyle release];
+}
+
+// set tabs here, for ICeCoffEE (not in Pester)
+static NSAttributedString *attributedStringWithFont(NSString *self, NSFont *font) {
+    return [[[NSAttributedString alloc] initWithString: self attributes: [NSDictionary dictionaryWithObjectsAndKeys: font, NSFontAttributeName, keyEquivParaStyle, NSParagraphStyleAttributeName, nil]] autorelease];
+}
+
+static NSString *keyEquivalentString(NSString *self) {
+    if ([self length] != 0) {
+        const char *str = [self UTF8String];
+        unichar keyChar;
+        if (str[1] != '\0') {
+            keyChar = [self characterAtIndex: 0];
+            switch (keyChar) {
+                case NSUpArrowFunctionKey: keyChar = 0x21E1; break;
+                case NSDownArrowFunctionKey: keyChar = 0x21E3; break;
+                case NSLeftArrowFunctionKey: keyChar = 0x21E0; break;
+                case NSRightArrowFunctionKey: keyChar = 0x21E2; break;
+                case NSInsertFunctionKey:
+                    return [NSString stringWithCharacters: combiningHelpChar length: 2];
+                case NSDeleteFunctionKey: keyChar = 0x2326; break;
+                case NSHomeFunctionKey: keyChar = 0x2196; break;
+                case NSEndFunctionKey: keyChar = 0x2198; break;
+                case NSPageUpFunctionKey: keyChar = 0x21DE; break;
+                case NSPageDownFunctionKey: keyChar = 0x21DF; break;
+                case NSClearLineFunctionKey: keyChar = 0x2327; break;
+                default:
+                    if (keyChar >= NSF1FunctionKey && keyChar <= NSF35FunctionKey) {
+                        return [NSString stringWithFormat: @"F%u", keyChar - NSF1FunctionKey + 1];
+                    }
+                    return [NSString stringWithFormat: @"[unknown %lX]", keyChar];
+            }
+        } else if (str[0] >= 'A' && str[0] <= 'Z') {
+            return self;
+        } else if (str[0] >= 'a' && str[0] <= 'z') return [self uppercaseString];
+        else switch (str[0]) {
+            case '\t': keyChar = 0x21e5; break;
+            case '\r': keyChar = 0x21a9; break;
+            case '\e': keyChar = 0x238b; break;
+            case ' ': keyChar = 0x2423; break;
+            case 0x7f: keyChar = 0x232b; break; // delete
+            case 0x03: keyChar = 0x2324; break; // enter
+            case 0x19: keyChar = 0x21e4; break; // backtab
+            case 0: return @"";
+                // case '': keyChar = 0x; break;
+            default: return self; // return [NSString stringWithFormat: @"[huh? %x]", (int)str[0]];
+        }
+            return stringWithCharacter(keyChar);
+    }
+    return self;
+}
+
+NSAttributedString *ICCF_KeyEquivalentAttributedStringWithModifierFlags(NSString *self, unsigned int modifierFlags) {
+    initialize();
+    NSString *keyEquivalentStringNoMask = keyEquivalentString(self);
+    // use tabs here, for ICeCoffEE (not in Pester, at least without better subclassing)
+    NSAttributedString *keyEquivalentAttributedString =
+        attributedStringWithFont(
+          [NSString stringWithFormat: @"\t%@%@%@%@\t%@",
+            (modifierFlags & NSControlKeyMask) ? stringWithCharacter(kControlUnicode) : @"",
+            (modifierFlags & NSAlternateKeyMask) ? stringWithCharacter(kOptionUnicode) : @"",
+            (modifierFlags & NSShiftKeyMask) ? stringWithCharacter(kShiftUnicode) : @"",
+            (modifierFlags & NSCommandKeyMask) ? stringWithCharacter(kCommandUnicode) : @"",
+            keyEquivalentStringNoMask], menuItemCmdKeyFont);
+    unsigned noMaskLength = [keyEquivalentStringNoMask length];
+    if (noMaskLength > 3 || // Fxx
+        (noMaskLength == 1 && [keyEquivalentStringNoMask characterAtIndex: 0] <= 0x7F)) {
+        NSMutableAttributedString *astr = [keyEquivalentAttributedString mutableCopy];
+        [astr setAttributes: [NSDictionary dictionaryWithObject: menuItemFont forKey: NSFontAttributeName] range: NSMakeRange([astr length] - noMaskLength, noMaskLength)];
+        keyEquivalentAttributedString = [[astr copy] autorelease];
+        [astr release];
+    }
+    return keyEquivalentAttributedString;
+}
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingButtonCell.h
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingButtonCell.h	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingButtonCell.h	(revision 142)
@@ -0,0 +1,16 @@
+//
+//  ICeCoffEENonHighlightingButtonCell.h
+//  ICeCoffEE APE
+//
+//  Created by Nicholas Riley on Fri Jun 06 2003.
+//  Copyright (c) 2003 Nicholas Riley. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+
+
+@interface ICeCoffEENonHighlightingButtonCell : NSButtonCell {
+
+}
+
+@end
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingButtonCell.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingButtonCell.m	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingButtonCell.m	(revision 142)
@@ -0,0 +1,31 @@
+//
+//  ICeCoffEENonHighlightingButtonCell.m
+//  ICeCoffEE APE
+//
+//  Created by Nicholas Riley on Fri Jun 06 2003.
+//  Copyright (c) 2003 Nicholas Riley. All rights reserved.
+//
+
+#import "ICeCoffEENonHighlightingButtonCell.h"
+
+
+@implementation ICeCoffEENonHighlightingButtonCell
+
+- (NSColor *)highlightColorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+    return [NSColor whiteColor];
+}
+
+- (NSCellStateValue)nextState;
+{
+    switch ([self intValue]) {
+        case NSOnState:
+        case NSMixedState:
+            return NSOffState;
+        case NSOffState:
+            return NSOnState;
+    }
+    return NSMixedState;
+}
+
+@end
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingOutlineView.h
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingOutlineView.h	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingOutlineView.h	(revision 142)
@@ -0,0 +1,16 @@
+//
+//  ICeCoffEENonHighlightingOutlineView.h
+//  ICeCoffEE APE
+//
+//  Created by Nicholas Riley on Fri Jun 06 2003.
+//  Copyright (c) 2003 Nicholas Riley. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+
+
+@interface ICeCoffEENonHighlightingOutlineView : NSOutlineView {
+
+}
+
+@end
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingOutlineView.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingOutlineView.m	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingOutlineView.m	(revision 142)
@@ -0,0 +1,19 @@
+//
+//  ICeCoffEENonHighlightingOutlineView.m
+//  ICeCoffEE APE
+//
+//  Created by Nicholas Riley on Fri Jun 06 2003.
+//  Copyright (c) 2003 Nicholas Riley. All rights reserved.
+//
+
+#import "ICeCoffEENonHighlightingOutlineView.h"
+
+
+@implementation ICeCoffEENonHighlightingOutlineView
+
+- (void)highlightSelectionInClipRect:(NSRect)rect;
+{
+
+}
+
+@end
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingTextFieldCell.h
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingTextFieldCell.h	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingTextFieldCell.h	(revision 142)
@@ -0,0 +1,16 @@
+//
+//  ICeCoffEENonHighlightingTextFieldCell.h
+//  ICeCoffEE APE
+//
+//  Created by Nicholas Riley on Fri Jun 06 2003.
+//  Copyright (c) 2003 Nicholas Riley. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+
+
+@interface ICeCoffEENonHighlightingTextFieldCell : NSTextFieldCell {
+
+}
+
+@end
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingTextFieldCell.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingTextFieldCell.m	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEENonHighlightingTextFieldCell.m	(revision 142)
@@ -0,0 +1,19 @@
+//
+//  ICeCoffEENonHighlightingTextFieldCell.m
+//  ICeCoffEE APE
+//
+//  Created by Nicholas Riley on Fri Jun 06 2003.
+//  Copyright (c) 2003 Nicholas Riley. All rights reserved.
+//
+
+#import "ICeCoffEENonHighlightingTextFieldCell.h"
+
+
+@implementation ICeCoffEENonHighlightingTextFieldCell
+
+- (NSColor *)highlightColorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+    return [NSColor whiteColor];
+}
+
+@end
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.h
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.h	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.h	(revision 142)
@@ -0,0 +1,25 @@
+//
+//  ICeCoffEEServicePrefController.h
+//  ICeCoffEE APE
+//
+//  Created by Nicholas Riley on Fri Jun 06 2003.
+//  Copyright (c) 2003 Nicholas Riley. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+
+
+@interface ICeCoffEEServicePrefController : NSWindowController {
+    IBOutlet NSOutlineView *serviceOutline;
+    NSMenu *servicesMenu;
+}
+
+- (id)initWithParentWindow:(NSWindow *)parent;
+
+- (IBAction)showAll:(NSButton *)sender;
+- (IBAction)hideAll:(NSButton *)sender;
+
+- (IBAction)cancel:(NSButton *)sender;
+- (IBAction)saveChanges:(NSButton *)sender;
+
+@end
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.m	(revision 142)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.m	(revision 142)
@@ -0,0 +1,326 @@
+//
+//  ICeCoffEEServicePrefController.m
+//  ICeCoffEE APE
+//
+//  Created by Nicholas Riley on Fri Jun 06 2003.
+//  Copyright (c) 2003 Nicholas Riley. All rights reserved.
+//
+
+#import "ICeCoffEEShared.h"
+#import "ICeCoffEEServicePrefController.h"
+#import "ICeCoffEENonHighlightingButtonCell.h"
+#import "ICeCoffEENonHighlightingTextFieldCell.h"
+#import <objc/objc.h>
+#import <ApplicationEnhancer/ApplicationEnhancer.h>
+
+static NSNumber *ICCF_SERVICE_SHOWN, *ICCF_SERVICE_HIDDEN, *ICCF_SERVICE_MIXED;
+static NSDictionary *ICCF_SERVICE_OPTION_HIDDEN;
+
+static float ICCF_TableViewCellHeight(NSTableView *tableView) {
+    return ([tableView rowHeight] + [tableView intercellSpacing].height);
+}
+
+static inline NSCellStateValue ICCF_ServiceItemState(NSMenuItem *item) {
+    id state = [item representedObject];
+    return (state == nil) ? NSOnState : [state intValue];
+}
+
+static void ICCF_PropagateServiceStateChange(NSMenu *menu, id state) {
+    NSEnumerator *e = [[menu itemArray] objectEnumerator];
+    NSMenuItem *item;
+    NSMenu *submenu;
+
+    while ( (item = [e nextObject]) != nil) {
+        submenu = [item submenu];
+        if (submenu != nil) {
+            ICCF_PropagateServiceStateChange(submenu, state);
+            [item setRepresentedObject: (state == nil) ? ICCF_SERVICE_SHOWN : state];
+        }
+        [item setRepresentedObject: state];
+    }
+}
+
+static NSCellStateValue ICCF_PropagateServiceState(NSMenuItem *item, NSMenuItem *changedItem) {
+    NSMenu *submenu = [item submenu];
+    if (submenu == nil) return ICCF_ServiceItemState(item);
+
+    if (item == changedItem) ICCF_PropagateServiceStateChange(submenu, [item representedObject]);
+
+    BOOL areOn = NO, areOff = NO;
+    NSEnumerator *e = [[submenu itemArray] objectEnumerator];
+    NSMenuItem *subItem;
+    while ( (subItem = [e nextObject]) != nil) {
+        switch (ICCF_PropagateServiceState(subItem, changedItem)) {
+            case NSOnState: if (!areOff) { areOn = YES; continue; }
+                break;
+            case NSOffState: if (!areOn) { areOff = YES; continue; }
+                break;
+            case NSMixedState:
+                break;
+        }
+        [item setRepresentedObject: ICCF_SERVICE_MIXED];
+        return NSMixedState;
+    }
+    if (areOn) {
+        [item setRepresentedObject: ICCF_SERVICE_SHOWN];
+        return NSOnState;
+    } else {
+        [item setRepresentedObject: ICCF_SERVICE_HIDDEN];
+        return NSOffState;
+    }
+}
+
+static NSMutableDictionary *ICCF_RetainedServiceOptionsDictionary(NSMenu *menu) {
+    NSEnumerator *e = [[menu itemArray] objectEnumerator];
+    NSMenuItem *item;
+    NSMenu *submenu;
+    NSMutableDictionary *dict = nil, *subDict = nil, *submenuDict = nil;
+
+    while ( (item = [e nextObject]) != nil) {
+        submenu = [item submenu];
+        if (ICCF_ServiceItemState(item) == NSOffState) {
+            subDict = [ICCF_SERVICE_OPTION_HIDDEN retain];
+        } else if (submenu != nil) {
+            submenuDict = ICCF_RetainedServiceOptionsDictionary(submenu);
+            if (submenuDict == nil)
+                continue;
+            subDict = [[NSDictionary alloc] initWithObjectsAndKeys: submenuDict, kICServiceSubmenu, nil];
+            [submenuDict release];
+        } else continue;
+        if (dict == nil) {
+            dict = [[NSMutableDictionary alloc] init];
+        }
+        [dict setObject: subDict forKey: [item title]];
+        [subDict release];
+    }
+    return dict;
+}
+
+static void ICCF_RestoreServiceOptionsDictionary(NSMenu *menu, NSDictionary *dict) {
+    NSEnumerator *e = [dict keyEnumerator];
+    NSString *itemTitle;
+    NSDictionary *subDict, *submenuDict;
+    NSMenuItem *item;
+    NSMenu *submenu;
+
+    // XXX handle exceptions
+    while ( (itemTitle = [e nextObject]) != nil) {
+        item = [menu itemWithTitle: itemTitle];
+        if (item == nil) continue;
+        subDict = [dict objectForKey: itemTitle];
+        if ([[subDict objectForKey: (NSString *)kICServiceHidden] boolValue]) {
+            [item setRepresentedObject: ICCF_SERVICE_HIDDEN];
+        }
+        if ( (submenu = [item submenu]) != nil) {
+            submenuDict = [subDict objectForKey: (NSString *)kICServiceSubmenu];
+            if ([submenuDict count] == 0)
+                ICCF_PropagateServiceStateChange(submenu, ICCF_SERVICE_HIDDEN);
+            else
+                ICCF_RestoreServiceOptionsDictionary(submenu, submenuDict);
+        }
+    }
+}
+
+@implementation ICeCoffEEServicePrefController
+
+#pragma mark class initialization
+
++ (void)initialize;
+{
+    ICCF_SERVICE_SHOWN = [[NSNumber alloc] initWithInt: NSOnState];
+    ICCF_SERVICE_HIDDEN = [[NSNumber alloc] initWithInt: NSOffState];
+    ICCF_SERVICE_MIXED = [[NSNumber alloc] initWithInt: NSMixedState];
+    ICCF_SERVICE_OPTION_HIDDEN = [[NSDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithBool: YES], kICServiceHidden, nil];
+}
+
+#pragma mark initialize-release
+
+- (id)initWithParentWindow:(NSWindow *)parent;
+{
+    if ( (self = [self initWithWindowNibName: @"Select services"])) {
+        NSWindow *window = [self window]; // connect outlets
+        NSButtonCell *checkBoxCell = [[ICeCoffEENonHighlightingButtonCell alloc] init];
+        [checkBoxCell setButtonType: NSSwitchButton];
+        [checkBoxCell setImagePosition: NSImageOnly];
+        [checkBoxCell setAllowsMixedState: YES];
+        [[serviceOutline tableColumnWithIdentifier: @"show"] setDataCell: checkBoxCell];
+        [checkBoxCell release];
+
+        NSTextFieldCell *textFieldCell = [[serviceOutline tableColumnWithIdentifier: @"service"] dataCell];
+        ((struct objc_object *)textFieldCell)->isa = [ICeCoffEENonHighlightingTextFieldCell class];
+
+        textFieldCell = [[serviceOutline tableColumnWithIdentifier: @"key"] dataCell];
+        ((struct objc_object *)textFieldCell)->isa = [ICeCoffEENonHighlightingTextFieldCell class];
+
+        [window setResizeIncrements: NSMakeSize(1, ICCF_TableViewCellHeight(serviceOutline))];
+        if (parent != nil) {
+            [NSApp beginSheet: window modalForWindow: parent modalDelegate: self didEndSelector: nil contextInfo: nil];
+        } else {
+            [window center];
+            [window makeKeyAndOrderFront: nil];
+        }
+    }
+    return self;
+}
+
+- (void)dealloc;
+{
+    [servicesMenu release];
+    [super dealloc];
+}
+
+#pragma mark actions
+
+- (IBAction)showAll:(NSButton *)sender;
+{
+    ICCF_PropagateServiceStateChange(servicesMenu, nil);
+    [serviceOutline reloadData];
+}
+
+- (IBAction)hideAll:(NSButton *)sender;
+{
+    ICCF_PropagateServiceStateChange(servicesMenu, ICCF_SERVICE_HIDDEN);
+    [serviceOutline reloadData];
+}
+
+- (void)closeWithReturnCode:(int)returnCode;
+{
+    if ([[self window] isSheet]) {
+        [NSApp endSheet: [self window] returnCode: NSRunAbortedResponse];
+    }
+    [self close];
+}
+
+- (IBAction)cancel:(NSButton *)sender;
+{
+    [self closeWithReturnCode: NSRunAbortedResponse];
+}
+
+- (IBAction)saveChanges:(NSButton *)sender;
+{
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSMutableDictionary *icDefaults = [[defaults persistentDomainForName: (NSString *)kICBundleIdentifier] mutableCopy];
+    NSDictionary *serviceOptions = ICCF_RetainedServiceOptionsDictionary(servicesMenu);
+    if (serviceOptions != nil) {
+        [icDefaults setObject: serviceOptions forKey: (NSString *)kICServiceOptions];
+        [serviceOptions release];
+    } else {
+        [icDefaults removeObjectForKey: (NSString *)kICServiceOptions];
+    }
+    [defaults setPersistentDomain: icDefaults forName: (NSString *)kICBundleIdentifier];
+    [defaults synchronize];
+    APEMessageBroadcast(kICBundleIdentifier, kICPreferencesChanged, NULL);
+    [icDefaults release];
+    [self closeWithReturnCode: NSRunStoppedResponse];
+}
+
+@end
+
+@implementation ICeCoffEEServicePrefController (NSOutlineViewDataSource)
+
+- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item;
+{
+    if (servicesMenu == nil) {
+        servicesMenu = [[NSMenu alloc] initWithTitle: @""];
+        [[NSApplication sharedApplication] setServicesMenu: servicesMenu];
+        [servicesMenu update];
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        NSDictionary *icDefaults = [defaults persistentDomainForName: (NSString *)kICBundleIdentifier];
+        NSDictionary *serviceOptions = [icDefaults objectForKey: (NSString *)kICServiceOptions];
+        ICCF_RestoreServiceOptionsDictionary(servicesMenu, serviceOptions);
+    }
+    return [(item == nil ? servicesMenu : [item submenu]) numberOfItems];
+}
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item;
+{
+    return (item == nil ? YES : [item submenu] != nil);
+}
+
+- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item;
+{
+    return [(item == nil ? servicesMenu : [item submenu]) itemAtIndex: index];
+}
+
+NSAttributedString *ICCF_KeyEquivalentAttributedStringWithModifierFlags(NSString *self, unsigned int modifierFlags);
+
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
+{
+    if ([[tableColumn identifier] isEqualToString: @"service"]) {
+        return [item title];
+    } else if ([[tableColumn identifier] isEqualToString: @"show"]) {
+        id state = [item representedObject];
+        if ([item submenu] != nil && state == nil) {
+            return [NSNumber numberWithInt: ICCF_PropagateServiceState(item, nil)];
+        }
+        return (state == nil) ? ICCF_SERVICE_SHOWN : state;
+    } else if ([[tableColumn identifier] isEqualToString: @"key"]) {
+        NSString *equivalent = [item keyEquivalent];
+        if (equivalent == nil || [equivalent length] != 1) return nil;
+        // XXX Inconsistency between Cocoa and Carbon: always command-shift in Carbon, not in Cocoa.  Since we only patch Cocoa for the moment, keep as is.
+        return ICCF_KeyEquivalentAttributedStringWithModifierFlags(equivalent, [item keyEquivalentModifierMask] | ([[NSCharacterSet uppercaseLetterCharacterSet] characterIsMember: [equivalent characterAtIndex: 0]] ? NSShiftKeyMask : 0));
+    }
+    return nil;
+}
+
+- (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
+{
+    if ([[tableColumn identifier] isEqualToString: @"show"]) {
+        [item setRepresentedObject: [object boolValue] ? nil : ICCF_SERVICE_HIDDEN];
+        
+        NSMenu *submenu = [item menu];
+        if (submenu == servicesMenu) {
+            ICCF_PropagateServiceState(item, item);
+        } else {
+            NSMenu *supermenu;
+            while ( (supermenu = [submenu supermenu]) != servicesMenu) {
+                submenu = supermenu;
+            }
+            ICCF_PropagateServiceState([supermenu itemAtIndex: [supermenu indexOfItemWithSubmenu: submenu]], item);
+        }
+        [outlineView reloadData];
+    }
+}
+
+@end
+
+@implementation ICeCoffEEServicePrefController (NSWindowDelegate)
+
+- (NSRect)windowWillUseStandardFrame:(NSWindow *)sender defaultFrame:(NSRect)defaultFrame;
+{
+    NSWindow *window = [serviceOutline window];
+    NSRect frame = [window frame];
+    NSScrollView *scrollView = [serviceOutline enclosingScrollView];
+    float displayedHeight = [[scrollView contentView] bounds].size.height;
+    float heightChange = [[scrollView documentView] bounds].size.height - displayedHeight;
+    float heightExcess;
+
+    if (heightChange >= 0 && heightChange <= 1) {
+        // either the window is already optimal size, or it's too big
+        float rowHeight = ICCF_TableViewCellHeight(serviceOutline);
+        heightChange = (rowHeight * [serviceOutline numberOfRows]) - displayedHeight;
+    }
+
+    frame.size.height += heightChange;
+
+    if ( (heightExcess = [window minSize].height - frame.size.height) > 1 ||
+         (heightExcess = [window maxSize].height - frame.size.height) < 1) {
+        heightChange += heightExcess;
+        frame.size.height += heightExcess;
+    }
+
+    frame.origin.y -= heightChange;
+
+    return frame;
+}
+
+@end
+
+@implementation ICeCoffEEServicePrefController (NSWindowNotifications)
+
+- (void)windowWillClose:(NSNotification *)notification;
+{
+    [self autorelease];
+}
+
+@end
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEShared.h
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEShared.h	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEShared.h	(revision 142)
@@ -39,6 +39,13 @@
 extern const CFStringRef kICServicesInContextualMenu; // CFNumber (Boolean)
 extern const CFStringRef kICServicesInMenuBar; // CFNumber (Boolean)
+extern const CFStringRef kICServiceOptions; // CFDictionary
+extern const CFStringRef kICTerminalRequireOptionForSelfDrag; // CFNumber (Boolean)
 extern const CFStringRef kICErrorSoundEnabled; // CFNumber (Boolean)
 extern const CFStringRef kICErrorDialogEnabled; // CFNumber (Boolean)
+
+// kICServiceOptions dictionary keys
+extern const CFStringRef kICServiceHidden; // CFNumber (Boolean)
+extern const CFStringRef kICServiceShortcut; // reserved for future use
+extern const CFStringRef kICServiceSubmenu; // CFDictionary
 
 // APEBundleMessages
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEShared.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEShared.m	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEShared.m	(revision 142)
@@ -25,6 +25,13 @@
 const CFStringRef kICServicesInContextualMenu = (CFStringRef)@"ICServicesInContextualMenu"; // CFNumber (bool)
 const CFStringRef kICServicesInMenuBar = (CFStringRef)@"ICServicesInMenuBar"; // CFNumber (bool)
+const CFStringRef kICServiceOptions = (CFStringRef)@"ICServiceOptions"; // CFDictionary
+const CFStringRef kICTerminalRequireOptionForSelfDrag = (CFStringRef)@"ICTerminalRequireOptionForSelfDrag"; // CFNumber (Boolean)
 const CFStringRef kICErrorSoundEnabled = (CFStringRef)@"ICErrorSoundEnabled"; // CFNumber (bool)
 const CFStringRef kICErrorDialogEnabled = (CFStringRef)@"ICErrorDialogEnabled"; // CFNumber (bool)
+
+// kICServiceOptions dictionary keys
+const CFStringRef kICServiceSubmenu = (CFStringRef)@"ICServiceSubmenu"; // CFDictionary
+const CFStringRef kICServiceHidden = (CFStringRef)@"ICServiceHidden"; // CFNumber (Boolean)
+const CFStringRef kICServiceShortcut = (CFStringRef)@"ICServiceShortcut"; // reserved for future use
 
 // APEBundleMessages
Index: /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m	(revision 142)
@@ -52,13 +52,9 @@
 - (unsigned int)characterIndexForPoint:(NSPoint)thePoint { return 0; }
 - (NSArray*)validAttributesForMarkedText { return nil; }
-
 // NSDraggingDestination
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender { return NSDragOperationNone; }
-- (void)draggingExited:(id <NSDraggingInfo>)sender {}
-
-    // misc. other stuff
+// misc. other stuff
 - (void)_optionClickEvent:(NSEvent *)event:(unsigned int)row:(unsigned short)column {}
 - (void)setNeedsDisplay; {}
-
 @end
 
@@ -441,5 +437,5 @@
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
 {
-    if ([sender draggingSource] != self || ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)) {
+    if (!ICCF_prefs.terminalRequireOptionForSelfDrag || [sender draggingSource] != self || ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)) {
         [super draggingEntered: sender];
         // When doing non-self drags, this works around one bug in Terminal wherein the option key acts as a toggle, and it shouldn't (see Aqua HIG).  Unfortunately, this messes up drag feedback for self drags, but I don't know of any way to fix it.  Not that most Cocoa apps get it remotely right, anyway.
Index: /trunk/ICeCoffEE/ICeCoffEE/Installer components/ui/ui.plist
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/Installer components/ui/ui.plist	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/Installer components/ui/ui.plist	(revision 142)
@@ -39,9 +39,9 @@
 	<string>ICeCoffEE</string>
 	<key>ProductNumVersion</key>
-	<integer>20152320</integer>
+	<integer>20987905</integer>
 	<key>ProductType</key>
 	<string>Preference Pane</string>
 	<key>ProductVersion</key>
-	<string>1.3.3</string>
+	<string>1.4a1</string>
 </dict>
 </plist>
Index: /trunk/ICeCoffEE/ICeCoffEE/VERSION
===================================================================
--- /trunk/ICeCoffEE/ICeCoffEE/VERSION	(revision 141)
+++ /trunk/ICeCoffEE/ICeCoffEE/VERSION	(revision 142)
@@ -1,1 +1,1 @@
-1.3.3
+1.4a1
