diff --git a/.gitignore b/.gitignore
index 248e034..267a840 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+graphics
 build
 highlight
 highlight-*
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1929088..26d0800 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,16 @@
+2.0.2:
+    * Modified ReadMe.txt to include the latest info on the Xcode 3.2 conflict
+    * Include a link to Andre Simon's page with previews of color styles
+
+2.0.1:
+    * Corrected build of Highlight to run on Leopard.
+    * Stop redirecting stdout of colorize.sh to stdin.  Error output will appear
+      in the console instead of the preview.
+    * Added qlcc_debug option.  To enable, use:
+            defaults write org.n8gray.qlcolorcode qlcc_debug 1
+      To disable, use:
+            defaults delete org.n8gray.qlcolorcode qlcc_debug
+
 2.0:
     * Added a note about conflict with Xcode 3.2's source code QL plugin.  If
       you're having problems with QLCC on Snow Leopard please read it!
diff --git a/Common.m b/Common.m
index 826e30c..70e5d8e 100644
--- a/Common.m
+++ b/Common.m
@@ -25,7 +25,8 @@
     NSPipe *pipe;
     pipe = [NSPipe pipe];
     [task setStandardOutput: pipe];
-    [task setStandardError: pipe];
+    // Let stderr go to the usual place
+    //[task setStandardError: pipe];
     
     NSFileHandle *file;
     file = [pipe fileHandleForReading];
@@ -69,6 +70,9 @@
     NSMutableDictionary *env = [NSMutableDictionary dictionaryWithDictionary:
                                 [[NSProcessInfo processInfo] environment]];
     [env addEntriesFromDictionary:[NSDictionary dictionaryWithObjectsAndKeys:
+#ifdef DEBUG
+                                   @"1", @"qlcc_debug",
+#endif
                                    @"9", @"fontSizePoints",
                                    @"Monaco", @"font",
                                    @"ide-xcode", @"hlTheme", 
@@ -85,7 +89,8 @@
     
     output = runTask(cmd, env, status);
     if (*status != 0) {
-        NSLog(@"QLColorCode: colorize.sh failed with exit code %d", *status);
+        NSLog(@"QLColorCode: colorize.sh failed with exit code %d.  Command was (%@).", 
+              *status, cmd);
     }
     return output;
 }
diff --git a/Disable XCode QL Plugin.scpt b/Disable XCode QL Plugin.scpt
new file mode 100755
index 0000000..2e7c964
--- /dev/null
+++ b/Disable XCode QL Plugin.scpt	
@@ -0,0 +1,8 @@
+#!/usr/bin/osascript
+
+on run
+	do shell script "if test \\! -d /Developer/Applications/Xcode.app/Contents/Library/QuickLook/SourceCode.qlgenerator; then echo 'I could not locate the XCode plugin.  Have you already disabled it?'; exit 1; fi"
+	do shell script "x=/Developer/Applications/Xcode.app/Contents/Library/QuickLook/SourceCode.qlgenerator; sudo rm -rf $x.disabled; sudo mv $x $x.disabled" with administrator privileges
+	do shell script "qlmanage -r"
+	display dialog "The XCode plugin has been disabled" buttons {"OK"} default button 1
+end run
diff --git a/Notes.txt b/Notes.txt
index f53e5f8..c2c30b7 100644
--- a/Notes.txt
+++ b/Notes.txt
@@ -2,8 +2,8 @@ Based on highlight: http://www.andre-simon.de/index.html
 (Was based on pygments: http://pygments.org)
 
 When installing a new version of highlight, make sure to update the 
-"highlight" symlink in the project dir.  Also patch with 
-highlight-2.6.6-getConfDir.diff if necessary.
+"highlight" symlink in the project dir.  Also merge in any updates to 
+filetypes.conf
 
 The version is handled in the Current Project Version variable in the project.
 
diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj
index 649bc18..71fd8f9 100644
--- a/QLColorCode.xcodeproj/project.pbxproj
+++ b/QLColorCode.xcodeproj/project.pbxproj
@@ -26,15 +26,11 @@
 		0E8776580D08E004005040B4 /* Common.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E8776560D08E004005040B4 /* Common.m */; };
 		0E8776B70D08ED64005040B4 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E8776B60D08ED64005040B4 /* WebKit.framework */; };
 		0E8776BD0D08EDA4005040B4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E8776BC0D08EDA4005040B4 /* AppKit.framework */; };
