diff --git a/Specifications/FileType/archive.macbinary.xcspec b/Specifications/FileType/archive.macbinary.xcspec
index 0f006752..58608db4 100644
--- a/Specifications/FileType/archive.macbinary.xcspec
+++ b/Specifications/FileType/archive.macbinary.xcspec
@@ -20,4 +20,7 @@
         "application/x-macbinary",
         "application/macbinary",
     );
+    TypeCodes = (
+        "BINA",
+    );
 }
diff --git a/Specifications/FileType/archive.metal-library.xcspec b/Specifications/FileType/archive.metal-library.xcspec
index def2b1be..622cc6e1 100644
--- a/Specifications/FileType/archive.metal-library.xcspec
+++ b/Specifications/FileType/archive.metal-library.xcspec
@@ -12,7 +12,7 @@
     Identifier = archive.metal-library;
     BasedOn = archive;
 
-    UTI = "archive.metal-library";
+    UTI = "com.apple.metal-library";
     Extensions = (
         "metallib",
     );
diff --git a/Specifications/FileType/archive.ppob.xcspec b/Specifications/FileType/archive.ppob.xcspec
index 60167ca4..b43b4bf9 100644
--- a/Specifications/FileType/archive.ppob.xcspec
+++ b/Specifications/FileType/archive.ppob.xcspec
@@ -10,7 +10,7 @@
 {
     Type = FileType;
     Identifier = archive.ppob;
-    BasedOn = archive;
+    BasedOn = archive.rsrc;
 
     UTI = "com.apple.ppob-archive";
     Extensions = (
diff --git a/Specifications/FileType/archive.rsrc.xcspec b/Specifications/FileType/archive.rsrc.xcspec
index 27b12e62..afb5a824 100644
--- a/Specifications/FileType/archive.rsrc.xcspec
+++ b/Specifications/FileType/archive.rsrc.xcspec
@@ -21,6 +21,9 @@
         "rsrc",
         "RSRC",
         "view",
+        "SF20",
+        "aLib",
+        "BAPd",
     );
     FallbackAutoroutingBuildPhase = "Resources";
 }
diff --git a/Specifications/FileType/archive.stuffit.xcspec b/Specifications/FileType/archive.stuffit.xcspec
index 4f8a3ffc..0b222dac 100644
--- a/Specifications/FileType/archive.stuffit.xcspec
+++ b/Specifications/FileType/archive.stuffit.xcspec
@@ -12,7 +12,7 @@
     Identifier = archive.stuffit;
     BasedOn = archive;
 
-    UTI = "com.allume.stuffit-archive";
+    UTI = "com.stuffit.archive.sit";
     Extensions = (
         "sit",
         "sitx",
diff --git a/Specifications/FileType/archive.xcspec b/Specifications/FileType/archive.xcspec
index 3b891a61..5de58556 100644
--- a/Specifications/FileType/archive.xcspec
+++ b/Specifications/FileType/archive.xcspec
@@ -13,4 +13,5 @@
     BasedOn = file;
 
     UTI = "public.archive";
+    IncludeInIndex = YES;
 }
diff --git a/Specifications/FileType/archive.zip.xcspec b/Specifications/FileType/archive.zip.xcspec
index 6e9c3558..599ac257 100644
--- a/Specifications/FileType/archive.zip.xcspec
+++ b/Specifications/FileType/archive.zip.xcspec
@@ -12,11 +12,12 @@
     Identifier = archive.zip;
     BasedOn = archive;
 
-    UTI = "com.pkware.zip-archive";
+    UTI = "public.zip-archive";
     Extensions = (
         "zip",
     );
     MIMETypes = (
         "application/zip",
     );
+    CanSetIncludeInIndex = YES;
 }
