From feae73b2f7160a00346e8874be6a486d4faadd6b Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Thu, 20 Dec 2018 16:25:42 -0700
Subject: [PATCH] WAA plugin reconfig

---
 .../localization/bundles/AllCWASPS.xml        |  60 ---
 .../localization/bundles/AllLocalWarnings.xml | 325 ---------------
 .../bundles/AllMarineWarnings.xml             |  75 ----
 .../bundles/AllNationalWarnings.xml           | 358 -----------------
 .../bundles/AllRegionalWarnings-AR.xml        | 364 -----------------
 .../bundles/AllRegionalWarnings-CR.xml        | 364 -----------------
 .../bundles/AllRegionalWarnings-ER.xml        | 364 -----------------
 .../bundles/AllRegionalWarnings-PR.xml        | 364 -----------------
 .../bundles/AllRegionalWarnings-SR.xml        | 364 -----------------
 .../bundles/AllRegionalWarnings-WR.xml        | 364 -----------------
 .../bundles/AllRegionalWarnings.xml           | 374 ------------------
 .../bundles/{AllAdvisories.xml => AllWWA.xml} |  10 +-
 .../localization/bundles/AllWarnings.xml      | 164 +-------
 .../localization/bundles/FloodWWA.xml         |  37 ++
 .../localization/bundles/FloodWarnings.xml    | 103 -----
 .../bundles/LocalCWAFloodWarnings.xml         | 239 -----------
 .../localization/bundles/LocalCWASPS.xml      |  60 ---
 .../localization/bundles/LocalCWAWarnings.xml | 164 --------
 .../LocalLocalizedExtremeWeatherWarnings.xml  |  65 ---
 .../bundles/LocalMarineWarnings.xml           |  65 ---
 .../bundles/LocalRegionalFloodWarnings.xml    | 205 ----------
 ...egionalLocalizedExtremeWeatherWarnings.xml |  66 ----
 .../bundles/LocalRegionalMarineWarning.xml    |  67 ----
 .../localization/bundles/LocalRegionalSPS.xml |  61 ---
 .../bundles/LocalRegionalWarnings.xml         | 199 ----------
 .../bundles/LocalStormReportsLocal.xml        |  54 ---
 .../bundles/LocalStormReportsNational.xml     |  54 ---
 .../bundles/LocalStormReportsOffice.xml       |  53 ---
 .../bundles/LocalStormReportsRegion.xml       |  54 ---
 .../localization/bundles/MarineWWA.xml        |  37 ++
 .../localization/bundles/MarineWarning.xml    |  66 ----
 .../bundles/NationalConvWarnings.xml          | 164 --------
 .../bundles/NationalFloodWarnings.xml         | 199 ----------
 ...ationalLocalizedExtremeWeatherWarnings.xml |  65 ---
 .../bundles/RegionalCWAWarnings.xml           | 167 --------
 .../bundles/RegionalFloodWarnings-AR.xml      | 200 ----------
 .../bundles/RegionalFloodWarnings-CR.xml      | 200 ----------
 .../bundles/RegionalFloodWarnings-ER.xml      | 200 ----------
 .../bundles/RegionalFloodWarnings-PR.xml      | 200 ----------
 .../bundles/RegionalFloodWarnings-SR.xml      | 200 ----------
 .../bundles/RegionalFloodWarnings-WR.xml      | 200 ----------
 ...onalLocalizedExtremeWeatherWarnings-AR.xml |  65 ---
 ...onalLocalizedExtremeWeatherWarnings-CR.xml |  65 ---
 ...onalLocalizedExtremeWeatherWarnings-ER.xml |  65 ---
 ...onalLocalizedExtremeWeatherWarnings-PR.xml |  65 ---
 ...onalLocalizedExtremeWeatherWarnings-SR.xml |  65 ---
 ...onalLocalizedExtremeWeatherWarnings-WR.xml |  65 ---
 .../bundles/RegionalMarineWarning-AR.xml      |  66 ----
 .../bundles/RegionalMarineWarning-CR.xml      |  66 ----
 .../bundles/RegionalMarineWarning-ER.xml      |  66 ----
 .../bundles/RegionalMarineWarning-PR.xml      |  66 ----
 .../bundles/RegionalMarineWarning-SR.xml      |  66 ----
 .../bundles/RegionalMarineWarning-WR.xml      |  66 ----
 .../localization/bundles/RegionalSPS-AR.xml   |  60 ---
 .../localization/bundles/RegionalSPS-CR.xml   |  60 ---
 .../localization/bundles/RegionalSPS-ER.xml   |  60 ---
 .../localization/bundles/RegionalSPS-PR.xml   |  60 ---
 .../localization/bundles/RegionalSPS-SR.xml   |  60 ---
 .../localization/bundles/RegionalSPS-WR.xml   |  68 ----
 .../bundles/RegionalWarnings-AR.xml           | 200 ----------
 .../bundles/RegionalWarnings-CR.xml           | 200 ----------
 .../bundles/RegionalWarnings-ER.xml           | 200 ----------
 .../bundles/RegionalWarnings-PR.xml           | 200 ----------
 .../bundles/RegionalWarnings-SR.xml           | 200 ----------
 .../bundles/RegionalWarnings-WR.xml           | 200 ----------
 .../localization/bundles/StormReports.xml     |  19 -
 .../localization/bundles/Warnings.xml         |  71 ----
 .../bundles/{WindWarnings.xml => WindWWA.xml} |   9 +-
 .../menus/warnings/baseWarnings.xml           |  26 +-
 .../localization/menus/warnings/index.xml     |  19 -
 .../viz/warnings/rsc/AbstractWWAResource.java |  50 +--
 71 files changed, 123 insertions(+), 9419 deletions(-)
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllCWASPS.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllMarineWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllNationalWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-AR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-CR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-ER.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-PR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-SR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-WR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml
 rename cave/com.raytheon.viz.warnings/localization/bundles/{AllAdvisories.xml => AllWWA.xml} (76%)
 create mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/FloodWWA.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/FloodWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalCWASPS.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalLocalizedExtremeWeatherWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalMarineWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalLocalizedExtremeWeatherWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalMarineWarning.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalSPS.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsLocal.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsNational.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsOffice.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsRegion.xml
 create mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/NationalConvWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/NationalFloodWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/NationalLocalizedExtremeWeatherWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalCWAWarnings.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-AR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-CR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-ER.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-PR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-SR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-WR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-AR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-CR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-ER.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-PR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-SR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-WR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-AR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-CR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-ER.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-PR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-SR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-WR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-AR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-CR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-ER.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-PR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-SR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-WR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-AR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-CR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-ER.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-PR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-SR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-WR.xml
 delete mode 100644 cave/com.raytheon.viz.warnings/localization/bundles/Warnings.xml
 rename cave/com.raytheon.viz.warnings/localization/bundles/{WindWarnings.xml => WindWWA.xml} (81%)

diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllCWASPS.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllCWASPS.xml
deleted file mode 100644
index 07b630c602..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllCWASPS.xml
+++ /dev/null
@@ -1,60 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false" name="National Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml
deleted file mode 100644
index 23b40454d6..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml
+++ /dev/null
@@ -1,325 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        isRequeryNecessaryOnTimeMatch="true" retrieveData="false" name="All Local Warnings"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLY,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllMarineWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllMarineWarnings.xml
deleted file mode 100644
index 80927d587c..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllMarineWarnings.xml
+++ /dev/null
@@ -1,75 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="National Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllNationalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllNationalWarnings.xml
deleted file mode 100644
index 80c097b0a6..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllNationalWarnings.xml
+++ /dev/null
@@ -1,358 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All National Warnings"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-AR.xml
deleted file mode 100644
index b2a3740c0b..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-AR.xml
+++ /dev/null
@@ -1,364 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Alaska Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Alaska Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-CR.xml
deleted file mode 100644
index dfd922e6ad..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-CR.xml
+++ /dev/null
@@ -1,364 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Central Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Central Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-ER.xml
deleted file mode 100644
index 4646632bd4..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-ER.xml
+++ /dev/null
@@ -1,364 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Eastern Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Regon Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Eastern Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-PR.xml
deleted file mode 100644
index 989dfc8536..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-PR.xml
+++ /dev/null
@@ -1,364 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Pacific Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Pacific Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-SR.xml
deleted file mode 100644
index 69230d1cc4..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-SR.xml
+++ /dev/null
@@ -1,364 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Southern Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Southern Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-WR.xml
deleted file mode 100644
index 005947d7e0..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings-WR.xml
+++ /dev/null
@@ -1,364 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Western Region Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Western Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml
deleted file mode 100644
index 935431b4bf..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml
+++ /dev/null
@@ -1,374 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS,SQW,DSW"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W,FL.W,FL.Y,SQ.W,DS.W,DS.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="All Local &amp; Regional Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="All Local &amp; Regional Localized Extreme Weather Events">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllAdvisories.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
similarity index 76%
rename from cave/com.raytheon.viz.warnings/localization/bundles/AllAdvisories.xml
rename to cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
index 98bde4c096..a6cb75cedc 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllAdvisories.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
@@ -7,8 +7,7 @@
 				<resource>
                     <loadProperties loadWithoutData="true">
                         <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="4" />
