diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems.xml b/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems.xml
deleted file mode 100644
index 821a3d7ffe..0000000000
--- a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-    <!-- 
-        This is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Imagery Band 1 (0.64u)" id="Img0.64">
-        <substitute key="parameter" value="0.64Ref" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Imagery Band 2 (0.865u)" id="Img0.865">
-        <substitute key="parameter" value="0.865Ref" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Imagery Band 3 (1.61u)" id="Img1.61">
-        <substitute key="parameter" value="1.61Ref" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Imagery Band 4 (3.74u)" id="Img3.74">
-        <substitute key="parameter" value="3.74BT" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Imagery Band 5 (11.45u)" id="Img11.45">
-        <substitute key="parameter" value="11.45BT" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Moderate Band 6 (0.746u)" id="Mod0.746">
-        <substitute key="parameter" value="0.746Ref" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Moderate Band 9 (1.378u)" id="Mod1.378">
-        <substitute key="parameter" value="1.378Ref" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Moderate Band 13 (4.05u)" id="Mod4.05">
-        <substitute key="parameter" value="4.05BT" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Moderate Band 15 (10.763u)" id="Mod10.763">
-        <substitute key="parameter" value="10.763BT" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-        menuText="Moderate Band 16 (12.013u)" id="Mod12.013">
-        <substitute key="parameter" value="12.013BT" />
-    </contribute>
-    <contribute xsi:type="bundleItem"
-        file="bundles/npp/viirs/viirsDayNightBandImagery.xml" menuText="Day/Night Band (0.7u)"
-        id="DNB0.7">
-        <substitute key="channelType" value="DNB" />
-    </contribute>
-    <contribute xsi:type="bundleItem"
-        file="bundles/npp/viirs/viirsDayNightBandImagery.xml" menuText="Near Constant Contrast (0.7u)"
-        id="NCC0.7">
-        <substitute key="channelType" value="NCC" />
-    </contribute>
-    <!-- Uncomment to include sample 'True Color' RGB Composites -->
-    <!--
-    <contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsRGBBundleItems.xml"/>
-    -->
-</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsMenuItems.xml b/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsMenuItems.xml
deleted file mode 100644
index 797733e451..0000000000
--- a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsMenuItems.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="titleItem" titleText="------ NPP VIIRS ------" id="ImageryLine"/>
-	<!-- NCC Near Constant Contrast  -->
-	<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
-		menuText="Near Constant Contrast (0.7u)" id="NCC0.7">
-		<substitute key="channelType" value="NCC"/>
-	</contribute>
-	<!-- AK VIIRS bands available on NOAAport -->
-	<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-		menuText="Alaska - Imagery Band 1 (0.64u)" id="Img0.64">
-		<substitute key="parameter" value="0.64Ref"/>
-		<substitute key="region" value="Alaska"/>
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-		menuText="Alaska - Imagery Band 4 (3.74u)" id="Img3.74">
-		<substitute key="parameter" value="3.74BT"/>
-		<substitute key="region" value="Alaska"/>
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-		menuText="Alaska - Imagery Band 5 (11.45u)" id="Img11.45">
-		<substitute key="parameter" value="11.45BT"/>
-		<substitute key="region" value="Alaska"/>
-	</contribute>
-</menuTemplate>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseSatellite.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseSatellite.xml
index cfcefff2a0..d503c8b23a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseSatellite.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseSatellite.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <contribute xsi:type="titleItem" titleText="------ Legacy Satellitle Data ------" id="legacySat"/>
     <contribute xsi:type="subMenu" menuText="Legacy Satellite Data">
-   
     <contribute xsi:type="titleItem" titleText="------ Composite Imagery ------" id="CompositeImagery" />
         <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
 	                menuText="Global Rectilinear 20km IR" id="waterVapor">
diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/localization/bundles/npp/nucapsAvailability.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.nucaps/localization/bundles/npp/nucapsAvailability.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/soundingAvailability.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/soundingAvailability.xml
new file mode 100644
index 0000000000..c2d461a3c8
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/soundingAvailability.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+<bundle>
+    <displayList>
+        <displays xsi:type="mapRenderableDisplay"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <descriptor xsi:type="mapDescriptor">
+                <resource>
+                    <loadProperties />
+                    <resourceData xsi:type="nppSoundingMapResourceData">
+                        <nsharpResourceData>${soundingResourceData}</nsharpResourceData>
+                        <resourceName>${name;Unknown}</resourceName>
+                        <metadataMap>
+                            <mapping key="pluginName">
+                                <constraint constraintValue="${pluginName}"
+                                    constraintType="EQUALS" />
+                            </mapping>
+                        </metadataMap>
+                    </resourceData>
+                </resource>
+            </descriptor>
+        </displays>
+    </displayList>
+</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/index.xml
old mode 100644
new mode 100755
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/index.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/index.xml
diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/nucapsMenuItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/nucapsMenuItems.xml
old mode 100644
new mode 100755
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/nucapsMenuItems.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/nucapsMenuItems.xml
diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/localization/nucaps/nucapsConfig.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/nucaps/nucapsConfig.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.nucaps/localization/nucaps/nucapsConfig.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/nucaps/nucapsConfig.xml
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/singlePanelComposite.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/npp/viirs/singlePanelComposite.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/singlePanelComposite.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/npp/viirs/singlePanelComposite.xml
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsDayNightBandImagery.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/npp/viirs/viirsDayNightBandImagery.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsDayNightBandImagery.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/npp/viirs/viirsDayNightBandImagery.xml
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsImagery.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/npp/viirs/viirsImagery.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsImagery.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/npp/viirs/viirsImagery.xml
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/index.xml
old mode 100644
new mode 100755
similarity index 93%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/index.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/index.xml
index 660f4cffda..eb24e39a80
--- a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/index.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/index.xml
@@ -24,6 +24,6 @@
         of the file. 
     -->
 <menuContributionFile>
-    <include installTo="menu:satellite"
+    <include installTo="menu:NPPProducts?after=Imagery"
         fileName="menus/npp/viirs/viirsMenuItems.xml" />