diff --git a/Specifications/FileType/audio.aiff.xcspec b/Specifications/FileType/audio.aiff.xcspec
index 61e463ad..4fd9a4dc 100644
--- a/Specifications/FileType/audio.aiff.xcspec
+++ b/Specifications/FileType/audio.aiff.xcspec
@@ -16,6 +16,7 @@
     Extensions = (
         "aiff",
         "aif",
+        "cdda",
     );
     TypeCodes = (
         "AIFF",
diff --git a/Specifications/FileType/audio.wav.xcspec b/Specifications/FileType/audio.wav.xcspec
index 3b2318fb..eeb16218 100644
--- a/Specifications/FileType/audio.wav.xcspec
+++ b/Specifications/FileType/audio.wav.xcspec
@@ -20,6 +20,7 @@
     TypeCodes = (
         ".WAV",
         "WAVE",
+        "WAV ",
     );
     MIMETypes = (
         "audio/wav",
diff --git a/Specifications/FileType/compiled.air.xcspec b/Specifications/FileType/compiled.air.xcspec
index 27528c28..cbea0f92 100644
--- a/Specifications/FileType/compiled.air.xcspec
+++ b/Specifications/FileType/compiled.air.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "air",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/compiled.javaclass.xcspec b/Specifications/FileType/compiled.javaclass.xcspec
index 8c322ca1..638dd939 100644
--- a/Specifications/FileType/compiled.javaclass.xcspec
+++ b/Specifications/FileType/compiled.javaclass.xcspec
@@ -16,4 +16,6 @@
     Extensions = (
         "class",
     );
+    IncludeInIndex = YES;
+    CanSetIncludeInIndex = YES;
 }
diff --git a/Specifications/FileType/compiled.mach-o.bundle.xcspec b/Specifications/FileType/compiled.mach-o.bundle.xcspec
index a90ce93a..45f8cb25 100644
--- a/Specifications/FileType/compiled.mach-o.bundle.xcspec
+++ b/Specifications/FileType/compiled.mach-o.bundle.xcspec
@@ -14,4 +14,5 @@
 
     UTI = "com.apple.mach-o-bundle";
     CodeSignOnCopy = YES;
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/compiled.mach-o.corefile.xcspec b/Specifications/FileType/compiled.mach-o.corefile.xcspec
index 8d73c53f..145eb6fd 100644
--- a/Specifications/FileType/compiled.mach-o.corefile.xcspec
+++ b/Specifications/FileType/compiled.mach-o.corefile.xcspec
@@ -12,5 +12,6 @@
     Identifier = compiled.mach-o.corefile;
     BasedOn = compiled.mach-o;
 
-    UTI = "com.apple.mach-o-corefile";
+    UTI = "com.apple.mach-o-core";
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/compiled.mach-o.dylib.xcspec b/Specifications/FileType/compiled.mach-o.dylib.xcspec
index b6f6dc75..55340178 100644
--- a/Specifications/FileType/compiled.mach-o.dylib.xcspec
+++ b/Specifications/FileType/compiled.mach-o.dylib.xcspec
@@ -19,4 +19,5 @@
     IsLibrary = YES;
     IsDynamicLibrary = YES;
     CodeSignOnCopy = YES;
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/compiled.mach-o.dylinker.xcspec b/Specifications/FileType/compiled.mach-o.dylinker.xcspec
index a290eac4..c44f26eb 100644
--- a/Specifications/FileType/compiled.mach-o.dylinker.xcspec
+++ b/Specifications/FileType/compiled.mach-o.dylinker.xcspec
@@ -12,5 +12,5 @@
     Identifier = compiled.mach-o.dylinker;
     BasedOn = compiled.mach-o;
 
-    UTI = "com.apple.mach-o-dylinker";
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/compiled.mach-o.executable.xcspec b/Specifications/FileType/compiled.mach-o.executable.xcspec
index 10c530ac..1a06e10b 100644
--- a/Specifications/FileType/compiled.mach-o.executable.xcspec
+++ b/Specifications/FileType/compiled.mach-o.executable.xcspec
@@ -15,4 +15,5 @@
     UTI = "com.apple.mach-o-executable";
     IsExecutable = YES;
     CodeSignOnCopy = YES;
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/compiled.mach-o.fvmlib.xcspec b/Specifications/FileType/compiled.mach-o.fvmlib.xcspec
index f1307161..71b9516c 100644
--- a/Specifications/FileType/compiled.mach-o.fvmlib.xcspec
+++ b/Specifications/FileType/compiled.mach-o.fvmlib.xcspec
@@ -13,4 +13,5 @@
     BasedOn = compiled.mach-o;
 
     UTI = "com.apple.mach-o-fvmlib";
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/compiled.mach-o.objfile.xcspec b/Specifications/FileType/compiled.mach-o.objfile.xcspec
index 8373be3f..58ff3afa 100644
--- a/Specifications/FileType/compiled.mach-o.objfile.xcspec
+++ b/Specifications/FileType/compiled.mach-o.objfile.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "o",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/compiled.mach-o.preload.xcspec b/Specifications/FileType/compiled.mach-o.preload.xcspec
index de177696..c92eb8f6 100644
--- a/Specifications/FileType/compiled.mach-o.preload.xcspec
+++ b/Specifications/FileType/compiled.mach-o.preload.xcspec
@@ -13,4 +13,5 @@
     BasedOn = compiled.mach-o;
 
     UTI = "com.apple.mach-o-preload";
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/compiled.mach-o.xcspec b/Specifications/FileType/compiled.mach-o.xcspec
index 8f3a0e69..9d1ff582 100644
--- a/Specifications/FileType/compiled.mach-o.xcspec
+++ b/Specifications/FileType/compiled.mach-o.xcspec
@@ -14,4 +14,5 @@
 
     UTI = "public.object-code";
     ContainsNativeCode = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/compiled.rcx.xcspec b/Specifications/FileType/compiled.rcx.xcspec
index 94a78e4b..5f26d055 100644
--- a/Specifications/FileType/compiled.rcx.xcspec
+++ b/Specifications/FileType/compiled.rcx.xcspec
@@ -13,4 +13,7 @@
     BasedOn = compiled;
 
     UTI = "com.lego.rcx";
+    Extensions = (
+        "rcx",
+    );
 }
diff --git a/Specifications/FileType/file.sks.xcspec b/Specifications/FileType/file.sks.xcspec
index 1e7c3541..35f6197d 100644
--- a/Specifications/FileType/file.sks.xcspec
+++ b/Specifications/FileType/file.sks.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "sks",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/file.storyboard.xcspec b/Specifications/FileType/file.storyboard.xcspec
index a53359de..536f29d2 100644
--- a/Specifications/FileType/file.storyboard.xcspec
+++ b/Specifications/FileType/file.storyboard.xcspec
@@ -16,4 +16,7 @@
     Extensions = (
         "storyboard",
     );