-		0E913A0A0D10B8060067BAD6 /* filetypes.conf in Copy .conf Files */ = {isa = PBXBuildFile; fileRef = 0E913A090D10B8060067BAD6 /* filetypes.conf */; };
+		0E8FBB64141DA09D00269094 /* override in Resources */ = {isa = PBXBuildFile; fileRef = 0E8FBB56141DA09D00269094 /* override */; };
 		0EB495D50D0FB13C00E86E0B /* colorize.sh in Resources */ = {isa = PBXBuildFile; fileRef = 0ECBBB5D0CFD447E00416538 /* colorize.sh */; };
-		0EB496B10D0FC70D00E86E0B /* ml.lang in Copy .lang Files */ = {isa = PBXBuildFile; fileRef = 0EB4960D0D0FC24000E86E0B /* ml.lang */; };
 		0EC047970CFBDADF009C986E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EC047960CFBDADF009C986E /* Foundation.framework */; };
 		0ECBBA6C0CFCA37500416538 /* QLColorCode.qlgenerator in Copy to Library */ = {isa = PBXBuildFile; fileRef = 8D576316048677EA00EA77CD /* QLColorCode.qlgenerator */; };
-		0EF57D440D122791006084D5 /* ide-xcode.style in Copy .style Files */ = {isa = PBXBuildFile; fileRef = 0EF57D430D122791006084D5 /* ide-xcode.style */; };
-		0EF57D6E0D122934006084D5 /* objc.lang in Copy .lang Files */ = {isa = PBXBuildFile; fileRef = 0EF57D6D0D122934006084D5 /* objc.lang */; };
-		0EF57E6A0D125AB2006084D5 /* slateGreen.style in Copy .style Files */ = {isa = PBXBuildFile; fileRef = 0EF57E690D125AB2006084D5 /* slateGreen.style */; };
-		0EF57F2F0D128219006084D5 /* c.lang in Copy .lang Files */ = {isa = PBXBuildFile; fileRef = 0EF57F2E0D128219006084D5 /* c.lang */; };
+		0EE90E861098CE5800468467 /* Script notes.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0EE90E851098CE5800468467 /* Script notes.txt */; };
 		2C05A19C06CAA52B00D84F6F /* GeneratePreviewForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */; };
 		61E3BCFB0870B4F2002186A0 /* GenerateThumbnailForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */; };
 		8D576312048677EA00EA77CD /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 08FB77B6FE84183AC02AAC07 /* main.c */; settings = {ATTRIBUTES = (); }; };
@@ -56,30 +52,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		0E913A110D10B84D0067BAD6 /* Copy .conf Files */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = override/config;
-			dstSubfolderSpec = 7;
-			files = (
-				0E913A0A0D10B8060067BAD6 /* filetypes.conf in Copy .conf Files */,
-			);
-			name = "Copy .conf Files";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		0EB496B00D0FC68300E86E0B /* Copy .lang Files */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = override/langDefs;
-			dstSubfolderSpec = 7;
-			files = (
-				0EF57F2F0D128219006084D5 /* c.lang in Copy .lang Files */,
-				0EF57D6E0D122934006084D5 /* objc.lang in Copy .lang Files */,
-				0EB496B10D0FC70D00E86E0B /* ml.lang in Copy .lang Files */,
-			);
-			name = "Copy .lang Files";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		0ECBBA6F0CFCA39E00416538 /* Copy to Library */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 12;
@@ -91,18 +63,6 @@
 			name = "Copy to Library";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		0EF57D6C0D1228E3006084D5 /* Copy .style Files */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = override/themes;
