Index: branches/blackosx/package/Scripts/Advanced/ForceHPET/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/ForceHPET/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/ForceHPET/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/UseKernelCache/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UseKernelCache/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/UseKernelCache/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/EHCIacquire/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/EHCIacquire/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/EHCIacquire/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/VBIOS/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/VBIOS/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/VBIOS/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/GUI/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/GUI/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/GUI/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/SMBIOSdefaults/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/SMBIOSdefaults/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/SMBIOSdefaults/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/UseMemDetect/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UseMemDetect/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/UseMemDetect/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/Wake/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/Wake/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/Wake/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/Npci/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/Npci/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/Npci/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/UHCIreset/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UHCIreset/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/UHCIreset/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/Wait/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/Wait/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/Wait/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/UseNvidiaROM/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UseNvidiaROM/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/UseNvidiaROM/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/ForceWake/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/ForceWake/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/ForceWake/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/UseAtiROM/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/UseAtiROM/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/UseAtiROM/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Advanced/QuietBoot/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Advanced/QuietBoot/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Advanced/QuietBoot/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Post/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Post/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Post/postinstall	(revision 1567)
@@ -37,9 +37,15 @@
 # Copy /tmpcham/Extra to correct location.
 if [ ! -f "$dest_vol"/.ChameleonEFI ]; then
 	echo "Copying $dest_vol/tmpcham/Extra/* $dest_vol/Extra"
+	if [ ! -f "$dest_vol"/Extra ]; then
+		mkdir "$dest_vol"/Extra
+	fi
 	cp -R "$dest_vol"/tmpcham/Extra/* "$dest_vol"/Extra
 else
-	echo "Copying $dest_vol/tmpcham/Extra/* $dest_vol/Volumes/EFI/Extra"
+	echo "Copying $dest_vol/tmpcham/Extra/* $/Volumes/EFI/Extra"
+	if [ ! -f "/Volumes/EFI/Extra" ]; then
+		mkdir "/Volumes/EFI/Extra"
+	fi
 	cp -R "$dest_vol"/tmpcham/Extra/* /Volumes/EFI/Extra
 
 	# unmount /Volumes/EFI
Index: branches/blackosx/package/Scripts/BaseOptions/GenerateCStates/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/GenerateCStates/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/GenerateCStates/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/DropSSDT/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/DropSSDT/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/DropSSDT/postinstall	(revision 1567)
@@ -6,23 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/InstantMenu/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/InstantMenu/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/InstantMenu/postinstall	(revision 1567)
@@ -7,24 +7,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/GraphicsEnabler/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/GraphicsEnabler/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/GraphicsEnabler/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/RestartFix/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/RestartFix/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/RestartFix/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/EnableC2State/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/EnableC2State/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/EnableC2State/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/EnableC3State/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/EnableC3State/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/EnableC3State/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/arch/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/arch/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/arch/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
  
Index: branches/blackosx/package/Scripts/BaseOptions/EnableC4State/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/EnableC4State/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/EnableC4State/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/BaseOptions/GeneratePStates/postinstall
===================================================================
--- branches/blackosx/package/Scripts/BaseOptions/GeneratePStates/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/BaseOptions/GeneratePStates/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1024x768x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1024x768x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1024x768x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1024x600x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1024x600x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1024x600x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1920x1200x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1920x1200x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1920x1200x32/postinstall	(revision 1567)
@@ -6,23 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1280x768x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1280x768x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1280x768x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1600x900x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1600x900x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1600x900x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1280x1024x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1280x1024x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1280x1024x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1440x900x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1440x900x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1440x900x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1280x800x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1280x800x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1280x800x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1680x1050x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1680x1050x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1680x1050x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1920x1080x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1920x1080x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1920x1080x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Resolutions/1280x960x32/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Resolutions/1280x960x32/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Resolutions/1280x960x32/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/Scripts/Keymaps/postinstall
===================================================================
--- branches/blackosx/package/Scripts/Keymaps/postinstall	(revision 1566)
+++ branches/blackosx/package/Scripts/Keymaps/postinstall	(revision 1567)
@@ -6,24 +6,13 @@
 import shutil
 
 vol = str(sys.argv[3])
+extrafolder = vol + "/tmpcham/Extra"
+if not os.path.exists(extrafolder):
+    os.makedirs(extrafolder)
 
-# Check for .ChameleonEFI file at root of target volume
-# to indicate user wants to install to EFI system partition.
-espfile = "/.ChameleonEFI"
-espvol = vol + espfile
-if os.path.exists(espvol):
-    if not os.path.exists('/Volumes/EFI/Extra'):
-        os.makedirs('/Volumes/EFI/Extra')
+boot = "/tmpcham/Extra/org.chameleon.Boot.plist"
+plist = vol + boot
 
-    plist = "/Volumes/EFI/Extra/org.chameleon.Boot.plist"
-else:
-    extrafolder = vol + "/Extra"
-    if not os.path.exists(extrafolder):
-        os.makedirs(extrafolder)
-
-    boot = "/Extra/org.chameleon.Boot.plist"
-    plist = vol + boot
-
 if not os.path.exists(plist):
     shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist)
 
Index: branches/blackosx/package/buildpkg.sh
===================================================================
--- branches/blackosx/package/buildpkg.sh	(revision 1566)
+++ branches/blackosx/package/buildpkg.sh	(revision 1567)
@@ -319,7 +319,7 @@
 
 # clean up 
 
-	#rm -R -f "${1}"
+	rm -R -f "${1}"
 
 }
 
@@ -360,7 +360,7 @@
 
 	header+="auth=\"root\">\n"
 	header+="\t<payload installKBytes=\"${installedsize##* }\" numberOfFiles=\"${filecount##* }\"/>\n"
-	#rm -R -f "${1}/Temp"
+	rm -R -f "${1}/Temp"
 
 	[ -d "${1}/Temp" ] || mkdir -m 777 "${1}/Temp"
 	[ -d "${1}/Root" ] && mkbom "${1}/Root" "${1}/Temp/Bom"
@@ -397,7 +397,7 @@
 	fi
 	choices[$((choicescount++))]="<choice\n\tid=\"${packagename// /}\"\n\ttitle=\"${packagename}_title\"\n\tdescription=\"${packagename}_description\"\n${choiceoptions}>\n\t<pkg-ref id=\"${identifier}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}' auth='root'>#${packagename// /}.pkg</pkg-ref>\n</choice>\n"
 
-	#rm -R -f "${1}"
+	rm -R -f "${1}"
 fi
 }