+    IncludeInIndex = YES;
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/file.swiftpm-manifest.xcspec b/Specifications/FileType/file.swiftpm-manifest.xcspec
new file mode 100644
index 00000000..503419b1
--- /dev/null
+++ b/Specifications/FileType/file.swiftpm-manifest.xcspec
@@ -0,0 +1,18 @@
+/**
+ Copyright (c) 2015-present, Facebook, Inc.
+ All rights reserved.
+
+ This source code is licensed under the BSD-style license found in the
+ LICENSE file in the root directory of this source tree. An additional grant
+ of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+{
+    Type = FileType;
+    Identifier = file.swiftpm-manifest;
+    BasedOn = sourcecode.swift;
+
+    UTI = "com.apple.dt.swiftpm.manifest";
+    IsProjectWrapper = YES;
+    AppliesToBuildRules = NO;
+}
diff --git a/Specifications/FileType/file.xcspec b/Specifications/FileType/file.xcspec
index 544d15c7..e43f919d 100644
--- a/Specifications/FileType/file.xcspec
+++ b/Specifications/FileType/file.xcspec
@@ -13,6 +13,6 @@
 
     UTI = "public.data";
     MIMETypes = (
-        "application/octet-stream",
+        "application/x-octet-stream",
     );
 }
diff --git a/Specifications/FileType/file.xib.xcspec b/Specifications/FileType/file.xib.xcspec
index 26cd1f60..19069277 100644
--- a/Specifications/FileType/file.xib.xcspec
+++ b/Specifications/FileType/file.xib.xcspec
@@ -16,4 +16,7 @@
     Extensions = (
         "xib",
     );
+    IncludeInIndex = YES;
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/folder.abstractassetcatalog.xcspec b/Specifications/FileType/folder.abstractassetcatalog.xcspec
new file mode 100644
index 00000000..f020915e
--- /dev/null
+++ b/Specifications/FileType/folder.abstractassetcatalog.xcspec
@@ -0,0 +1,18 @@
+/**
+ Copyright (c) 2015-present, Facebook, Inc.
+ All rights reserved.
+
+ This source code is licensed under the BSD-style license found in the
+ LICENSE file in the root directory of this source tree. An additional grant
+ of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+{
+    Type = FileType;
+    Identifier = folder.abstractassetcatalog;
+    BasedOn = wrapper;
+
+    UTI = "com.apple.dt.abstractassetcatalog";
+    IsTransparent = NO;
+}
+
diff --git a/Specifications/FileType/folder.assetcatalog.xcspec b/Specifications/FileType/folder.assetcatalog.xcspec
index 0532139f..89d9338a 100644
--- a/Specifications/FileType/folder.assetcatalog.xcspec
+++ b/Specifications/FileType/folder.assetcatalog.xcspec
@@ -10,10 +10,11 @@
 {
     Type = FileType;
     Identifier = folder.assetcatalog;
-    BasedOn = wrapper;
+    BasedOn = folder.abstractassetcatalog;
 
     UTI = "com.apple.dt.assetcatalog";
     Extensions = (
         "xcassets",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/folder.iconset.xcspec b/Specifications/FileType/folder.iconset.xcspec
index 7941ed56..cb15b747 100644
--- a/Specifications/FileType/folder.iconset.xcspec
+++ b/Specifications/FileType/folder.iconset.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "iconset",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/folder.imagecatalog.xcspec b/Specifications/FileType/folder.imagecatalog.xcspec
index 2700a393..9f8bfd0a 100644
--- a/Specifications/FileType/folder.imagecatalog.xcspec
+++ b/Specifications/FileType/folder.imagecatalog.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "imagecatalog",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/folder.skatlas.xcspec b/Specifications/FileType/folder.skatlas.xcspec
index b22824dc..6b2713ad 100644
--- a/Specifications/FileType/folder.skatlas.xcspec
+++ b/Specifications/FileType/folder.skatlas.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "atlas",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/folder.stickers.xcspec b/Specifications/FileType/folder.stickers.xcspec
new file mode 100644
index 00000000..98e7a164
--- /dev/null
+++ b/Specifications/FileType/folder.stickers.xcspec
@@ -0,0 +1,20 @@
+/**
+ Copyright (c) 2015-present, Facebook, Inc.
+ All rights reserved.
+
+ This source code is licensed under the BSD-style license found in the
+ LICENSE file in the root directory of this source tree. An additional grant
+ of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+{
+    Type = FileType;
+    Identifier = folder.stickers;
+    BasedOn = folder.abstractassetcatalog;
+
+    UTI = "com.apple.dt.stickers";
+    Extensions = (
+        "xcstickers",
+    );
+    IsTransparent = NO;
+}
diff --git a/Specifications/FileType/folder.xcspec b/Specifications/FileType/folder.xcspec
index 076461e3..3489e6c6 100644
--- a/Specifications/FileType/folder.xcspec
+++ b/Specifications/FileType/folder.xcspec
@@ -13,4 +13,7 @@
 
     UTI = "public.directory";
     IsFolder = YES;
+    IsTransparent = YES;
+    IncludeInIndex = YES;
+    CanSetIncludeInIndex = YES;
 }
diff --git a/Specifications/FileType/image.png.xcspec b/Specifications/FileType/image.png.xcspec
index f66be1ad..3ea00f32 100644
--- a/Specifications/FileType/image.png.xcspec
+++ b/Specifications/FileType/image.png.xcspec
@@ -20,6 +20,7 @@
         "image/png",
     );
     TypeCodes = (
+        "PNG ",
         "PNGf",
     );
 }
diff --git a/Specifications/FileType/sourcecode.asm.asm.xcspec b/Specifications/FileType/sourcecode.asm.asm.xcspec
index 7023093a..3bc21c4b 100644
--- a/Specifications/FileType/sourcecode.asm.asm.xcspec
+++ b/Specifications/FileType/sourcecode.asm.asm.xcspec
@@ -17,4 +17,5 @@
         "asm",
     );
     GccDialectName = "assembler-with-cpp";
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.asm.llvm.xcspec b/Specifications/FileType/sourcecode.asm.llvm.xcspec
index c482265f..6888110c 100644
--- a/Specifications/FileType/sourcecode.asm.llvm.xcspec
+++ b/Specifications/FileType/sourcecode.asm.llvm.xcspec
@@ -17,4 +17,5 @@
         "ll",
         "llx",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.asm.xcspec b/Specifications/FileType/sourcecode.asm.xcspec
index 133796dd..2e0a4f97 100644
--- a/Specifications/FileType/sourcecode.asm.xcspec
+++ b/Specifications/FileType/sourcecode.asm.xcspec
@@ -17,4 +17,5 @@
         "s",
     );
     GccDialectName = "assembler-with-cpp";
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.c.c.preprocessed.xcspec b/Specifications/FileType/sourcecode.c.c.preprocessed.xcspec
index 2556297b..7001dc2f 100644
--- a/Specifications/FileType/sourcecode.c.c.preprocessed.xcspec
+++ b/Specifications/FileType/sourcecode.c.c.preprocessed.xcspec
@@ -12,9 +12,10 @@
     Identifier = sourcecode.c.c.preprocessed;
     BasedOn = sourcecode.c.c;
 
-    UTI = "public.c-source-preprocessed";
+    UTI = "public.c-source.preprocessed";
     Extensions = (
         "i",
     );
     IsPreprocessed = YES;
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.c.c.xcspec b/Specifications/FileType/sourcecode.c.c.xcspec
index 6cda9590..764b5edc 100644
--- a/Specifications/FileType/sourcecode.c.c.xcspec
+++ b/Specifications/FileType/sourcecode.c.c.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "c",
     );
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.c.h.xcspec b/Specifications/FileType/sourcecode.c.h.xcspec
index bf1e9fd4..c57ff527 100644
--- a/Specifications/FileType/sourcecode.c.h.xcspec
+++ b/Specifications/FileType/sourcecode.c.h.xcspec
@@ -17,4 +17,7 @@
         "h",
         "pch",
     );
+    AppliesToBuildRules = NO;
+    IncludeInIndex = NO;
+    CanSetIncludeInIndex = NO;
 }
diff --git a/Specifications/FileType/sourcecode.c.objc.preprocessed.xcspec b/Specifications/FileType/sourcecode.c.objc.preprocessed.xcspec
index a45e3faa..fe5e59d1 100644
--- a/Specifications/FileType/sourcecode.c.objc.preprocessed.xcspec
+++ b/Specifications/FileType/sourcecode.c.objc.preprocessed.xcspec
@@ -12,9 +12,10 @@
     Identifier = sourcecode.c.objc.preprocessed;
     BasedOn = sourcecode.c.objc;
 
-    UTI = "public.objective-c-source-preprocessed";
+    UTI = "public.objective-c-source.preprocessed";
     Extensions = (
         "mi",
     );
     IsPreprocessed = YES;
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.c.objc.xcspec b/Specifications/FileType/sourcecode.c.objc.xcspec
index 8cfcf5c7..162a405b 100644
--- a/Specifications/FileType/sourcecode.c.objc.xcspec
+++ b/Specifications/FileType/sourcecode.c.objc.xcspec
@@ -17,4 +17,5 @@
         "m",
     );
     GccDialectName = "objective-c";
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.c.xcspec b/Specifications/FileType/sourcecode.c.xcspec
index c2ba27ec..1a25c162 100644
--- a/Specifications/FileType/sourcecode.c.xcspec
+++ b/Specifications/FileType/sourcecode.c.xcspec
@@ -15,4 +15,6 @@
     UTI = "public.c-source";
     GccDialectName = "c";
     IsScannedForIncludes = YES;
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.cpp.cpp.preprocessed.xcspec b/Specifications/FileType/sourcecode.cpp.cpp.preprocessed.xcspec
index 3c6faad6..80c6b62c 100644
--- a/Specifications/FileType/sourcecode.cpp.cpp.preprocessed.xcspec
+++ b/Specifications/FileType/sourcecode.cpp.cpp.preprocessed.xcspec
@@ -10,9 +10,9 @@
 {
     Type = FileType;
     Identifier = sourcecode.cpp.cpp.preprocessed;
-    BasedOn = sourcecode.cpp;
+    BasedOn = sourcecode.cpp.cpp;
 
-    UTI = "public.c-plus-plus-source-preprocessed";
+    UTI = "public.c-plus-plus-source.preprocessed";
     Extensions = (
         "ii",
     );
diff --git a/Specifications/FileType/sourcecode.cpp.cpp.xcspec b/Specifications/FileType/sourcecode.cpp.cpp.xcspec
index 1abb48b3..b5584b6d 100644
--- a/Specifications/FileType/sourcecode.cpp.cpp.xcspec
+++ b/Specifications/FileType/sourcecode.cpp.cpp.xcspec
@@ -22,4 +22,5 @@
         "c++",
         "tcc",
     );
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.cpp.h.xcspec b/Specifications/FileType/sourcecode.cpp.h.xcspec
index 55ad2e03..8f529541 100644
--- a/Specifications/FileType/sourcecode.cpp.h.xcspec
+++ b/Specifications/FileType/sourcecode.cpp.h.xcspec
@@ -23,4 +23,7 @@
         "ipp",
         "pch++",
     );
+    IncludeInIndex = NO;
+    CanSetIncludeInIndex = NO;
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.cpp.objcpp.xcspec b/Specifications/FileType/sourcecode.cpp.objcpp.xcspec
index ca3cdc16..9d01b3b4 100644
--- a/Specifications/FileType/sourcecode.cpp.objcpp.xcspec
+++ b/Specifications/FileType/sourcecode.cpp.objcpp.xcspec
@@ -18,4 +18,5 @@
         "mm",
     );
     GccDialectName = "objective-c++";
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.cpp.xcspec b/Specifications/FileType/sourcecode.cpp.xcspec
index c002ab6b..e686619d 100644
--- a/Specifications/FileType/sourcecode.cpp.xcspec
+++ b/Specifications/FileType/sourcecode.cpp.xcspec
@@ -14,4 +14,5 @@
 
     UTI = "public.c-plus-plus-source";
     GccDialectName = "c++";
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.dtrace.xcspec b/Specifications/FileType/sourcecode.dtrace.xcspec
index c3488f78..3902eabc 100644
--- a/Specifications/FileType/sourcecode.dtrace.xcspec
+++ b/Specifications/FileType/sourcecode.dtrace.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "d",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.dylan.xcspec b/Specifications/FileType/sourcecode.dylan.xcspec
index 2f2cb5cd..a03c4d59 100644
--- a/Specifications/FileType/sourcecode.dylan.xcspec
+++ b/Specifications/FileType/sourcecode.dylan.xcspec
@@ -17,4 +17,5 @@
         "lid",
         "dylan",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.fortran.f77.xcspec b/Specifications/FileType/sourcecode.fortran.f77.xcspec
index 7a98cc96..d0e0ab1e 100644
--- a/Specifications/FileType/sourcecode.fortran.f77.xcspec
+++ b/Specifications/FileType/sourcecode.fortran.f77.xcspec
@@ -16,5 +16,5 @@
     Extensions = (
         "f77",
     );
-    GccDialectName = "f77";
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.fortran.f90.xcspec b/Specifications/FileType/sourcecode.fortran.f90.xcspec
index 60e44454..c386eef4 100644
--- a/Specifications/FileType/sourcecode.fortran.f90.xcspec
+++ b/Specifications/FileType/sourcecode.fortran.f90.xcspec
@@ -17,5 +17,5 @@
         "f90",
         "f95",
     );
-    GccDialectName = "f95";
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.fortran.xcspec b/Specifications/FileType/sourcecode.fortran.xcspec
index 968032c9..c0aec8b6 100644
--- a/Specifications/FileType/sourcecode.fortran.xcspec
+++ b/Specifications/FileType/sourcecode.fortran.xcspec
@@ -18,4 +18,5 @@
         "for",
     );
     GccDialectName = "fortran";
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.glsl.xcspec b/Specifications/FileType/sourcecode.glsl.xcspec
index ce33beda..face0749 100644
--- a/Specifications/FileType/sourcecode.glsl.xcspec
+++ b/Specifications/FileType/sourcecode.glsl.xcspec
@@ -36,4 +36,5 @@
         "geom",
         "geometry",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.java.xcspec b/Specifications/FileType/sourcecode.java.xcspec
index 2334596e..92e08afc 100644
--- a/Specifications/FileType/sourcecode.java.xcspec
+++ b/Specifications/FileType/sourcecode.java.xcspec
@@ -16,5 +16,6 @@
     Extensions = (
         "java",
     );
-    GccDialectName = "java";
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.lex.xcspec b/Specifications/FileType/sourcecode.lex.xcspec
index 448586e7..7006d1a6 100644
--- a/Specifications/FileType/sourcecode.lex.xcspec
+++ b/Specifications/FileType/sourcecode.lex.xcspec
@@ -21,4 +21,5 @@
         "lpp",
         "lxx",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.make.xcspec b/Specifications/FileType/sourcecode.make.xcspec
index 4ddf3af3..ea39efcf 100644
--- a/Specifications/FileType/sourcecode.make.xcspec
+++ b/Specifications/FileType/sourcecode.make.xcspec
@@ -23,4 +23,5 @@
         "make",
         "gmk",
     );
+    RequiresHardTabs = YES;
 }
diff --git a/Specifications/FileType/sourcecode.metal.xcspec b/Specifications/FileType/sourcecode.metal.xcspec
index ca00d65e..dd769662 100644
--- a/Specifications/FileType/sourcecode.metal.xcspec
+++ b/Specifications/FileType/sourcecode.metal.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "metal",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.mig.xcspec b/Specifications/FileType/sourcecode.mig.xcspec
index 4f332d29..da0d51a3 100644
--- a/Specifications/FileType/sourcecode.mig.xcspec
+++ b/Specifications/FileType/sourcecode.mig.xcspec
@@ -17,4 +17,5 @@
         "defs",
         "mig",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.nasm.xcspec b/Specifications/FileType/sourcecode.nasm.xcspec
index 59e9debd..104131ff 100644
--- a/Specifications/FileType/sourcecode.nasm.xcspec
+++ b/Specifications/FileType/sourcecode.nasm.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "nasm",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.opencl.xcspec b/Specifications/FileType/sourcecode.opencl.xcspec
index e126fa8c..077fcca8 100644
--- a/Specifications/FileType/sourcecode.opencl.xcspec
+++ b/Specifications/FileType/sourcecode.opencl.xcspec
@@ -17,4 +17,5 @@
         "cl",
     );
     IsScannedForIncludes = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.pascal.xcspec b/Specifications/FileType/sourcecode.pascal.xcspec
index 0679400c..a16c264f 100644
--- a/Specifications/FileType/sourcecode.pascal.xcspec
+++ b/Specifications/FileType/sourcecode.pascal.xcspec
@@ -18,4 +18,5 @@
         "pp",
         "pas",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.rez.xcspec b/Specifications/FileType/sourcecode.rez.xcspec
index 32fcfac1..376851c7 100644
--- a/Specifications/FileType/sourcecode.rez.xcspec
+++ b/Specifications/FileType/sourcecode.rez.xcspec
@@ -18,4 +18,5 @@
         "rez",
     );
     IsScannedForIncludes = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.swift.xcspec b/Specifications/FileType/sourcecode.swift.xcspec
index c5e94bc6..d21b0cea 100644
--- a/Specifications/FileType/sourcecode.swift.xcspec
+++ b/Specifications/FileType/sourcecode.swift.xcspec
@@ -17,4 +17,7 @@
         "swift",
     );
     IsSwiftSourceCode = YES;
+    IsScannedForIncludes = NO;
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/sourcecode.text-based-dylib-definition.xcspec b/Specifications/FileType/sourcecode.text-based-dylib-definition.xcspec
index be2fdc3d..eb7900b7 100644
--- a/Specifications/FileType/sourcecode.text-based-dylib-definition.xcspec
+++ b/Specifications/FileType/sourcecode.text-based-dylib-definition.xcspec
@@ -18,4 +18,5 @@
     );
     IsLibrary = YES;
     IsDynamicLibrary = YES;
+    AppliesToBuildRules = NO;
 }
diff --git a/Specifications/FileType/sourcecode.xcspec b/Specifications/FileType/sourcecode.xcspec
index 5db39474..c6af0d82 100644
--- a/Specifications/FileType/sourcecode.xcspec
+++ b/Specifications/FileType/sourcecode.xcspec
@@ -14,4 +14,5 @@
 
     UTI = "public.source-code";
     IsSourceCode = YES;
+    IncludeInIndex = YES;
 }
diff --git a/Specifications/FileType/sourcecode.yacc.xcspec b/Specifications/FileType/sourcecode.yacc.xcspec
index 6efdba4b..918cb821 100644
--- a/Specifications/FileType/sourcecode.yacc.xcspec
+++ b/Specifications/FileType/sourcecode.yacc.xcspec
@@ -21,4 +21,5 @@
         "ypp",
         "yxx",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/text.pbxproj.xcspec b/Specifications/FileType/text.pbxproject.xcspec
similarity index 82%
rename from Specifications/FileType/text.pbxproj.xcspec
rename to Specifications/FileType/text.pbxproject.xcspec
index ded62233..c9ffc20e 100644
--- a/Specifications/FileType/text.pbxproj.xcspec
+++ b/Specifications/FileType/text.pbxproject.xcspec
@@ -9,11 +9,14 @@
 
 {
     Type = FileType;
-    Identifier = text.pbxproj;
+    Identifier = text.pbxproject;
     BasedOn = text;
 
     UTI = "com.apple.xcode.projectdata";
     Extensions = (
         "pbxproj",
     );
+    FilenamePatterns = (
+        "project.pbxproj",
+    );
 }
diff --git a/Specifications/FileType/archive.metal.xcspec b/Specifications/FileType/text.plist.entitlements.xcspec
similarity index 70%
rename from Specifications/FileType/archive.metal.xcspec
rename to Specifications/FileType/text.plist.entitlements.xcspec
index 509b0690..9a6073c3 100644
--- a/Specifications/FileType/archive.metal.xcspec
+++ b/Specifications/FileType/text.plist.entitlements.xcspec
@@ -9,11 +9,11 @@
 
 {
     Type = FileType;
-    Identifier = archive.metal;
-    BasedOn = archive;
+    Identifier = text.plist.entitlements;
+    BasedOn = text.plist;
 
-    UTI = "com.apple.metal-archive";
+    UTI = "com.apple.xcode.entitlements-property-list";
     Extensions = (
-        "metal-ar",
+        "entitlements",
     );
 }
diff --git a/Specifications/FileType/text.plist.pblangspec.xcspec b/Specifications/FileType/text.plist.pblangspec.xcspec
index 3d0b8c65..af1ccc93 100644
--- a/Specifications/FileType/text.plist.pblangspec.xcspec
+++ b/Specifications/FileType/text.plist.pblangspec.xcspec
@@ -12,7 +12,7 @@
     Identifier = text.plist.pblangspec;
     BasedOn = text.plist;
 
-    UTI = "com.apple.xcode.pblangspec-property-list";
+    UTI = "com.apple.projectbuilder.pblangspec-property-list";
     Extensions = (
         "pblangspec",
     );
diff --git a/Specifications/FileType/text.plist.strings.xcspec b/Specifications/FileType/text.plist.strings.xcspec
index bd427d5b..7661f9d8 100644
--- a/Specifications/FileType/text.plist.strings.xcspec
+++ b/Specifications/FileType/text.plist.strings.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         strings,
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/text.plist.stringsdict.xcspec b/Specifications/FileType/text.plist.stringsdict.xcspec
index b1ee15fc..9d05a7fd 100644
--- a/Specifications/FileType/text.plist.stringsdict.xcspec
+++ b/Specifications/FileType/text.plist.stringsdict.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         stringsdict,
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/text.plist.xcspec.xcspec b/Specifications/FileType/text.plist.xcspec.xcspec
index 605fb731..0677325a 100644
--- a/Specifications/FileType/text.plist.xcspec.xcspec
+++ b/Specifications/FileType/text.plist.xcspec.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "xcspec",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/text.script.php.xcspec b/Specifications/FileType/text.script.php.xcspec
index d74c0639..b06a7904 100644
--- a/Specifications/FileType/text.script.php.xcspec
+++ b/Specifications/FileType/text.script.php.xcspec
@@ -33,5 +33,4 @@
         "#!/usr/local/bin/php",
         "#! /usr/local/bin/php",
     );
-    IsExecutable = YES;
 }
diff --git a/Specifications/FileType/text.script.python.xcspec b/Specifications/FileType/text.script.python.xcspec
index f229d45b..c46b78d5 100644
--- a/Specifications/FileType/text.script.python.xcspec
+++ b/Specifications/FileType/text.script.python.xcspec
@@ -27,5 +27,4 @@
         "#!/usr/local/bin/python",
         "#! /usr/local/bin/python",
     );
-    IsExecutable = YES;
 }
diff --git a/Specifications/FileType/text.xcspec b/Specifications/FileType/text.xcspec
index 1291f716..de7e7112 100644
--- a/Specifications/FileType/text.xcspec
+++ b/Specifications/FileType/text.xcspec
@@ -20,5 +20,8 @@
     MIMETypes = (
         "text/plain",
     );
+    TypeCodes = (
+        "TEXT",
+    );
     IsTextFile = YES;
 }
diff --git a/Specifications/FileType/text.xml.dae.xcspec b/Specifications/FileType/text.xml.dae.xcspec
index cb2a4112..0c3124f8 100644
--- a/Specifications/FileType/text.xml.dae.xcspec
+++ b/Specifications/FileType/text.xml.dae.xcspec
@@ -19,4 +19,5 @@
     MIMETypes = (
         "model/vnd.collada+xml",
     );
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/text.xml.xcspec b/Specifications/FileType/text.xml.xcspec
index 4b4ae6ff..86c06368 100644
--- a/Specifications/FileType/text.xml.xcspec
+++ b/Specifications/FileType/text.xml.xcspec
@@ -19,8 +19,12 @@
     Extensions = (
         "xml",
         "dtd",
+        "xsl",
         "xslt",
         "xhtml",
+        "xconf",
+        "xmap",
+        "xsp",
     );
     MagicWord = (
         /* UTF-8 */
