diff --git a/Case/manifest.mf b/Case/manifest.mf
index a14a27b0c9..e581cd0028 100644
--- a/Case/manifest.mf
+++ b/Case/manifest.mf
@@ -1,7 +1,8 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.casemodule/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/casemodule/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/casemodule/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.casemodule/1
+OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/casemodule/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/casemodule/Bundle.properties
+OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
+
diff --git a/CoreComponentInterfaces/manifest.mf b/CoreComponentInterfaces/manifest.mf
index 9a51404ae7..a1988b3db9 100644
--- a/CoreComponentInterfaces/manifest.mf
+++ b/CoreComponentInterfaces/manifest.mf
@@ -1,7 +1,8 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.corecomponentinterfaces/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.corecomponentinterfaces/1
+OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties
+OpenIDE-Module-Requires: org.openide.windows.WindowManager
+
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml b/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml
index 6303ad875c..8a00fbd9d9 100644
--- a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml
+++ b/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml
@@ -10,6 +10,9 @@
         <folder name="Advanced.instance_hidden"/> <!-- Miscellaneous -->
     </folder>
     <file name="OptionsExport_hidden"/> <!-- Hide import/export in Options -->
+    <folder name="PluginsDialog">
+        <folder name="RCPPlatform.instance_hidden"/>
+    </folder>
     
 <!--<attr name="Menu\File\Separator2.instance_hidden\position" intvalue="100"/>
     <attr name="Menu\File\Separator3.instance_hidden\position" intvalue="200"/>
@@ -66,7 +69,7 @@
             <file name="testAction.shadow_hidden"/>
         </folder>
         <folder name="Tools">
-            <file name="org-netbeans-modules-autoupdate-ui-actions-PluginManagerAction.shadow_hidden"/>
+            <file name="org-netbeans-modules-autoupdate-ui-actions-PluginManagerAction.shadow"/>
             <file name="org-netbeans-modules-favorites-templates-TemplatesAction.shadow_hidden"/>
             <file name="org-netbeans-modules-options-OptionsWindowAction.shadow"/>
             <file name="org-openide-actions-ToolsAction.shadow_hidden"/>