-</menuContributionFile>
+</menuContributionFile>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml
new file mode 100755
index 0000000000..391fa8e3ec
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+   <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+   <!--  Lee Byerle  1/3/2018 -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <contribute xsi:type="titleItem" id="VIIRSTitleJPSS" titleText="------ Imagery ------"/>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="0.64 μm Imagery Band 1 (CH 01)" id="Img0.64J">
+    <substitute key="parameter" value="0.64Ref"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="3.74 μm Imagery Band 4 (CH 04)" id="Img3.74J">
+    <substitute key="parameter" value="3.74BT"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="11.45 μm Imagery Band 5 (CH 05)" id="Img11.45J">
+    <substitute key="parameter" value="11.45BT"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="0.7 μm Near Constant Contrast" id="Moderate0.7J">
+  <substitute key="channelType" value="Moderate"/>
+  </contribute>
+</menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml
new file mode 100755
index 0000000000..653d753bf5
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+   <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+   <!--   Lee Byerle  1/3/2018 -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <contribute xsi:type="titleItem" id="VIIRSTitleJPSS" titleText="------ Imagery ------"/>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="0.7 μm Near Constant Contrast" id="Moderate0.7J">
+  <substitute key="channelType" value="Moderate"/> 
+  </contribute>
+</menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems.xml
new file mode 100755
index 0000000000..e1837edfa3
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+   <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+    <!-- Lee Byerle 1/3/2018 -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <contribute xsi:type="titleItem" id="VIIRSTitle" titleText="------ Imagery ------"/>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="0.7 μm Near Constant Contrast" id="Moderate0.7">
+  <substitute key="channelType" value="Moderate"/> 
+  </contribute>
+  
+  <!-- Uncomment to include sample 'True Color' RGB Composites -->
+  <!--
+  <contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsRGBBundleItems.xml"/>
+  -->
+</menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems_AK.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems_AK.xml
new file mode 100755
index 0000000000..1fcfcaebf3
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems_AK.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+   <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+    <!-- Lee Byerle 8/1/2018 -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <contribute xsi:type="titleItem" id="VIIRSTitle" titleText="------ Imagery ------"/>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="0.64 μm Imagery Band 1 (CH 01)" id="Img0.64">
+    <substitute key="parameter" value="0.64Ref"/>
+  </contribute>
+<!--
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="0.865 μm Imagery Band 2 (CH 02)" id="Img0.865">
+    <substitute key="parameter" value="0.865Ref"/>
+  </contribute>
+   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="1.61 μm Imagery Band 3 (CH I3 (R))" id="Img1.61">
+    <substitute key="parameter" value="1.61Ref"/>
+  </contribute> 
+-->
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="3.74 μm Imagery Band 4 (CH 04)" id="Img3.74">
+    <substitute key="parameter" value="3.74BT"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="11.45 μm Imagery Band 5 (CH 05)" id="Img11.45">
+    <substitute key="parameter" value="11.45BT"/>
+  </contribute>
+  <!-- <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="Moderate Band 6 (0.746u)" id="Mod0.746">
+    <substitute key="parameter" value="0.746Ref"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="Moderate Band 9 (1.378u)" id="Mod1.378">
+    <substitute key="parameter" value="1.378Ref"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="Moderate Band 13 (4.05u)" id="Mod4.05">
+    <substitute key="parameter" value="4.05BT"/>
+  </contribute> 
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="Moderate Band 14 (8.55u)" id="Mod8.55">
+    <substitute key="parameter" value="8.55BT"/>
+    </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="Moderate Band 15 (10.763u)" id="Mod10.763">
+    <substitute key="parameter" value="10.763BT"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
+    menuText="Moderate Band 16 (12.013u)" id="Mod12.013">
+    <substitute key="parameter" value="12.013BT"/>
+  </contribute> 
+-->
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="0.7 μm Near Constant Contrast" id="Moderate0.7">
+  <substitute key="channelType" value="Moderate"/>
+  </contribute>
+  
+  <!-- Uncomment to include sample 'True Color' RGB Composites -->
+  <!--
+  <contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsRGBBundleItems.xml"/>
+  -->
+</menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml
new file mode 100755
index 0000000000..b7a25f46e9
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+   <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+    <!-- TOWRdocs Header
+         S-NPP and NOAA-20 VIIRS menu set-up for geographic region selection.
+    -->
+    <!-- TOWRdocs Description
+         This file specifies different regions to pick from in the S-NPP VIIRS menu. When the
+         Satellite, then "S-NPP and NOAA-20" is selected, this file links that selection to regions
+         (e.g. CONUS, Alaska, Pacific).  The regions, listed below, are in turn associated
+         in the menuTemplate with the BundleItems file in this same directory. The 
+         bundles (in /cave_static/bundles) are then contributed and result in the display
+         of available versions of the product if they are in the database.  The bundle for the AK
+         region is different (viirsBundleItems_AK.xml) because it includes hi-res imagery channels
+         1,2,4 for VIIRS imagery, not available in the other regions.
+    -->
+    <!-- TOWRdocs Status
+         1/2/2018 Added NOAA-20 entries, with JPSS placed in the region key values. menuText updated to 
+         specify S-NPP and NOAA-20. Bundle items specific to NOAA-20 are referenced and the
+         directory path to those files is updated (/jpss sub-dir)
+    -->
+    <!-- TOWRdocs POC
+         Lee Byerle 1/2/2018
+   -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <contribute xsi:type="titleItem" titleText="------ S-NPP ------" id="ImageryLine"/>
+
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="S-NPP CONUS - 0.7 μm Near Constant Contrast" id="Moderate0.7">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="CONUS"/>
+  </contribute>
+
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="S-NPP Pacific - 0.7 μm Near Constant Contrast" id="Moderate0.7">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="Pacific"/>
+  </contribute>
+
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="S-NPP Puerto Rico - 0.7 μm Near Constant Contrast" id="Moderate0.7">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="Puerto Rico"/>
+  </contribute>
+  <contribute xsi:type="subMenu" menuText="S-NPP Alaska" id="Alaskaid">
+    <contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems_AK.xml">
+      <substitute key="region" value="Alaska"/>
+    </contribute>
+  </contribute>
+
+
+  <contribute xsi:type="titleItem" titleText="------ NOAA-20 ------" id="ImageryLine"/>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="NOAA-20 CONUS - 0.7 μm Near Constant Contrast" id="Moderate0.7J">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="CONUSJPSS"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="NOAA-20 Pacific - 0.7 μm Near Constant Contrast" id="Moderate0.7J">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="PacificJPSS"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="NOAA-20 Puerto Rico - 0.7 μm Near Constant Contrast" id="Moderate0.7J">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="Puerto_RicoJPSS"/>
+  </contribute>
+  <contribute xsi:type="subMenu" menuText="NOAA-20 Alaska" id="AlaskaidJPSS">
+    <contribute xsi:type="subinclude" fileName="menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml">
+      <substitute key="region" value="AlaskaJPSS"/>
+    </contribute>
+  </contribute>
+</menuTemplate>
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsRGBBundleItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsRGBBundleItems.xml
old mode 100644
new mode 100755
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsRGBBundleItems.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsRGBBundleItems.xml
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/viirs/viirsHeaderMapping.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/viirs/viirsHeaderMapping.xml
index 15fadda491..68b7db0bf4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/viirs/viirsHeaderMapping.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/viirs/viirsHeaderMapping.xml
@@ -2,53 +2,73 @@
     <!--
         This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
         pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-