diff --git a/Specifications/FileType/video.avi.xcspec b/Specifications/FileType/video.avi.xcspec
index 88d90cc8..8f8d7b5e 100644
--- a/Specifications/FileType/video.avi.xcspec
+++ b/Specifications/FileType/video.avi.xcspec
@@ -15,14 +15,8 @@
     UTI = "public.avi";
     Extensions = (
         "avi",
-        "vfw",
-    );
-    TypeCodes = (
-        "Vfw ",
     );
     MIMETypes = (
         "video/avi",
-        "video/msvideo",
-        "video/x-msvideo",
     );
 }
diff --git a/Specifications/FileType/video.quicktime.xcspec b/Specifications/FileType/video.quicktime.xcspec
index 48f2ada8..8938c686 100644
--- a/Specifications/FileType/video.quicktime.xcspec
+++ b/Specifications/FileType/video.quicktime.xcspec
@@ -15,6 +15,7 @@
     UTI = "com.apple.quicktime-movie";
     Extensions = (
         "mov",
+        "moov",
         "qt",
     );
     TypeCodes = (
diff --git a/Specifications/FileType/wrapper.app-extension.xcspec b/Specifications/FileType/wrapper.app-extension.xcspec
index 803026bc..f025388b 100644
--- a/Specifications/FileType/wrapper.app-extension.xcspec
+++ b/Specifications/FileType/wrapper.app-extension.xcspec
@@ -17,6 +17,7 @@
         "appex",
         "pluginkit",
     );