-			dstSubfolderSpec = 7;
-			files = (
-				0EF57E6A0D125AB2006084D5 /* slateGreen.style in Copy .style Files */,
-				0EF57D440D122791006084D5 /* ide-xcode.style in Copy .style Files */,
-			);
-			name = "Copy .style Files";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -114,17 +74,15 @@
 		0E8776560D08E004005040B4 /* Common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Common.m; sourceTree = "<group>"; };
 		0E8776B60D08ED64005040B4 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = SDKs/MacOSX10.5.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; };
 		0E8776BC0D08EDA4005040B4 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = SDKs/MacOSX10.5.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; };
-		0E913A090D10B8060067BAD6 /* filetypes.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = filetypes.conf; sourceTree = "<group>"; };
-		0EB4960D0D0FC24000E86E0B /* ml.lang */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ml.lang; sourceTree = "<group>"; };
+		0E8FBB56141DA09D00269094 /* override */ = {isa = PBXFileReference; lastKnownFileType = folder; path = override; sourceTree = "<group>"; };
 		0EC047960CFBDADF009C986E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = SDKs/MacOSX10.5.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		0EC047F20CFC000A009C986E /* Notes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Notes.txt; sourceTree = "<group>"; };
 		0ECBBB360CFCF98600416538 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
 		0ECBBB5D0CFD447E00416538 /* colorize.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = colorize.sh; sourceTree = "<group>"; };
-		0EF57D430D122791006084D5 /* ide-xcode.style */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "ide-xcode.style"; sourceTree = "<group>"; };
-		0EF57D6D0D122934006084D5 /* objc.lang */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = objc.lang; sourceTree = "<group>"; };
+		0EE90E6F1098BE1E00468467 /* Disable XCode QL Plugin.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; path = "Disable XCode QL Plugin.scpt"; sourceTree = "<group>"; };
+		0EE90E841098CDDF00468467 /* Restore XCode QL Plugin.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; path = "Restore XCode QL Plugin.scpt"; sourceTree = "<group>"; };
+		0EE90E851098CE5800468467 /* Script notes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Script notes.txt"; sourceTree = "<group>"; };
 		0EF57E4D0D123DD0006084D5 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
-		0EF57E690D125AB2006084D5 /* slateGreen.style */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = slateGreen.style; sourceTree = "<group>"; };
-		0EF57F2E0D128219006084D5 /* c.lang */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = c.lang; sourceTree = "<group>"; };
 		2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratePreviewForURL.m; sourceTree = "<group>"; };
 		61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = GenerateThumbnailForURL.m; sourceTree = "<group>"; };
 		8D576316048677EA00EA77CD /* QLColorCode.qlgenerator */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = QLColorCode.qlgenerator; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -155,6 +113,7 @@
 		089C166AFE841209C02AAC07 /* QLColorCode */ = {
 			isa = PBXGroup;
 			children = (
+				0EE90E7F1098C84600468467 /* Scripts */,
 				0EC047F20CFC000A009C986E /* Notes.txt */,
 				0ECBBB360CFCF98600416538 /* ReadMe.txt */,
 				0E51C65F0D04E492007853CB /* ChangeLog.txt */,
@@ -184,12 +143,7 @@
 		089C167CFE841241C02AAC07 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				0EF57F2E0D128219006084D5 /* c.lang */,
-				0EB4960D0D0FC24000E86E0B /* ml.lang */,
-				0EF57D6D0D122934006084D5 /* objc.lang */,
-				0EF57D430D122791006084D5 /* ide-xcode.style */,
-				0EF57E690D125AB2006084D5 /* slateGreen.style */,
-				0E913A090D10B8060067BAD6 /* filetypes.conf */,
+				0E8FBB56141DA09D00269094 /* override */,
 				8D576317048677EA00EA77CD /* Info.plist */,
 				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
 			);
@@ -209,6 +163,16 @@
 			name = Source;
 			sourceTree = "<group>";
 		};
+		0EE90E7F1098C84600468467 /* Scripts */ = {
+			isa = PBXGroup;
+			children = (
+				0EE90E851098CE5800468467 /* Script notes.txt */,
+				0EE90E6F1098BE1E00468467 /* Disable XCode QL Plugin.scpt */,
+				0EE90E841098CDDF00468467 /* Restore XCode QL Plugin.scpt */,
+			);
+			name = Scripts;
+			sourceTree = "<group>";
+		};
 		19C28FB6FE9D52B211CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -239,9 +203,6 @@
 				8D57630F048677EA00EA77CD /* Resources */,
 				8D576311048677EA00EA77CD /* Sources */,
 				8D576313048677EA00EA77CD /* Frameworks */,
-				0EB496B00D0FC68300E86E0B /* Copy .lang Files */,
-				0EF57D6C0D1228E3006084D5 /* Copy .style Files */,
-				0E913A110D10B84D0067BAD6 /* Copy .conf Files */,
 				0E9139D70D10A8320067BAD6 /* Install highlight */,
 				0ECBBA6F0CFCA39E00416538 /* Copy to Library */,
 				0E1280381061C3EA0078EC05 /* Reset quicklookd */,