+        
         U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
         This_software_product_contains_export-restricted_data_whose
         export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
         to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
         an_export_license_or_other_authorization.
-
+        
         Contractor_Name:________Raytheon_Company
         Contractor_Address:_____6825_Pine_Street,_Suite_340
         ________________________Mail_Stop_B8
         ________________________Omaha,_NE_68106
         ________________________402.291.0100
-
+        
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-
-    <!--
-        This is an absolute override file, indicating that a higher priority
+   <!-- 
+        This is an absolute override file, indicating that a higher priority 
         version of the file will completely replace a lower priority version
-        of the file.
+        of the file. 
     -->
+    <!-- Updated 1/2/2018 Lee Byerle -->
 <viirsHeaderMapping>
-  <!-- NOTE, the only sure channelInfo mapping is I1-I5, update as more come in -->
   <!-- Alaska region -->
   <regionInfo id="TIPB">
     <region>Alaska</region>
   </regionInfo>
 
-  <!-- Global region -->
-  <regionInfo id="TIPG">
-    <region>Global</region>
-  </regionInfo>
+    <!-- 1/2/2018 NOAA-20 Alaska region -->
+    <regionInfo id="TIPA">
+        <region>AlaskaJPSS</region>
+    </regionInfo>
+
+
+    <!-- Global region -->
+    <regionInfo id="TIPG">
+        <region>Global</region>
+    </regionInfo>
 
 
   <regionInfo id="TIPC">
     <region>CONUS</region>
   </regionInfo>
 
+    <!-- 1/2/2018 NOAA-20 CONUS region -->
+  <regionInfo id="TIPD">
+    <region>CONUSJPSS</region>
+  </regionInfo>
+
   <regionInfo id="TIPI">
     <region>Pacific</region>
   </regionInfo>
 
+    <!-- 1/2/2018 NOAA-20 Pacific region -->
+  <regionInfo id="TIPH">
+    <region>PacificJPSS</region>
+  </regionInfo>
+
   <regionInfo id="TIPQ">
     <region>Puerto Rico</region>
   </regionInfo>
 
+    <!-- 1/2/2018 NOAA-20 Caribbean/PR region -->
+  <regionInfo id="TIPP">
+    <region>Puerto_RicoJPSS</region>
+  </regionInfo>
+  
   <!-- Global region -->
   <regionInfo id="TIPG">
     <region>Global</region>
@@ -61,7 +81,7 @@
     <channel>1</channel>
     <resolution>375.0</resolution>
   </channelInfo>
-
+  
   <!-- I2 -->
   <channelInfo id="02">
     <channelType>Imagery</channelType>
@@ -69,7 +89,7 @@
     <channel>2</channel>
     <resolution>375.0</resolution>
   </channelInfo>
-
+  
   <!-- I3 -->
   <channelInfo id="03">
     <channelType>Imagery</channelType>
@@ -77,7 +97,7 @@
     <channel>3</channel>
     <resolution>375.0</resolution>
   </channelInfo>
-
+  
   <!-- I4 -->
   <channelInfo id="04">
     <channelType>Imagery</channelType>
@@ -86,7 +106,7 @@
     <unit>K</unit>
     <resolution>375.0</resolution>
   </channelInfo>
-
+  
   <!-- I5 -->
   <channelInfo id="05">
     <channelType>Imagery</channelType>
@@ -95,14 +115,22 @@
     <unit>K</unit>
     <resolution>375.0</resolution>
   </channelInfo>
-
-  <!-- NCC -->
+  
+    <!-- NCC -->
   <channelInfo id="10">
     <channelType>NCC</channelType>
     <wavelength>0.7</wavelength>
     <channel>0</channel>
     <resolution>750.0</resolution>
   </channelInfo>
+  
+    <!--March 13 2016 added by TOWR-S for implementation  M5 -->
+  <channelInfo id="15">
+    <channelType>Moderate</channelType>
+      <wavelength>0.672</wavelength>
+      <channel>5</channel>
+      <resolution>750.0</resolution>
+  </channelInfo>
 
   <!-- M6 -->
   <channelInfo id="16">
@@ -111,7 +139,7 @@
     <channel>1</channel>
     <resolution>750.0</resolution>
   </channelInfo>