+    IsTransparent = NO;
     IsEmbeddable = YES;
     IsExecutable = YES;
     CodeSignOnCopy = NO;
diff --git a/Specifications/FileType/wrapper.application.xcspec b/Specifications/FileType/wrapper.application.xcspec
index 3d3226d5..49796f0e 100644
--- a/Specifications/FileType/wrapper.application.xcspec
+++ b/Specifications/FileType/wrapper.application.xcspec
@@ -19,6 +19,7 @@
     TypeCodes = (
         "APPL",
     );
+    IsTransparent = NO;
     IsApplication = YES;
     IsEmbeddable = YES;
     IsExecutable = YES;
diff --git a/Specifications/FileType/wrapper.dsym.xcspec b/Specifications/FileType/wrapper.dsym.xcspec
index e2ebd377..027a38bd 100644
--- a/Specifications/FileType/wrapper.dsym.xcspec
+++ b/Specifications/FileType/wrapper.dsym.xcspec
@@ -17,4 +17,5 @@
         "dSYM",
         "dsym",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/wrapper.framework.xcspec b/Specifications/FileType/wrapper.framework.xcspec
index 4cf8c83b..e656a180 100644
--- a/Specifications/FileType/wrapper.framework.xcspec
+++ b/Specifications/FileType/wrapper.framework.xcspec
@@ -19,6 +19,6 @@
     TypeCodes = (
         "FMWK",
     );