@@ -263,7 +224,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "QLColorCode" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 089C166AFE841209C02AAC07 /* QLColorCode */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -281,6 +249,8 @@
 			files = (
 				0EB495D50D0FB13C00E86E0B /* colorize.sh in Resources */,
 				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
+				0EE90E861098CE5800468467 /* Script notes.txt in Resources */,
+				0E8FBB64141DA09D00269094 /* override in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -327,8 +297,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/zsh -x";
-			shellScript = "set err_exit\ncd $PROJECT_DIR/highlight\nexport CFLAGS='-arch i386 -arch ppc -arch x86_64'\nexport LDFLAGS=$CFLAGS\nmake\n# Make sure it was built universal\nlipo -info src/highlight | grep -q ppc || exit 1\nlipo -info src/highlight | grep -q i386 || exit 1\nlipo -info src/highlight | grep -q x86_64 || exit 1\nmake \\\n\tDESTDIR=$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH \\\n\tPREFIX=/highlight/ \\\n\tinstall\n\n";
-			showEnvVarsInLog = 0;
+			shellScript = "set err_exit\ncd $PROJECT_DIR/highlight\nX=\"-arch i386 -arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET\"\nexport CFLAGS=$X\nexport LDFLAGS=$X\nmake -j 2\n# Make sure it was built universal\nlipo -info src/highlight | grep -q i386 || exit 1\nlipo -info src/highlight | grep -q x86_64 || exit 1\nmake \\\n\tDESTDIR=$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH \\\n\tPREFIX=/highlight/ \\\n\tinstall\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -391,10 +360,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/SDKs/MacOSX10.5.sdk/System/Library/Frameworks\"",
-				);
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -412,10 +377,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/SDKs/MacOSX10.5.sdk/System/Library/Frameworks\"",
-				);
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Library/QuickLook;
@@ -427,28 +388,27 @@
 		2CA326230896AD4900168862 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 2.0.0;
+				CURRENT_PROJECT_VERSION = 2.0.2;
 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
 		2CA326240896AD4900168862 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-					x86_64,
-				);
-				CURRENT_PROJECT_VERSION = 2.0.0;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
+				CURRENT_PROJECT_VERSION = 2.0.2;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};
diff --git a/ReadMe.txt b/ReadMe.txt
index 75dc200..19d8c65 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -5,8 +5,8 @@ QLColorCode
 ===============================================================================
 IMPORTANT NOTE FOR XCODE 3.2 (SHIPPED WITH SNOW LEOPARD) USERS:
 If you are running Xcode 3.2 or higher you will probably not see QLColorCode's 
-output.  See here for details:
-    http://code.google.com/p/qlcolorcode/issues/detail?id=46
+output unless you disable Xcode's built-in source code qlgenerator.  
+See the end of this file for details.
 ===============================================================================
 
 This is a Quick Look plugin that renders source code with syntax highlighting,
@@ -22,25 +22,24 @@ Setting the text encoding (default is UTF-8).  Two settings are required.  The
 first sets Highlight's encoding, the second sets Webkit's:
     defaults write org.n8gray.QLColorCode textEncoding UTF-16
     defaults write org.n8gray.QLColorCode webkitTextEncoding UTF-16
+    
 Setting the font:
     defaults write org.n8gray.QLColorCode font Monaco
+    
 the font size:
     defaults write org.n8gray.QLColorCode fontSizePoints 9
-the color style (see below):
+    
+the color style (see http://www.andre-simon.de/dokuwiki/doku.php?id=theme_examples
+or try slateGreen to see how I roll.  Also included are solarized-light and solarized-dark
+as seen at http://ethanschoonover.com/solarized):
     defaults write org.n8gray.QLColorCode hlTheme ide-xcode
+    
 any extra command-line flags for Highlight (see below):
     defaults write org.n8gray.QLColorCode extraHLFlags '-l -W'
+    
 the maximum size (in bytes) for previewed files:
     defaults write org.n8gray.QLColorCode maxFileSize 1000000
 
-The following color styles are included with QLColorCode:
-   acid, bipolar, blacknblue, bright, contrast, darkblue, 
-   darkness, desert, easter, emacs, golden, greenlcd, ide-anjuta, 
-   ide-codewarrior, ide-devcpp, ide-eclipse, ide-kdev, ide-msvcpp, ide-xcode, 
-   kwrite, lucretia, matlab, moe, navy, nedit, neon, night, orion, pablo, 
-   peachpuff, print, rand01, seashell, slateGreen, the, typical, vampire, 
-   vim-dark, vim, whitengrey, zellner
-
 Here are some useful 'highlight' command-line flags (from the man page):
        -F, --reformat=<style>
               reformat output in given style.   <style>=[ansi,  gnu,  kr,
@@ -91,6 +90,45 @@ As an aside, by changing colorize.sh you can use this plugin to render any file
 type that you can convert to HTML.  Have fun, and let me know if you do anything
 cool!
 
+====================================================================
+Important information on using QLColorCode with Xcode v3.2 and later
+====================================================================
+
+The most up-to-date copy of this info will be found here:
+  http://code.google.com/p/qlcolorcode/wiki/ImportantNoteForXcodeUsers
+
+Xcode 3.2 (the version shipped with Snow Leopard) includes a Quick Look plugin 
+that highlights source code. It only highlights a few languages, so you probably
+still want to use QLColorCode. However, the Quick Look server tends to pick the
+Xcode plugin over QLCC. This means that for any source code file aside from .c,
+.m, and the other languages that Xcode understands you'll see a plain text
+preview with no highlighting. To get QLCC to work properly you'll need to 
+disable the Xcode plugin.
+
+Details
+-------
+
+The Xcode plugin is installed at:
+
+/Developer/Applications/Xcode.app/Contents/Library/QuickLook/SourceCode.qlgenerator
+The simplest way to disable it is to open Terminal.app and run these commands:
+
+  f=/Developer/Applications/Xcode.app/Contents/Library/QuickLook/SourceCode.qlgenerator
+  sudo mv $f $f.disabled
+
+This will rename the plugin to SourceCode.qlgenerator.disabled, which will 
+prevent it from being loaded by quicklookd.
+
+A Note on Code Signing
+----------------------
+
+The Xcode application is cryptographically signed. Disabling the 
+SourceCode.qlgenerator plugin will NOT invalidate the signature. You can 
+confirm this by using the codesign command after disabling the plugin:
+
+  [n8gray@golux]% codesign -vv /Developer/Applications/Xcode.app
+  /Developer/Applications/Xcode.app: valid on disk
+  /Developer/Applications/Xcode.app: satisfies its Designated Requirement
 
 Cheers,
 -n8
diff --git a/Restore XCode QL Plugin.scpt b/Restore XCode QL Plugin.scpt
new file mode 100755
index 0000000..c9a3af4
--- /dev/null
+++ b/Restore XCode QL Plugin.scpt	
@@ -0,0 +1,10 @@
+#!/usr/bin/osascript
+
+on run
+	do shell script "if test \\! -d /Developer/Applications/Xcode.app/Contents/Library/QuickLook/SourceCode.qlgenerator.disabled; then echo 'I could not locate the disabled XCode plugin.  Have you already restored it?'; exit 1; fi"
+	do shell script "if test -e /Developer/Applications/Xcode.app/Contents/Library/QuickLook/SourceCode.qlgenerator; then echo 'There is already a plugin named /Developer/Applications/Xcode.app/Contents/Library/QuickLook/SourceCode.qlgenerator\\n\\nI will not overwrite it.'; exit 1; fi"
+	do shell script "x=/Developer/Applications/Xcode.app/Contents/Library/QuickLook/SourceCode.qlgenerator; sudo mv $x.disabled $x" with administrator privileges
+	do shell script "qlmanage -r"
+	display dialog "The XCode plugin has been restored" buttons {"OK"} default button 1
+	
+end run
diff --git a/Script notes.txt b/Script notes.txt
new file mode 100644
index 0000000..2e53b64
--- /dev/null
+++ b/Script notes.txt	
@@ -0,0 +1,14 @@
+To package one of these scripts:
+1.  open it in Script Editor
+2.  Save As, using File Format: Application, with Startup Screen checked
+3.  Copy and paste the appropriate description below into the "Description" 
+    pane in Script Editor
+4.  Save
+5.  Package & distribute the resulting app bundle
+
+
+Descriptions:
+
+This script will disable the Quick Look plugin shipped with XCode by renaming it, adding a ".disabled" suffix.
+
+This script will restore the Quick Look plugin shipped with XCode, undoing the effects of the "Disable XCode QL Plugin" application.
\ No newline at end of file
diff --git a/colorize.sh b/colorize.sh
index accaf5a..c4e878d 100755
--- a/colorize.sh
+++ b/colorize.sh
@@ -19,12 +19,17 @@
 # Fail immediately on failure of sub-command
 setopt err_exit
 
-#echo QLColorCode Devel Version!
-
 rsrcDir=$1
 target=$2
 thumb=$3
 
+debug () {
+    if [ "x$qlcc_debug" != "x" ]; then if [ "x$thumb" = "x0" ]; then
+        echo "QLColorCode: $@" 1>&2
+    fi; fi
+}
+
+debug Starting colorize.sh
 #echo target is $target
 
 hlDir=$rsrcDir/highlight
@@ -32,12 +37,14 @@ cmd=$hlDir/bin/highlight
 cmdOpts=(-I --font $font --quiet --add-data-dir $rsrcDir/override \
          --data-dir $rsrcDir/highlight/share/highlight \
          --add-config-dir $rsrcDir/override/config --style $hlTheme \
-         --font-size $fontSizePoints --encoding $textEncoding ${=extraHLFlags})
+         --font-size $fontSizePoints --encoding $textEncoding ${=extraHLFlags} --validate-input)
 
 #for o in $cmdOpts; do echo $o\<br/\>; done 
 
+debug Setting reader
 reader=(cat $target)
 
+debug Handling special cases
 case $target in
     *.graffle )
         # some omnigraffle files are XML and get passed to us.  Ignore them.
@@ -64,9 +71,6 @@ case $target in
             lang=objc
         fi
         ;;
-    *.groovy )  
-        lang=java
-        ;;
     *.pro )
         # Can be either IDL or Prolog.  Prolog uses /* */ and % for comments.
         # IDL uses ;
@@ -80,8 +84,10 @@ case $target in
         lang=${target##*.}
     ;;
 esac
+debug Resolved $target to language $lang
 
 go4it () {
+    debug Generating the preview
     if [ $thumb = "1" ]; then
         $reader | head -n 100 | head -c 20000 | $cmd --syntax $lang $cmdOpts && exit 0
     elif [ -n "$maxFileSize" ]; then
@@ -92,7 +98,11 @@ go4it () {
 }
 
 setopt no_err_exit
+debug First try...
 go4it
 # Uh-oh, it didn't work.  Fall back to rendering the file as plain
+debug First try failed, second try...
 lang=txt
 go4it
+debug Reached the end of the file.  That should not happen.
+exit 101
diff --git a/filetypes.conf.patch b/filetypes.conf.patch
new file mode 100644
index 0000000..ac9a357
--- /dev/null
+++ b/filetypes.conf.patch
@@ -0,0 +1,45 @@
+--- highlight/filetypes.conf	2009-09-07 13:33:02.000000000 -0700
++++ filetypes.conf	2009-09-19 23:34:53.000000000 -0700
+@@ -11,6 +11,8 @@
+ # andre.simon1@gmx.de
+ # http:/www.andre-simon.de/
+ 
++# Modified by Nathan Gray <n8@n8gray.org>
++
+ $ext(ada)=adb ads a gnad
+ $ext(ampl)=dat run
+ $ext(amtrix)=s4 s4t s4h hnd t4
+@@ -19,7 +21,7 @@
+ $ext(ats)=dats
+ $ext(aspect)=was wud
+ $ext(bat)=cmd
+-$ext(c)=c++ cpp cxx cc h hh hxx hpp
++$ext(c)=c++ cpp cxx cc h hh hxx hpp pch cp pch++
+ $ext(cfc)=cfm
+ $ext(cob)=cbl
+ $ext(diff)=patch
+@@ -30,12 +32,13 @@
+ $ext(f90)=f95
+ $ext(haskell)=hs icl
+ $ext(java)=groovy grv
+-$ext(lisp)=cl clisp el lsp sbcl
++$ext(lisp)=asd cl clisp el lsp sbcl
+ $ext(make)=mak mk
+ $ext(mib)=smi
+-$ext(ml)=mli ocaml
++$ext(ml)=mli ocaml mll mly
+ $ext(mod3)=mod m3 i3 ig mg
+ $ext(oberon)=ooc
++$ext(objc)=mm
+ $ext(php)=php3 php4 php5 php6
+ $ext(pike)=pmod
+ $ext(pl1)=ff fp fpp rpp sf sp spb spp sps wp wf wpp wps wpb bdy spe
+@@ -43,7 +46,7 @@
+ $ext(progress)=p i w
+ $ext(rb)=ruby pp rjs
+ $ext(rexx)=rex rx the
+-$ext(sh)=bash ebuild eclass
++$ext(sh)=bash ebuild eclass command
+ $ext(smalltalk)=st gst sq
+ $ext(sybase)=sp
+ $ext(tcl)=wish itcl
diff --git a/highlight.css b/highlight.css
new file mode 100644
index 0000000..4ba7933
--- /dev/null
+++ b/highlight.css
@@ -0,0 +1,21 @@
+/* Style definition file generated by highlight 2.12, http://www.andre-simon.de/ */
+
+/* Highlighting theme definition: */
+
+body.hl	{ background-color:#ffffff; }
+pre.hl	{ color:#000000; background-color:#ffffff; font-size:10pt; font-family:'Courier New';}
+.hl.num { color:#2928ff; }
+.hl.esc { color:#ff00ff; }
+.hl.str { color:#ff0000; }
+.hl.dstr { color:#818100; }
+.hl.slc { color:#838183; font-style:italic; }
+.hl.com { color:#838183; font-style:italic; }
+.hl.dir { color:#008200; }
+.hl.sym { color:#000000; }
+.hl.line { color:#555555; }
+.hl.mark	{ background-color:#ffffbb;}
+.hl.kwa { color:#000000; font-weight:bold; }
+.hl.kwb { color:#830000; }
+.hl.kwc { color:#000000; font-weight:bold; }
+.hl.kwd { color:#010181; }
+
diff --git a/filetypes.conf b/override/config/filetypes.conf
similarity index 67%
rename from filetypes.conf
rename to override/config/filetypes.conf
index 57f784f..817c730 100644
--- a/filetypes.conf
+++ b/override/config/filetypes.conf
@@ -3,7 +3,7 @@
 # This file is a part of highlight, a free source code converter released under the GPL.
 #
 # Format: $ext(lang) = <extensions of source files>
-#         where lang is the file name of the language definition (eg php.lang)
+#         where lang is the file name of the language definition
 # If there exists only one extension, you do not have to list it here.
 # See README in the highlight directory for details.
 #
@@ -13,38 +13,49 @@
 
 # Modified by Nathan Gray <n8@n8gray.org>
 
-$ext(c)=c++ cpp CPP C cxx cc h hh hxx hpp H HPP pch cp pch++
-$ext(php)=php3 php4
-$ext(vb)=bas basic bi vbs
-$ext(pl)=perl cgi pm plx plex
-$ext(rb)=ruby rjs
-$ext(cob)=cobol
-$ext(sh)=bash command
-#$ext(sh)=bash
-$ext(f77)=f F for ftn
+$ext(ada)=adb ads a gnad
+$ext(ampl)=dat run
+$ext(amtrix)=s4 s4t s4h hnd t4
+$ext(asm)=a51 29k 68s 68x x68
+$ext(asp)=asa
+$ext(ats)=dats
+$ext(aspect)=was wud
+$ext(bat)=cmd
+$ext(c)=c++ cpp cxx cc h hh hxx hpp pch cp pch++
+$ext(cfc)=cfm
+$ext(cob)=cbl
+$ext(diff)=patch
+$ext(e)=se
+$ext(erl)=hrl
+$ext(euphoria)=ex exw exu ew eu
+$ext(f77)=f for ftn
 $ext(f90)=f95
-$ext(xml)=html htm xhtml sgm sgml nrm ent hdr hub dtd wml vxml wml tld svg xsl jnlp ecf rhtml erb
+$ext(haskell)=hs icl
+$ext(java)=groovy grv
+$ext(lisp)=asd cl clisp el lsp sbcl
 $ext(make)=mak mk
-$ext(amtrix)=S4 S4T S4H HND T4
-$ext(euphoria)=ex exw exu ew eu
-$ext(aspect)=was wud
-$ext(pl1)=ff fp fpp rpp sf sp spb spp sps wp wf wpp wps wpb bdy spe
-$ext(pike)=pmod
+$ext(mib)=smi
+$ext(ml)=mli ocaml mll mly
 $ext(mod3)=mod m3 i3 ig mg
+$ext(oberon)=ooc
+$ext(objc)=mm
+$ext(php)=php3 php4 php5 php6
+$ext(pike)=pmod
+$ext(pl1)=ff fp fpp rpp sf sp spb spp sps wp wf wpp wps wpb bdy spe
+$ext(pl)=perl cgi pm plx plex
+$ext(progress)=p i w
+$ext(rb)=ruby pp rjs
 $ext(rexx)=rex rx the
-$ext(ada)=adb ads a
-$ext(ampl)=dat run
+$ext(sh)=bash ebuild eclass command
+$ext(smalltalk)=st gst sq
 $ext(sybase)=sp
-$ext(ml)=mli mll mly
-$ext(haskell)=hs
-$ext(cfc)=cfm
-$ext(mib)=smi
-$ext(progress)=p i w
-$ext(bat)=cmd
-$ext(diff)=patch
-$ext(objc)=mm
+$ext(tcl)=wish itcl
+$ext(tex)=sty cls
+$ext(vb)=bas basic bi vbs
 $ext(verilog)=v
-$ext(lisp)=lsp asd el
+$ext(html)=htm xhtml
+$ext(xml)=sgm sgml nrm ent hdr hub dtd wml vxml wml tld svg xsl ecf jnlp
+$ext(fs)=fsx
 
 # Input file recognition
 # Highlight matches the first input line with the listed expressions.
diff --git a/c.lang b/override/langDefs/c.lang
similarity index 100%
rename from c.lang
rename to override/langDefs/c.lang
diff --git a/ml.lang b/override/langDefs/ml.lang
similarity index 100%
rename from ml.lang
rename to override/langDefs/ml.lang
diff --git a/objc.lang b/override/langDefs/objc.lang
similarity index 100%
rename from objc.lang
rename to override/langDefs/objc.lang
diff --git a/ide-xcode.style b/override/themes/ide-xcode.style
similarity index 100%
rename from ide-xcode.style
rename to override/themes/ide-xcode.style
diff --git a/slateGreen.style b/override/themes/slateGreen.style
similarity index 100%
rename from slateGreen.style
rename to override/themes/slateGreen.style
diff --git a/override/themes/solarized-dark.style b/override/themes/solarized-dark.style
new file mode 100644
index 0000000..b172785
--- /dev/null
+++ b/override/themes/solarized-dark.style
@@ -0,0 +1,20 @@
+# solarized-dark.style
+# This File is part of highlight, a universal source code converter.
+# See README in the highlight directory for documentation.
+
+$DEFAULTCOLOUR=#839496
+$BGCOLOUR=#002b36
+$FONTSIZE=10
+$KW-GROUP(kwa)=#cb4b16
+$KW-GROUP(kwb)=#859900
+$KW-GROUP(kwc)=#cb4b16
+$KW-GROUP(kwd)=#93a1a1
+$NUMBER=#dc322f
+$ESCAPECHAR=#6c71c4
+$STRING=#dc322f
+$STRING-DIRECTIVE=#dc322f
+$COMMENT=#586e75
+$DIRECTIVE=#6c71c4
+$LINE=#268bd2
+$SYMBOL=#93a1a1
+$MARK-LINE=#073642
diff --git a/override/themes/solarized-light.style b/override/themes/solarized-light.style
new file mode 100644
index 0000000..9f42c81
--- /dev/null
+++ b/override/themes/solarized-light.style
@@ -0,0 +1,20 @@
+# solarized-light.style
+# This File is part of highlight, a universal source code converter.
+# See README in the highlight directory for documentation.
+
+$DEFAULTCOLOUR=#657b83
+$BGCOLOUR=#fdf6e3
+$FONTSIZE=10
+$KW-GROUP(kwa)=#cb4b16
+$KW-GROUP(kwb)=#859900
+$KW-GROUP(kwc)=#cb4b16
+$KW-GROUP(kwd)=#586e75
+$NUMBER=#dc322f
+$ESCAPECHAR=#6c71c4
+$STRING=#dc322f
+$STRING-DIRECTIVE=#dc322f
+$COMMENT=#93a1a1
+$DIRECTIVE=#6c71c4
+$LINE=#268bd2
+$SYMBOL=#586e75
+$MARK-LINE=#073642