-
+  
   <!-- M9 -->
   <channelInfo id="19">
     <channelType>Moderate</channelType>
@@ -119,7 +147,7 @@
     <channel>2</channel>
     <resolution>750.0</resolution>
   </channelInfo>
-
+  
   <!-- M13 -->
   <channelInfo id="23">
     <channelType>Moderate</channelType>
@@ -129,6 +157,15 @@
     <resolution>750.0</resolution>
   </channelInfo>
 
+    <!-- M14 -->
+    <channelInfo id="24">
+        <channelType>Moderate</channelType>
+        <wavelength>8.55</wavelength>
+        <channel>6</channel>
+        <unit>K</unit>
+        <resolution>750.0</resolution>
+    </channelInfo>
+  
   <!-- M15 -->
   <channelInfo id="25">
     <channelType>Moderate</channelType>
@@ -137,7 +174,7 @@
     <unit>K</unit>
     <resolution>750.0</resolution>
   </channelInfo>
-
+  
   <!-- M16 -->
   <channelInfo id="26">
     <channelType>Moderate</channelType>
@@ -146,5 +183,13 @@
     <unit>K</unit>
     <resolution>750.0</resolution>
   </channelInfo>
-
+  
+    <!-- DNB/NCC -->
+  <!-- TOWR-S add -->
+    <channelInfo id="10">
+        <channelType>Moderate</channelType>
+        <wavelength>0.7</wavelength>
+        <channel>10</channel>
+        <resolution>750.0</resolution>
+    </channelInfo> 
 </viirsHeaderMapping>
diff --git a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml
old mode 100644
new mode 100755
similarity index 90%
rename from cave/com.raytheon.uf.viz.npp/localization/menus/npp/index.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml
index 6b8ea24031..adade8d8b4
--- a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/index.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml
@@ -24,5 +24,5 @@
         of the file. 
     -->
 <menuContributionFile>
-    <include installTo="menu:satellite?before=GROUP5" fileName="menus/npp/nppMenuItems.xml" />
-</menuContributionFile>
\ No newline at end of file
+    <include installTo="menu:satellite" fileName="menus/npp/nppMenuItems.xml" />
+</menuContributionFile>
diff --git a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
old mode 100644
new mode 100755
similarity index 81%
rename from cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
index 65ba56cf3b..d70c430d34
--- a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
@@ -24,12 +24,9 @@
         of the file. 
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <contribute xsi:type="subMenu" id="NPPProducts" menuText="NPP Products">
+    <contribute xsi:type="titleItem" titleText="------ VIIRS Imagery ------" id="viirsImagery"/>
+    <contribute xsi:type="subMenu" id="NPPProducts" menuText="S-NPP and NOAA-20">
         <contribute xsi:type="separator" id="Imagery"
             visible="false" />
-        <contribute xsi:type="titleItem" id="SoundingsTitle"
-            titleText="------ Soundings ------" />
-        <contribute xsi:type="separator" id="Soundings"
-            visible="false" />
     </contribute>
-</menuTemplate>
\ No newline at end of file
+</menuTemplate>
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
index b9c5530639..e8b455d8ae 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
@@ -96,6 +96,7 @@ REQUEST EXP "WwWind" idd.unidata.ucar.edu		# ESPL/PSD Profilers
 REQUEST DIFAX "GLM" idd.unidata.ucar.edu		# GOES GLM
 #REQUEST DIFAX "OR_ABI" idd.unidata.ucar.edu		# GOES ABI netCDF4 (tiles)
 #REQUEST NOTHER "^TI[PRS]... KNES" idd.unidata.ucar.edu	# GOES ABI gini
+REQUEST NOTHER "^TI[A-Q]... KNES" idd.unidata.ucar.edu  # VIIRS
 REQUEST NGRID ".*" idd.unidata.ucar.edu
 REQUEST HDS ".*" idd.unidata.ucar.edu
 #REQUEST CMC ".*" idd.unidata.ucar.edu
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
index af0d1298fe..b9a4be9610 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
@@ -201,9 +201,8 @@ DIFAX	^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_ABI-L1b-([^/]*).nc
 #
 # NPP/VIIRS
 #
-NOTHER	^(TIP...) (KNES) (......)
-	FILE	-close -edex
-	/awips2/data_store/viirs/\1_\2_\3
+NOTHER	^(TI[A-Q]...) (KNES) (......)
+	FILE	-close -edex	/awips2/data_store/viirs/\1_\2_\3
 #
 # NEXRAD3 GEMPAK-generated national composite (1-4km)
 #