Index: branches/ErmaC/Enoch/Chameleon.xcodeproj/project.pbxproj
===================================================================
--- branches/ErmaC/Enoch/Chameleon.xcodeproj/project.pbxproj	(revision 2784)
+++ branches/ErmaC/Enoch/Chameleon.xcodeproj/project.pbxproj	(revision 2785)
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 47;
 	objects = {
 
 /* Begin PBXFileReference section */
@@ -1413,6 +1413,9 @@
 		B4B3DE7A15B8E914002FAA73 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_CN; path = Welcome.rtfd; sourceTree = "<group>"; };
 		B4B3DE7D15B8E914002FAA73 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = Conclusion.rtfd; sourceTree = "<group>"; };
 		B4B3DE7F15B8E914002FAA73 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; name = zh_TW; path = Welcome.rtfd; sourceTree = "<group>"; };
+		E51057BF1BD174E0002FC0A7 /* IntelBdw.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = IntelBdw.txt; path = OptionalSettings/IntelBdw.txt; sourceTree = "<group>"; };
+		E51057C01BD174FE002FC0A7 /* IntelSkl.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = IntelSkl.txt; path = OptionalSettings/IntelSkl.txt; sourceTree = "<group>"; };
+		E51057C11BD17514002FC0A7 /* CrsActiveConfig.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = CrsActiveConfig.txt; path = OptionalSettings/CrsActiveConfig.txt; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
@@ -1604,11 +1607,14 @@
 			children = (
 				36B83692167832FC00314162 /* Audio.txt */,
 				36AB75E514BD095E005B8045 /* Control.txt */,
+				E51057C11BD17514002FC0A7 /* CrsActiveConfig.txt */,
 				36AB75E614BD095E005B8045 /* General.txt */,
+				36CF786716A0DD3D00EE5DC1 /* HDAULayout.txt */,
+				36B836941678330900314162 /* HDEFLayout.txt */,
+				361DAA8F177D152200CFBF68 /* IntelAzul.txt */,
+				E51057BF1BD174E0002FC0A7 /* IntelBdw.txt */,
 				36C9C9841739EF9900B28C9B /* IntelCapri.txt */,
-				361DAA8F177D152200CFBF68 /* IntelAzul.txt */,
-				36B836941678330900314162 /* HDEFLayout.txt */,
-				36CF786716A0DD3D00EE5DC1 /* HDAULayout.txt */,
+				E51057C01BD174FE002FC0A7 /* IntelSkl.txt */,
 				36AB75E714BD095E005B8045 /* KernelFlags.txt */,
 				36AB75E814BD095E005B8045 /* PowerManagement.txt */,
 				36AB75E914BD095E005B8045 /* Resolution.txt */,
@@ -4105,7 +4111,7 @@
 				LastUpgradeCheck = 0620;
 			};
 			buildConfigurationList = 1DEB919308733D9F0010E9CD /* Build configuration list for PBXProject "Chameleon" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 6.3";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
Index: branches/ErmaC/Enoch/doc/BootHelp.txt
===================================================================
--- branches/ErmaC/Enoch/doc/BootHelp.txt	(revision 2784)
+++ branches/ErmaC/Enoch/doc/BootHelp.txt	(revision 2785)
@@ -70,6 +70,8 @@
                             "Boot Banner"=No will also disable this info.
   "Legacy Logo"=Yes|No    Use the legacy grey apple logo (enabled by default).
 
+  RebootOnPanic=Yes|No    (disabled by default).
+
   EnableHiDPI=Yes|No      Enable High resolution display (disabled by default).
 
   BlackMode=Yes|No        The new BlackMode loads the white Apple logo,
@@ -108,7 +110,7 @@
     display_1=<value>       Inject alternate value of display-cfg into NVDA,Display-B@1 (HEX).
     IntelCapriFB=<value>    For Intel Ivy Bridge, range 0-11.
     IntelAzulFB=<value>     For Intel Haswell, range 0-16.
-    IntelBdwFB=<value>      For Intel Broadwell, range 0-18.
+    IntelBdwFB=<value>      For Intel Broadwell, range 0-19.
     IntelSklFB=<value>      For Intel Skylake, range 0-12.
     InjectIntel-ig=<value>  Inject alternate value into AAPL,ig-platform-id (HEX).
 
@@ -187,6 +189,11 @@
                               if smbios.plist doesn't exist, factory
                               values are kept.
 
+
+  KERNELPlist=<file>        Use an alternate kernel.plist file
+                              (default path: /Extra/Kernel.plist
+                               bt(0,0)/Extra/kernel.plist).
+
   "Scan Single Drive"       Scan the drive only where the booter got loaded from.
     =Yes|No                 Fix rescan issues when using a DVD reader in AHCI mode. 
   Rescan=Yes                Enable CD-ROM rescan mode.