+    IsEmbeddable = YES;
     IsFrameworkWrapper = YES;
-    CodeSignOnCopy = NO;
 }
diff --git a/Specifications/FileType/wrapper.htmld.xcspec b/Specifications/FileType/wrapper.htmld.xcspec
index aa611287..7b1a479e 100644
--- a/Specifications/FileType/wrapper.htmld.xcspec
+++ b/Specifications/FileType/wrapper.htmld.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "htmld",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/wrapper.installer-mpkg.xcspec b/Specifications/FileType/wrapper.installer-mpkg.xcspec
index e359683b..69f7f463 100644
--- a/Specifications/FileType/wrapper.installer-mpkg.xcspec
+++ b/Specifications/FileType/wrapper.installer-mpkg.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "mpkg",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/wrapper.installer-pkg.xcspec b/Specifications/FileType/wrapper.installer-pkg.xcspec
index f7ba9664..7d3bd688 100644
--- a/Specifications/FileType/wrapper.installer-pkg.xcspec
+++ b/Specifications/FileType/wrapper.installer-pkg.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "pkg",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/wrapper.java-classfolder.xcspec b/Specifications/FileType/wrapper.java-classfolder.xcspec
index 94d120d0..783e4862 100644
--- a/Specifications/FileType/wrapper.java-classfolder.xcspec
+++ b/Specifications/FileType/wrapper.java-classfolder.xcspec
@@ -13,4 +13,5 @@
     BasedOn = wrapper;
 
     UTI = "com.apple.java-class-folder";
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/wrapper.nib.xcspec b/Specifications/FileType/wrapper.nib.xcspec
index d96f9c51..de13b8e9 100644
--- a/Specifications/FileType/wrapper.nib.xcspec
+++ b/Specifications/FileType/wrapper.nib.xcspec
@@ -17,4 +17,8 @@
         "nib",
         "nib~",
     );