diff --git a/CoreComponents/manifest.mf b/CoreComponents/manifest.mf
index 31e5a700d1..5b2cf51b04 100644
--- a/CoreComponents/manifest.mf
+++ b/CoreComponents/manifest.mf
@@ -1,8 +1,9 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.corecomponents/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Install: org/sleuthkit/autopsy/corecomponents/Installer.class
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/corecomponents/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/corecomponents/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.corecomponents/1
+OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Install: org/sleuthkit/autopsy/corecomponents/Installer.class
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/corecomponents/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/corecomponents/Bundle.properties
+OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
+
diff --git a/CoreUtils/manifest.mf b/CoreUtils/manifest.mf
index 2fd5a80363..2aa3cf5594 100644
--- a/CoreUtils/manifest.mf
+++ b/CoreUtils/manifest.mf
@@ -1,6 +1,7 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.coreutils/0
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Install: org/sleuthkit/autopsy/coreutils/Installer.class
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/coreutils/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/coreutils/Bundle.properties
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.coreutils/0
+OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Install: org/sleuthkit/autopsy/coreutils/Installer.class
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/coreutils/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/coreutils/Bundle.properties
diff --git a/DataModel/manifest.mf b/DataModel/manifest.mf
index 65c31289e3..96d427757f 100644
--- a/DataModel/manifest.mf
+++ b/DataModel/manifest.mf
@@ -1,6 +1,7 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.datamodel/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Install: org/sleuthkit/autopsy/datamodel/Installer.class
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/datamodel/Bundle.properties
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.datamodel/1
+OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Install: org/sleuthkit/autopsy/datamodel/Installer.class
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/datamodel/Bundle.properties
+
diff --git a/DirectoryTree/manifest.mf b/DirectoryTree/manifest.mf
index 8b89b66bac..e4bff5d586 100644
--- a/DirectoryTree/manifest.mf
+++ b/DirectoryTree/manifest.mf
@@ -1,7 +1,8 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.directorytree/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/directorytree/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/directorytree/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.directorytree/1
+OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/directorytree/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/directorytree/Bundle.properties
+OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
+
diff --git a/ExifParser/manifest.mf b/ExifParser/manifest.mf
index 1c48182980..4d76da9d1c 100644
--- a/ExifParser/manifest.mf
+++ b/ExifParser/manifest.mf
@@ -1,5 +1,6 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.exifparser
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/exifparser/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/exifparser/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.exifparser
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/exifparser/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/exifparser/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
diff --git a/FileSearch/manifest.mf b/FileSearch/manifest.mf
index 47c3c1544d..01896c1faf 100644
--- a/FileSearch/manifest.mf
+++ b/FileSearch/manifest.mf
@@ -1,7 +1,8 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.filesearch/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/filesearch/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/filesearch/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.filesearch/1
+OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/filesearch/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/filesearch/Bundle.properties
+OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
+
diff --git a/HashDatabase/manifest.mf b/HashDatabase/manifest.mf
index 896d3ff7a6..89301ef550 100644
--- a/HashDatabase/manifest.mf
+++ b/HashDatabase/manifest.mf
@@ -1,6 +1,7 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.hashdatabase
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/hashdatabase/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/hashdatabase/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.hashdatabase
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/hashdatabase/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/hashdatabase/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/Ingest/manifest.mf b/Ingest/manifest.mf
index 2df9e1e6c7..8067fb49fc 100644
--- a/Ingest/manifest.mf
+++ b/Ingest/manifest.mf
@@ -1,10 +1,11 @@
-Manifest-Version: 1.0
-Bundle-Localization: org/sleuthkit/autopsy/ingest/Bundle
-Bundle-Name: %OpenIDE-Module-Name
-Bundle-SymbolicName: org.sleuthkit.autopsy.ingest/1
-OpenIDE-Module-Implementation-Version: 1
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/ingest/layer.xml
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module: org.sleuthkit.autopsy.ingest/0
-OpenIDE-Module-Install: org/sleuthkit/autopsy/ingest/Installer.class
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+Bundle-Localization: org/sleuthkit/autopsy/ingest/Bundle
+Bundle-Name: %OpenIDE-Module-Name
+Bundle-SymbolicName: org.sleuthkit.autopsy.ingest/1
+OpenIDE-Module-Implementation-Version: 1
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/ingest/layer.xml
+OpenIDE-Module-Requires: org.openide.windows.WindowManager
+OpenIDE-Module: org.sleuthkit.autopsy.ingest/0
+OpenIDE-Module-Install: org/sleuthkit/autopsy/ingest/Installer.class
+
diff --git a/KeywordSearch/manifest.mf b/KeywordSearch/manifest.mf
index 08495144a6..9c1b47bef7 100644
--- a/KeywordSearch/manifest.mf
+++ b/KeywordSearch/manifest.mf
@@ -1,8 +1,9 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.keywordsearch/0
-OpenIDE-Module-Implementation-Version: 1
-OpenIDE-Module-Install: org/sleuthkit/autopsy/keywordsearch/Installer.class
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/keywordsearch/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/keywordsearch/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.keywordsearch/0
+OpenIDE-Module-Implementation-Version: 1
+OpenIDE-Module-Install: org/sleuthkit/autopsy/keywordsearch/Installer.class
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/keywordsearch/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+OpenIDE-Module-Requires: org.openide.windows.WindowManager
+
diff --git a/MenuActions/manifest.mf b/MenuActions/manifest.mf
index ea95b5d60f..f3b9849580 100644
--- a/MenuActions/manifest.mf
+++ b/MenuActions/manifest.mf
@@ -1,6 +1,7 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.menuactions/0
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/menuactions/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/menuactions/Bundle.properties
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.menuactions/0
+OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/menuactions/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/menuactions/Bundle.properties
+
diff --git a/RecentActivity/manifest.mf b/RecentActivity/manifest.mf
index b8bdf7aa3b..523a101d00 100644
--- a/RecentActivity/manifest.mf
+++ b/RecentActivity/manifest.mf
@@ -1,10 +1,10 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.recentactivity
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/recentactivity/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/recentactivity/Bundle.properties
-OpenIDE-Module-Requires: 
-  org.openide.modules.InstalledFileLocator,
-  org.openide.windows.TopComponent$Registry,
-  org.openide.windows.WindowManager
-OpenIDE-Module-Specification-Version: 1.0
-
+Manifest-Version: 1.0
+OpenIDE-Module: org.sleuthkit.autopsy.recentactivity
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/recentactivity/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/recentactivity/Bundle.properties
+OpenIDE-Module-Requires: 
+  org.openide.modules.InstalledFileLocator,
+  org.openide.windows.TopComponent$Registry,
+  org.openide.windows.WindowManager
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/Report/manifest.mf b/Report/manifest.mf
index 110edc98a7..fba45279df 100644
--- a/Report/manifest.mf
+++ b/Report/manifest.mf
@@ -1,6 +1,7 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.report
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/report/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/report/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.report
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/report/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/report/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/Testing/manifest.mf b/Testing/manifest.mf
index a4acafe8e5..eeedf281a2 100644
--- a/Testing/manifest.mf
+++ b/Testing/manifest.mf
@@ -1,5 +1,6 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.testing
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/testing/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.testing
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/testing/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index 98370003c6..20547ea935 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -1,109 +1,14 @@
-netbeans-plat-version=7.2
-suite.dir=${basedir}
-nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
-harness.dir=${nbplatform.active.dir}/harness
-bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
-autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
-cluster.path=\
-    ${nbplatform.active.dir}/harness:\
-    ${nbplatform.active.dir}/java:\
-    ${nbplatform.active.dir}/platform
-disabled.modules=\
-    org.apache.tools.ant.module,\
-    org.netbeans.api.debugger.jpda,\
-    org.netbeans.api.java,\
-    org.netbeans.libs.cglib,\
-    org.netbeans.libs.javacapi,\
-    org.netbeans.libs.javacimpl,\
-    org.netbeans.libs.jsr223,\
-    org.netbeans.libs.springframework,\
-    org.netbeans.modules.ant.browsetask,\
-    org.netbeans.modules.ant.debugger,\
-    org.netbeans.modules.ant.freeform,\
-    org.netbeans.modules.ant.grammar,\
-    org.netbeans.modules.ant.kit,\
-    org.netbeans.modules.beans,\
-    org.netbeans.modules.classfile,\
-    org.netbeans.modules.dbschema,\
-    org.netbeans.modules.debugger.jpda,\
-    org.netbeans.modules.debugger.jpda.ant,\
-    org.netbeans.modules.debugger.jpda.projects,\
-    org.netbeans.modules.debugger.jpda.ui,\
-    org.netbeans.modules.form,\
-    org.netbeans.modules.form.j2ee,\
-    org.netbeans.modules.form.kit,\
-    org.netbeans.modules.hibernate,\
-    org.netbeans.modules.hibernatelib,\
-    org.netbeans.modules.hudson.ant,\
-    org.netbeans.modules.hudson.maven,\
-    org.netbeans.modules.i18n,\
-    org.netbeans.modules.i18n.form,\
-    org.netbeans.modules.j2ee.core.utilities,\
-    org.netbeans.modules.j2ee.eclipselink,\
-    org.netbeans.modules.j2ee.eclipselinkmodelgen,\
-    org.netbeans.modules.j2ee.jpa.refactoring,\
-    org.netbeans.modules.j2ee.jpa.verification,\
-    org.netbeans.modules.j2ee.metadata,\
-    org.netbeans.modules.j2ee.metadata.model.support,\
-    org.netbeans.modules.j2ee.persistence,\
-    org.netbeans.modules.j2ee.persistence.kit,\
-    org.netbeans.modules.j2ee.persistenceapi,\
-    org.netbeans.modules.j2ee.toplinklib,\
-    org.netbeans.modules.java.api.common,\
-    org.netbeans.modules.java.debug,\
-    org.netbeans.modules.java.editor,\
-    org.netbeans.modules.java.editor.lib,\
-    org.netbeans.modules.java.examples,\
-    org.netbeans.modules.java.freeform,\
-    org.netbeans.modules.java.guards,\
-    org.netbeans.modules.java.helpset,\
-    org.netbeans.modules.java.hints,\
-    org.netbeans.modules.java.hints.processor,\
-    org.netbeans.modules.java.j2seplatform,\
-    org.netbeans.modules.java.j2seproject,\
-    org.netbeans.modules.java.kit,\
-    org.netbeans.modules.java.lexer,\
-    org.netbeans.modules.java.navigation,\
-    org.netbeans.modules.java.platform,\
-    org.netbeans.modules.java.preprocessorbridge,\
-    org.netbeans.modules.java.project,\
-    org.netbeans.modules.java.source,\
-    org.netbeans.modules.java.source.ant,\
-    org.netbeans.modules.java.sourceui,\
-    org.netbeans.modules.javadoc,\
-    org.netbeans.modules.javawebstart,\
-    org.netbeans.modules.maven,\
-    org.netbeans.modules.maven.coverage,\
-    org.netbeans.modules.maven.embedder,\
-    org.netbeans.modules.maven.grammar,\
-    org.netbeans.modules.maven.graph,\
-    org.netbeans.modules.maven.hints,\
-    org.netbeans.modules.maven.indexer,\
-    org.netbeans.modules.maven.junit,\
-    org.netbeans.modules.maven.kit,\
-    org.netbeans.modules.maven.model,\
-    org.netbeans.modules.maven.osgi,\
-    org.netbeans.modules.maven.persistence,\
-    org.netbeans.modules.maven.repository,\
-    org.netbeans.modules.maven.search,\
-    org.netbeans.modules.maven.spring,\
-    org.netbeans.modules.projectimport.eclipse.core,\
-    org.netbeans.modules.projectimport.eclipse.j2se,\
-    org.netbeans.modules.refactoring.java,\
-    org.netbeans.modules.spellchecker.bindings.java,\
-    org.netbeans.modules.spring.beans,\
-    org.netbeans.modules.swingapp,\
-    org.netbeans.modules.websvc.jaxws21,\
-    org.netbeans.modules.websvc.jaxws21api,\
-    org.netbeans.modules.websvc.saas.codegen.java,\
-    org.netbeans.modules.xml.jaxb,\
-    org.netbeans.modules.xml.tools.java,\
-    org.openide.compat,\
-    org.openide.util.enumerations,\
-    org.netbeans.modules.findbugs.installer,\
-    org.netbeans.modules.java.testrunner,\
-    org.netbeans.modules.testng,\
-    org.netbeans.modules.testng.maven,\
-    org.netbeans.modules.testng.ant,\
-    org.netbeans.modules.junit
-
+branding.token=autopsy
+netbeans-plat-version=7.2
+suite.dir=${basedir}
+nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
+harness.dir=${nbplatform.active.dir}/harness
+bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
+autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
+cluster.path=\
+    ${nbplatform.active.dir}/harness:\
+    ${nbplatform.active.dir}/java:\
+    ${nbplatform.active.dir}/platform
+disabled.modules=\
+    org.netbeans.modules.core.kit
+
diff --git a/thunderbirdparser/manifest.mf b/thunderbirdparser/manifest.mf
index d7eac29b01..3c83ac5f55 100644
--- a/thunderbirdparser/manifest.mf
+++ b/thunderbirdparser/manifest.mf
@@ -1,6 +1,7 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.thunderbirdparser
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/thunderbirdparser/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.sleuthkit.autopsy.thunderbirdparser
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/thunderbirdparser/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+