diff --git a/LUFA/StudioIntegration/VSIX/[Content_Types].xml b/LUFA/StudioIntegration/VSIX/[Content_Types].xml
index 87b2f8e49c..e54b61a81c 100644
--- a/LUFA/StudioIntegration/VSIX/[Content_Types].xml
+++ b/LUFA/StudioIntegration/VSIX/[Content_Types].xml
@@ -1,8 +1,8 @@
 <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
-  <Default Extension="vsixmanifest" ContentType="text/xml"/>
-  <Default Extension="cache" ContentType="text/xml"/>
-  <Default Extension="png" ContentType="application/octet-stream"/>
-  <Default Extension="txt" ContentType="text/plain"/>
-  <Default Extension="xml" ContentType="text/xml"/>
-  <Default Extension="zip" ContentType="application/octet-stream"/>
+	<Default Extension="vsixmanifest" ContentType="text/xml"/>
+	<Default Extension="cache" ContentType="text/xml"/>
+	<Default Extension="png" ContentType="application/octet-stream"/>
+	<Default Extension="txt" ContentType="text/plain"/>
+	<Default Extension="xml" ContentType="text/xml"/>
+	<Default Extension="zip" ContentType="application/octet-stream"/>
 </Types>
diff --git a/LUFA/StudioIntegration/VSIX/asf-manifest.xml b/LUFA/StudioIntegration/VSIX/asf-manifest.xml
index e90e875f01..794fd689e1 100644
--- a/LUFA/StudioIntegration/VSIX/asf-manifest.xml
+++ b/LUFA/StudioIntegration/VSIX/asf-manifest.xml
@@ -1,18 +1,18 @@
 <AsfContentProvider Version="1.0.0">
-  <Identifier Id="0e160d5c-e331-48d9-850b-e0387912171b">
-    <Org>FourWalledCubicle</Org>
-    <ShortName>LUFA</ShortName>
-    <Author>Dean Camera</Author>
-    <Description/>
-    <FollowFolderStructure>True</FollowFolderStructure>
-  </Identifier>
-  <AsfContent Type="zip" Path="contents.zip">
-    <Content>
-      <Version>0</Version>
-      <HelpURL/>
-      <Locator/>
-      <DbXMLPath>content.xml.cache</DbXMLPath>
-      <Description/>
-    </Content>
-  </AsfContent>
+	<Identifier Id="0e160d5c-e331-48d9-850b-e0387912171b">
+		<Org>FourWalledCubicle</Org>
+		<ShortName>LUFA</ShortName>
+		<Author>Dean Camera</Author>
+		<Description/>
+		<FollowFolderStructure>True</FollowFolderStructure>
+	</Identifier>
+	<AsfContent Type="zip" Path="contents.zip">
+		<Content>
+			<Version>0</Version>
+			<HelpURL/>
+			<Locator/>
+			<DbXMLPath>content.xml.cache</DbXMLPath>
+			<Description/>
+		</Content>
+	</AsfContent>
 </AsfContentProvider>
diff --git a/LUFA/StudioIntegration/generate_caches.py b/LUFA/StudioIntegration/generate_caches.py
index 9c70ebdf1a..f5b6692a9b 100644
--- a/LUFA/StudioIntegration/generate_caches.py
+++ b/LUFA/StudioIntegration/generate_caches.py
@@ -7,30 +7,32 @@
 """
 
 import sys
-import os
 sys.path.append("ProjectGenerator")
 
 
-def main():
+def show_message(message):
+	print "[Project Generator] %s" % message
+	sys.stdout.flush()
+
+
+def main(lufa_root_path):
 	try:
 		from asf_avrstudio5_interface import PythonFacade
 	except ImportError:
 		print "Fatal Error: The ASF project generator is missing."
 		return 1
 
-	p = PythonFacade(os.path.abspath(__file__))
+	p = PythonFacade(lufa_root_path)
 
-	print "[Project Generator] Checking database sanity..."
-	sys.stdout.flush()
-	p.check_extension_database_sanity(sys.argv[1])
+	show_message("Checking database sanity...")
+	p.check_extension_database_sanity(lufa_root_path)
 
-	print "[Project Generator] Building cache files..."
-	sys.stdout.flush()
-	p.generate_extension_cache_files(sys.argv[1])
+	show_message("Building cache files...")
+	p.generate_extension_cache_files(lufa_root_path)
 
-	print "[Project Generator] Cache files created."
+	show_message("Cache files created.")
 	return 0
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    sys.exit(main(sys.argv[1]))