+    IsTransparent = NO;
+    IncludeInIndex = YES;
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/wrapper.rtfd.xcspec b/Specifications/FileType/wrapper.rtfd.xcspec
index f9f36b37..b836d852 100644
--- a/Specifications/FileType/wrapper.rtfd.xcspec
+++ b/Specifications/FileType/wrapper.rtfd.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "rtfd",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/wrapper.spotlight-importer.xcspec b/Specifications/FileType/wrapper.spotlight-importer.xcspec
index 2709b154..6a916274 100644
--- a/Specifications/FileType/wrapper.spotlight-importer.xcspec
+++ b/Specifications/FileType/wrapper.spotlight-importer.xcspec
@@ -16,5 +16,6 @@
     Extensions = (
         "mdimporter",
     );
+    IsTransparent = NO;
     IsEmbeddable = YES;
 }
diff --git a/Specifications/FileType/wrapper.storyboardc.xcspec b/Specifications/FileType/wrapper.storyboardc.xcspec
index 4809255e..a48e1e42 100644
--- a/Specifications/FileType/wrapper.storyboardc.xcspec
+++ b/Specifications/FileType/wrapper.storyboardc.xcspec
@@ -18,4 +18,7 @@
     );
     IsFolder = NO;
     IsWrapperFolder = YES;