+                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true" outlineWidth="4" />
                             <capability xsi:type="colorableCapability" colorAsString="#ffffff" />
                         </capabilities>
                     </loadProperties>
@@ -18,11 +17,8 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="true" name="Advisories and Warnings">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
-							</mapping>
+						isRequeryNecessaryOnTimeMatch="true" name="All Advisories and Warnings">
+						<metadataMap>
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllWarnings.xml
index 6c2ccd71f3..cae0e32d68 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllWarnings.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllWarnings.xml
@@ -9,7 +9,7 @@
                         <capabilities>
                             <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
                                 outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
+                            <capability xsi:type="colorableCapability" colorAsString="#ffffff" />
                         </capabilities>
                     </loadProperties>
 					<properties isSystemResource="false" isBlinking="false"
@@ -18,171 +18,13 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="true" name="SVR Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
 							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="SVR,SVS" constraintType="IN" />
-							</mapping>
 							<mapping key="phensig">
-								<constraint constraintValue="SV.W" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="true" name="TOR Warnings">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="TOR,SVS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="TO.W" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#DB5151" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Flash Flood Warnings">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="FFW,FFS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="FF.W,FL.Y" constraintType="IN" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FF00" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Flood Warnings">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="FLW,FLS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#90EE90" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Flood Advisories">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="FLY,FLS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#CC99FF" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="EWW Warnings">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="EW.W" constraintType="EQUALS" />
+								<constraint constraintValue="TO.W,SV.W,FF.W,FL.Y,FA.W,FA.Y,EW.W" constraintType="IN" />
 							</mapping>
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/FloodWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/FloodWWA.xml
new file mode 100644
index 0000000000..ad2584ca8c
--- /dev/null
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/FloodWWA.xml
@@ -0,0 +1,37 @@
+<bundle>
+	<displayList>
+		<displays xsi:type="d2DMapRenderableDisplay"
+			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+			<descriptor xsi:type="mapDescriptor">
+				<resource>
+                    <loadProperties loadWithoutData="true">
+                        <capabilities>
+                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
+                                outlineWidth="4" />
+                            <capability xsi:type="colorableCapability" colorAsString="#ffffff" />
+                        </capabilities>
+                    </loadProperties>
+					<properties isSystemResource="false" isBlinking="false"
+						isMapLayer="false" isHoverOn="false" 
+						isVisible="true" />
+					<resourceData xsi:type="wwaResourceData" 						
+						isUpdatingOnMetadataOnly="false"
+						retrieveData="false"
+						isRequeryNecessaryOnTimeMatch="true" name="Flood Watches, Warnings, Advisories">
+						<metadataMap>							
+							<mapping key="act">
+								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
+							</mapping>
+							<mapping key="phensig">
+								<constraint constraintValue="FA.A,FL.A,FF.A,LS.A,CF.A,CF.W,CF.Y,CF.S,FA.W,FA.Y,FF.S,FF.W,FL.W,HY.S,FL.S,FL.Y,LS.S,LS.W,LS.Y" constraintType="IN" />
+							</mapping>
+							<mapping key="pluginName">
+								<constraint constraintValue="warning" constraintType="EQUALS" />
+							</mapping>
+						</metadataMap>
+					</resourceData>
+				</resource>
+			</descriptor>
+		</displays>
+	</displayList>
+</bundle>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/FloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/FloodWarnings.xml
deleted file mode 100644
index 1d7b67c454..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/FloodWarnings.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-
-<bundle>
-	<displayList>
-		<displays xsi:type="d2DMapRenderableDisplay"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<descriptor xsi:type="mapDescriptor">
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#DB5151" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Flash Flood Warnings">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="FFW,FFS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="FF.W,FL.Y" constraintType="IN" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FF00" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Flood Warnings">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="FLW,FLS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#90EE90" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Flood Advisories">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="FLY,FLS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
-</bundle>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml
deleted file mode 100644
index bf236763e2..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml
+++ /dev/null
@@ -1,239 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="Local CWA Flood Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FLW,FFS,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="Local Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="Local Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="Local River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="DASHED" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="Local Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWASPS.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWASPS.xml
deleted file mode 100644
index 0f2836f0d3..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWASPS.xml
+++ /dev/null
@@ -1,60 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false" name="Local Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAWarnings.xml
deleted file mode 100644
index 0f2be082c0..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAWarnings.xml
+++ /dev/null
@@ -1,164 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="true" isRequeryNecessaryOnTimeMatch="true" name="Local CWA Warnings"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="true" isRequeryNecessaryOnTimeMatch="true" name="Local SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="true" isRequeryNecessaryOnTimeMatch="true" name="Local TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="true" isRequeryNecessaryOnTimeMatch="true" name="Local EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalLocalizedExtremeWeatherWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalLocalizedExtremeWeatherWarnings.xml
deleted file mode 100644
index 0f4833a67c..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalLocalizedExtremeWeatherWarnings.xml
+++ /dev/null
@@ -1,65 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.W,DS.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalMarineWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalMarineWarnings.xml
deleted file mode 100644
index f91cda74f2..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalMarineWarnings.xml
+++ /dev/null
@@ -1,65 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml
deleted file mode 100644
index ce4a029a53..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml
+++ /dev/null
@@ -1,205 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional Flood Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FLW,FFS,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalLocalizedExtremeWeatherWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalLocalizedExtremeWeatherWarnings.xml
deleted file mode 100644
index a3326fd980..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalLocalizedExtremeWeatherWarnings.xml
+++ /dev/null
@@ -1,66 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Local &amp; Regional Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.W,DS.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalMarineWarning.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalMarineWarning.xml
deleted file mode 100644
index 4d42f301a3..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalMarineWarning.xml
+++ /dev/null
@@ -1,67 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalSPS.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalSPS.xml
deleted file mode 100644
index a42c5efa34..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalSPS.xml
+++ /dev/null
@@ -1,61 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false" name="Local &amp; Regional Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml
deleted file mode 100644
index 699a76b47d..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml
+++ /dev/null
@@ -1,199 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional Warnings"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsLocal.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsLocal.xml
deleted file mode 100644
index d3be467859..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsLocal.xml
+++ /dev/null
@@ -1,54 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="plotResourceData" plotSource="${title}"
-                        plotModelFile="lsr.svg" isUpdatingOnMetadataOnly="true" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true">
-                        <binOffset posOffset="150" negOffset="150" virtualOffset="0" />
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="lsr" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsNational.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsNational.xml
deleted file mode 100644
index abf8a35b4a..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsNational.xml
+++ /dev/null
@@ -1,54 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="plotResourceData" plotSource="${title}"
-                        plotModelFile="lsr.svg" isUpdatingOnMetadataOnly="true" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true">
-                        <binOffset posOffset="150" negOffset="150" virtualOffset="0" />
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="lsr" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsOffice.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsOffice.xml
deleted file mode 100644
index 26e4935e8d..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsOffice.xml
+++ /dev/null
@@ -1,53 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities/>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="plotResourceData" plotSource="${title}"
-                        plotModelFile="lsr.svg" isUpdatingOnMetadataOnly="true" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true">
-                        <binOffset posOffset="150" negOffset="150" virtualOffset="0" />
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="lsr" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid"> <!-- Ingesting LSR through the LSR GUI currently doesn't exist -->
-                                <constraint constraintValue="OFFICE" constraintType="EQUALS" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsRegion.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsRegion.xml
deleted file mode 100644
index bf10182ab9..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsRegion.xml
+++ /dev/null
@@ -1,54 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities/>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="plotResourceData" plotSource="${title}"
-                        plotModelFile="lsr.svg" isUpdatingOnMetadataOnly="true" retrieveData="false"
-                        isRequeryNecessaryOnTimeMatch="true">
-                        <binOffset posOffset="150" negOffset="150" virtualOffset="0" />
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="lsr" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml
new file mode 100644
index 0000000000..ae4f7a13f3
--- /dev/null
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml
@@ -0,0 +1,37 @@
+<bundle>
+	<displayList>
+		<displays xsi:type="d2DMapRenderableDisplay"
+			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+			<descriptor xsi:type="mapDescriptor">
+				<resource>
+                    <loadProperties loadWithoutData="true">
+                        <capabilities>
+                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
+                                outlineWidth="4" />
+                            <capability xsi:type="colorableCapability" colorAsString="#ffffff" />
+                        </capabilities>
+                    </loadProperties>
+					<properties isSystemResource="false" isBlinking="false"
+						isMapLayer="false" isHoverOn="false" 
+						isVisible="true" />
+					<resourceData xsi:type="wwaResourceData" 						
+						isUpdatingOnMetadataOnly="false"
+						retrieveData="false"
+						isRequeryNecessaryOnTimeMatch="true" name="Marine Watches, Warnings, Advisories">
+						<metadataMap>							
+							<mapping key="act">
+								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
+							</mapping>
+							<mapping key="phensig">
+                                <constraint constraintValue="MA.W,CF.A,CF.W,CF.Y,CF.S,LS.A,LS.S,LS.W,LS.Y,LW.Y,MA.A,MA.S,MA.W,MF.Y,MH.W,MH.Y,MS.Y,RB.Y,RP.S,SC.Y,SE.A,SE.W,SI.Y,SS.A,SS.W,SU.W,SU.Y,SW.Y,TS.A,TS.W,TS.Y,TY.A,TY.W" constraintType="IN" />
+							</mapping>
+							<mapping key="pluginName">
+								<constraint constraintValue="warning" constraintType="EQUALS" />
+							</mapping>
+						</metadataMap>
+					</resourceData>
+				</resource>
+			</descriptor>
+		</displays>
+	</displayList>
+</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml
deleted file mode 100644
index 160d2ff1fd..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml
+++ /dev/null
@@ -1,66 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${site},${sites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/NationalConvWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/NationalConvWarnings.xml
deleted file mode 100644
index 0978f14133..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/NationalConvWarnings.xml
+++ /dev/null
@@ -1,164 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="National Convective Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="National SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="National TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="National EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/NationalFloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/NationalFloodWarnings.xml
deleted file mode 100644
index 6630e84bed..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/NationalFloodWarnings.xml
+++ /dev/null
@@ -1,199 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="National Flood Warnings"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FLW,FFS,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="National Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="National Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="National River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="National Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/NationalLocalizedExtremeWeatherWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/NationalLocalizedExtremeWeatherWarnings.xml
deleted file mode 100644
index 3d31bc2d69..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/NationalLocalizedExtremeWeatherWarnings.xml
+++ /dev/null
@@ -1,65 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="National Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ALLsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalCWAWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalCWAWarnings.xml
deleted file mode 100644
index 67e11359e1..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalCWAWarnings.xml
+++ /dev/null
@@ -1,167 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${sites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${sites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${sites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Local &amp; Regional EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${sites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-AR.xml
deleted file mode 100644
index 135761af52..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-AR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flood Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FLW,FFS,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-CR.xml
deleted file mode 100644
index 4ea31d0ffa..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-CR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flood Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FLW,FFS,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-ER.xml
deleted file mode 100644
index 2a5fa600d7..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-ER.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flood Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FLW,FFS,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-PR.xml
deleted file mode 100644
index a83adea911..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-PR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flood Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FLW,FFS,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-SR.xml
deleted file mode 100644
index 8c28acff9e..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-SR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flood Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FLW,FFS,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-WR.xml
deleted file mode 100644
index 082506a371..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalFloodWarnings-WR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flood Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FLW,FFS,FLS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W,FA.W,FA.Y,FL.Y"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00ff7f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flash Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FFW,FFS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FF.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#3cb371" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#89f0b7" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region River Flood Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLW,FLS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FL.W,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="DASHED"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#8fbc8f" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Flood Advisories">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXT,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="FLS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="FA.Y,FL.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-AR.xml
deleted file mode 100644
index 7d6857c01e..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-AR.xml
+++ /dev/null
@@ -1,65 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Alaska Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.W,DS.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-CR.xml
deleted file mode 100644
index 3d95231fc3..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-CR.xml
+++ /dev/null
@@ -1,65 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Central Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.W,DS.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-ER.xml
deleted file mode 100644
index 621a41a620..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-ER.xml
+++ /dev/null
@@ -1,65 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Eastern Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.W,DS.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-PR.xml
deleted file mode 100644
index f48e3732bc..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-PR.xml
+++ /dev/null
@@ -1,65 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Pacific Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.W,DS.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-SR.xml
deleted file mode 100644
index b53aaa0bc5..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-SR.xml
+++ /dev/null
@@ -1,65 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Southern Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.W,DS.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-WR.xml
deleted file mode 100644
index ede1a36334..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalLocalizedExtremeWeatherWarnings-WR.xml
+++ /dev/null
@@ -1,65 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true" name="Western Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.W,DS.Y" constraintType="IN" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-AR.xml
deleted file mode 100644
index d0fbcdd00a..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-AR.xml
+++ /dev/null
@@ -1,66 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-CR.xml
deleted file mode 100644
index 075b2dde41..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-CR.xml
+++ /dev/null
@@ -1,66 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-ER.xml
deleted file mode 100644
index 03f8b78c01..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-ER.xml
+++ /dev/null
@@ -1,66 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-PR.xml
deleted file mode 100644
index 2b1ff5e05f..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-PR.xml
+++ /dev/null
@@ -1,66 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-SR.xml
deleted file mode 100644
index e82d528666..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-SR.xml
+++ /dev/null
@@ -1,66 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-WR.xml
deleted file mode 100644
index 75d4efee75..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalMarineWarning-WR.xml
+++ /dev/null
@@ -1,66 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#00FFFF" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Marine Warnings">
-                        <metadataMap>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="MWS,SMW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="MA.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-AR.xml
deleted file mode 100644
index 58851450de..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-AR.xml
+++ /dev/null
@@ -1,60 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false" name="Alaska Region Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-CR.xml
deleted file mode 100644
index b659a5546b..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-CR.xml
+++ /dev/null
@@ -1,60 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false" name="Central Region Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-ER.xml
deleted file mode 100644
index 5d1bf33e42..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-ER.xml
+++ /dev/null
@@ -1,60 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false" name="Eastern Region Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-PR.xml
deleted file mode 100644
index fd65bdfeb7..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-PR.xml
+++ /dev/null
@@ -1,60 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false" name="Pacific Region Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-SR.xml
deleted file mode 100644
index c8294ba075..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-SR.xml
+++ /dev/null
@@ -1,60 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false" name="Southern Region Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-WR.xml
deleted file mode 100644
index 87589eed8d..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalSPS-WR.xml
+++ /dev/null
@@ -1,68 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability"
-                                lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="colorableCapability"
-                                colorAsString="#bbbbbb" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false"
-                        isBlinking="false" isMapLayer="false" isHoverOn="false"
-                        isVisible="true" />
-                    <resourceData xsi:type="cwaspsResourceData"
-                        isUpdatingOnMetadataOnly="false" retrieveData="true"
-                        isRequeryNecessaryOnTimeMatch="false"
-                        name="Western Region Sig Wx Advisories (SPS)"
-                        hideSampling="true">
-                        <metadataMap>
-                            <mapping key="pil">
-                                <constraint constraintValue="SPS"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning"
-                                    constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}"
-                                    constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-AR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-AR.xml
deleted file mode 100644
index fb770508b3..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-AR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Convective Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Alaska Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ARsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-CR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-CR.xml
deleted file mode 100644
index ef8bf42707..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-CR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Convective Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Central Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${CRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-ER.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-ER.xml
deleted file mode 100644
index 790f4a8504..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-ER.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Convective Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Eastern Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${ERsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-PR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-PR.xml
deleted file mode 100644
index 62a0acceff..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-PR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Convective Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Pacific Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${PRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-SR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-SR.xml
deleted file mode 100644
index 22ee279b55..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-SR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Convective Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Southern Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${SRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-WR.xml b/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-WR.xml
deleted file mode 100644
index 141891a8ab..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalWarnings-WR.xml
+++ /dev/null
@@ -1,200 +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.
-    -->
-    <!-- 
-        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="d2DMapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#545454" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="false" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Convective Warnings" hideSampling="true">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,TOR,EWW,SVS,EWS"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W,SV.W,EW.W"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region SVR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SVR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SV.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region TOR Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="TOR,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="TO.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ee82ee" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region EWW Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="EW.W" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-                <resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID"
-                                outlineOn="true" outlineWidth="1" />
-                            <capability xsi:type="colorableCapability" colorAsString="#4286f4" />
-                        </capabilities>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false"
-                        isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="wwaResourceData" isUpdatingOnMetadataOnly="false"
-                        retrieveData="false" isRequeryNecessaryOnTimeMatch="true"
-                        name="Western Region Localized Extreme Weather Warnings">
-                        <metadataMap>
-                            <mapping key="act">
-                                <constraint constraintValue="NEW,CON,CAN,EXP,EXT"
-                                    constraintType="IN" />
-                            </mapping>
-                            <mapping key="pil">
-                                <constraint constraintValue="SQW,DSW" constraintType="IN" />
-                            </mapping>
-                            <mapping key="phensig">
-                                <constraint constraintValue="SQ.W,DS.Y,DS.W" constraintType="IN" />
-                            </mapping>
-                            <mapping key="pluginName">
-                                <constraint constraintValue="warning" constraintType="EQUALS" />
-                            </mapping>
-                            <mapping key="officeid">
-                                <constraint constraintValue="${WRsites}" constraintType="IN" />
-                            </mapping>
-                        </metadataMap>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/StormReports.xml b/cave/com.raytheon.viz.warnings/localization/bundles/StormReports.xml
index 68b47d7f6f..ec1af35f18 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/StormReports.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/StormReports.xml
@@ -1,23 +1,4 @@
 <?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.
-    -->
 <bundle>
 	<displayList>
 		<displays xsi:type="d2DMapRenderableDisplay"
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/Warnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/Warnings.xml
deleted file mode 100644
index 58cb7a2c54..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/Warnings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-<bundle>
-	<displayList>
-		<displays xsi:type="d2DMapRenderableDisplay"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<descriptor xsi:type="mapDescriptor">
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="true" name="SVR Warnings">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="SVR,SVS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="SV.W" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-                        <capabilities>
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
-                        </capabilities>
-                    </loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false" 
-						isVisible="true" />
-					<resourceData xsi:type="wwaResourceData" 						
-						isUpdatingOnMetadataOnly="false"
-						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="true" name="TOR Warnings">
-						<metadataMap>							
-							<mapping key="act">
-								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="TOR,SVS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="TO.W" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/WindWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/WindWWA.xml
similarity index 81%
rename from cave/com.raytheon.viz.warnings/localization/bundles/WindWarnings.xml
rename to cave/com.raytheon.viz.warnings/localization/bundles/WindWWA.xml
index a38b61420d..8217e68841 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/WindWarnings.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/WindWWA.xml
@@ -8,7 +8,7 @@
                         <capabilities>
                             <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
                                 outlineWidth="4" />
-                            <capability xsi:type="colorableCapability" colorAsString="#CC99FF" />
+                            <capability xsi:type="colorableCapability" colorAsString="#ffffff" />
                         </capabilities>
                     </loadProperties>
 					<properties isSystemResource="false" isBlinking="false"
@@ -17,16 +17,13 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="EWW Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="Wind Watches, Warnings, Advisories">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
 							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="EWW,EWS,SVS" constraintType="IN" />
-							</mapping>
 							<mapping key="phensig">
-								<constraint constraintValue="EW.W" constraintType="EQUALS" />
+								<constraint constraintValue="BW.Y,EW.W,HF.A,HF.W,HW.A,HW.W,LW.Y,SI.Y,WC.A,WC.W,WC.Y,WI.Y,DS.W,DU.Y,SM.Y" constraintType="IN" />
 							</mapping>
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
diff --git a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
index c4d00f58cf..f6165748e9 100644
--- a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
+++ b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
@@ -19,29 +19,27 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/ConvectiveWatchPlot.xml"
-             menuText="Convective Watches" id="convectiveWatches">
+
+	<contribute xsi:type="bundleItem" file="bundles/AllWWA.xml" 
+          menuText="All Weather Statements" id="warnings">
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/AllWarnings.xml" 
           menuText="All Warnings" id="warnings">
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/AllAdvisories.xml" 
-          menuText="All Advisories and Warnings" id="warnings">
+	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/ConvectiveWatchPlot.xml"
+             menuText="Convective Watches" id="convectiveWatches">
     </contribute>
 	<contribute xsi:type="separator" id="separator4"/>
-	<contribute xsi:type="bundleItem" file="bundles/Warnings.xml" 
-          menuText="TStorm / Tornado Warnings" id="warnings">
+	<contribute xsi:type="bundleItem" file="bundles/FloodWWA.xml" 
+          menuText="Flood Watches, Warnings, Advisories" id="FloodWarnings">
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/FloodWarnings.xml" 
-          menuText="Flood Warnings" id="FloodWarnings">
+	<contribute xsi:type="bundleItem" file="bundles/WindWWA.xml" 
+          menuText="Wind Watches, Warnings, Advisories" id="windWarnings">
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/MarineWarning.xml" 
-              menuText="Marine Warnings" id="marineWarnings">
+	<contribute xsi:type="bundleItem" file="bundles/MarineWWA.xml" 
+              menuText="Marine Watches, Warnings, Advisories" id="marineWarnings">
     </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/WindWarnings.xml" 
-          menuText="Extrene Wind Warnings" id="windWarnings">
-    </contribute>
-		<contribute xsi:type="bundleItem" file="bundles/SPS.xml" 
+	<contribute xsi:type="bundleItem" file="bundles/SPS.xml" 
               menuText="SPS / Sig Wx Advisories" id="SPS">
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/SvrWxPlot.xml" 
diff --git a/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml b/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml
index 4a5900b681..cdeef3168f 100644
--- a/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml
+++ b/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml
@@ -1,23 +1,4 @@
 <?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.
-    -->
 <menuContributionFile>
 	<include installTo="menu:obs?after=HAZARDS" 
              fileName="menus/warnings/baseWarnings.xml">
diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
index 69c11a74fe..22bacfb927 100644
--- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
+++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
@@ -247,6 +247,9 @@ public abstract class AbstractWWAResource extends
                                     }
                                     sb.append(text);
                                 }
+                                sb.append("\n\n");
+                                sb.append(record.getOverviewText());
+                                sb.append(record.getSegText());
                                 return sb.toString();
                             }
                         }
@@ -257,7 +260,7 @@ public abstract class AbstractWWAResource extends
             }
 
         }
-        return "NO DATA";
+        return null;
     }
 
     protected void disposeEntry(final WarningEntry entry) {
@@ -369,8 +372,11 @@ public abstract class AbstractWWAResource extends
                     initShape(target, entry.record);
                     entry.project = false;
                 }
-
-                RGB displaycolor = RGBColors.getRGBColor(getColor(record));
+                
+                RGB displaycolor = color;
+                if ( ! record.getPil().equals("SPS")) {
+                	displaycolor = RGBColors.getRGBColor(getPhensigColor(record.getPhensig()));
+                }
 
                 if (entry != null && entry.wireframeShape != null) {
                     LineStyle lineStyle = LineStyle.SOLID;
@@ -596,26 +602,26 @@ public abstract class AbstractWWAResource extends
         addRecord(sort(pdos));
     }
 
-    protected String getColor(AbstractWarningRecord record){
-        String phensig = record.getPhensig();
+    protected String getPhensigColor(String phensig){
         WarningLookups lookup = new WarningLookups();
         return lookup.getPhensig(phensig).color;
     }
 
+    protected String getPhensigName(String phensig){
+        WarningLookups lookup = new WarningLookups();
+        return lookup.getPhensig(phensig).name;
+    }
+
     protected String[] getText(AbstractWarningRecord record, double mapWidth) {
-        String vid = record.getPhensig();
-        String phen = record.getPhen();
-        String[] textToPrint = new String[] { "", "", "", "" };
+    	
+        String[] textToPrint = new String[] { "", "" };
 
-        textToPrint[0] = record.getProductClass();
-        if ((vid != null && phen != null)
-                && (vid.equals("TO.A") || vid.equals("SV.A")
-                        || phen.equals("FL") || phen.equals("FA"))) {
-            textToPrint[0] += "." + vid;
+        if ( ! record.getPil().equals("SPS")) {
+            textToPrint[0] = getPhensigName(record.getPhensig());
+        } else {
+        	textToPrint[0] = "Special Weather Statement";
         }
-        textToPrint[0] += "." + record.getEtn();
-        textToPrint[1] = record.getPil();
-
+        
         String startFormatString = DEFAULT_FORMAT;
         String endFormatString = DEFAULT_FORMAT;
         if (mapWidth == 0) {
@@ -627,14 +633,14 @@ public abstract class AbstractWWAResource extends
         }
 
         DateFormat startFormat = new SimpleDateFormat(startFormatString);
-        startFormat.setTimeZone(TimeUtil.GMT_TIME_ZONE);
-        textToPrint[2] = "Valid "
-                + startFormat.format(record.getStartTime().getTime());
-
         DateFormat endFormat = new SimpleDateFormat(endFormatString);
+
+        startFormat.setTimeZone(TimeUtil.GMT_TIME_ZONE);
         endFormat.setTimeZone(TimeUtil.GMT_TIME_ZONE);
-        textToPrint[3] = "Thru "
-                + endFormat.format(record.getEndTime().getTime());
+        
+        textToPrint[1] = startFormat.format(record.getStartTime().getTime()) 
+                + "-" + endFormat.format(record.getEndTime().getTime());;
+               
 
         return textToPrint;
     }