+    IncludeInIndex = YES;
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/wrapper.workspace.xcspec b/Specifications/FileType/wrapper.workspace.xcspec
index 5a985645..9fa95f64 100644
--- a/Specifications/FileType/wrapper.workspace.xcspec
+++ b/Specifications/FileType/wrapper.workspace.xcspec
@@ -16,4 +16,5 @@
     Extensions = (
         "xcworkspace",
     );
+    IsTransparent = NO;
 }
diff --git a/Specifications/FileType/wrapper.xcclassmodel.xcspec b/Specifications/FileType/wrapper.xcclassmodel.xcspec
index 46821f7b..c0598465 100644
--- a/Specifications/FileType/wrapper.xcclassmodel.xcspec
+++ b/Specifications/FileType/wrapper.xcclassmodel.xcspec
@@ -16,4 +16,6 @@
     Extensions = (
         "xcclassmodel",
     );
+    IsTransparent = NO;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/wrapper.xcdatamodel.xcspec b/Specifications/FileType/wrapper.xcdatamodel.xcspec
index 1375411d..78d83e02 100644
--- a/Specifications/FileType/wrapper.xcdatamodel.xcspec
+++ b/Specifications/FileType/wrapper.xcdatamodel.xcspec
@@ -19,4 +19,7 @@
     IsFolder = NO;
     IsWrapperFolder = YES;
     IsTextFile = NO;
+    IncludeInIndex = YES;
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/wrapper.xcdatamodeld.xcspec b/Specifications/FileType/wrapper.xcdatamodeld.xcspec
index 4c79348c..594bb3ae 100644
--- a/Specifications/FileType/wrapper.xcdatamodeld.xcspec
+++ b/Specifications/FileType/wrapper.xcdatamodeld.xcspec
@@ -16,7 +16,10 @@
     Extensions = (
         "xcdatamodeld",
     );
-    IsFolder = NO;
+    IsFolder = YES;
     IsWrapperFolder = YES;
     IsTextFile = NO;
+    IncludeInIndex = YES;
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/wrapper.xcmappingmodel.xcspec b/Specifications/FileType/wrapper.xcmappingmodel.xcspec
index 125b05ee..97eefc97 100644
--- a/Specifications/FileType/wrapper.xcmappingmodel.xcspec
+++ b/Specifications/FileType/wrapper.xcmappingmodel.xcspec
@@ -19,4 +19,7 @@
     IsFolder = NO;
     IsWrapperFolder = YES;
     IsTextFile = NO;
+    IncludeInIndex = YES;
+    CanSetIncludeInIndex = YES;
+    AppliesToBuildRules = YES;
 }
diff --git a/Specifications/FileType/wrapper.xcspec b/Specifications/FileType/wrapper.xcspec
index e17b4b7f..daf99f56 100644
--- a/Specifications/FileType/wrapper.xcspec
+++ b/Specifications/FileType/wrapper.xcspec
@@ -12,6 +12,8 @@
     Identifier = wrapper;
     BasedOn = folder;
 
-    IsWrapperFolder = YES;
     UTI = "com.apple.package";
+    IsWrapperFolder = YES;
+    IncludeInIndex = NO;
+    CanSetIncludeInIndex = NO;
 }
diff --git a/Specifications/FileType/wrapper.xpc-service.xcspec b/Specifications/FileType/wrapper.xpc-service.xcspec
index 509cc6c0..896aed21 100644
--- a/Specifications/FileType/wrapper.xpc-service.xcspec
+++ b/Specifications/FileType/wrapper.xpc-service.xcspec
@@ -16,6 +16,7 @@
     Extensions = (
         "xpc",
     );
+    IsTransparent = NO;
     IsEmbeddable = YES;
     IsExecutable = YES;
     CodeSignOnCopy = NO;