diff --git a/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml
index 32d98eb951..e29a44f22e 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml
@@ -32,20 +32,18 @@
                 </separator>
                 <separator name="EndOfInitial" visible="true">
                 </separator>
-                <command commandId="com.raytheon.viz.ui.actions.titleAction"
-                    label="------ METAR ------">
-                </command>
                 <separator name="METAR" visible="false">
                 </separator>
                 <separator name="EndOfMetar" visible="true">
                 </separator>
-                <command commandId="com.raytheon.viz.ui.actions.titleAction"
-                    label="------ Synoptic ------">
-                </command>
                 <separator name="SYNOPTIC" visible="false">
                 </separator>
                 <separator name="EndOfSynoptic" visible="true">
                 </separator>
+                <separator
+                      name="WATCHWARN"
+                      visible="false">
+                </separator>
                 <command
                       commandId="com.raytheon.viz.ui.actions.titleAction"
                       label="------ Lightning ------">
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index ed545cd65d..fbb58511d8 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -689,8 +689,7 @@
          </menuContribution>
          <menuContribution
                locationURI="menu:com.raytheon.viz.ui.actions.frames">
-            <command
-                  commandId="com.raytheon.viz.ui.actions.setframes">
+            <command commandId="com.raytheon.viz.ui.actions.setframes">
                <parameter
                      name="frameCount"
                      value="1">
@@ -703,8 +702,7 @@
                      value="2">
                </parameter>
             </command>
-            <command
-                  commandId="com.raytheon.viz.ui.actions.setframes">
+            <command commandId="com.raytheon.viz.ui.actions.setframes">
                <parameter
                      name="frameCount"
                      value="3">
@@ -717,8 +715,7 @@
                      value="4">
                </parameter>
             </command>
-            <command
-                  commandId="com.raytheon.viz.ui.actions.setframes">
+            <command commandId="com.raytheon.viz.ui.actions.setframes">
                <parameter
                      name="frameCount"
                      value="5">
@@ -731,92 +728,61 @@
                      value="10">
                </parameter>
             </command>
-            <command
-                  commandId="com.raytheon.viz.ui.actions.setframes">
+            <command commandId="com.raytheon.viz.ui.actions.setframes">
                <parameter
                      name="frameCount"
                      value="20">
                </parameter>
             </command>
-            <command
-                  commandId="com.raytheon.viz.ui.actions.setframes">
+            <command commandId="com.raytheon.viz.ui.actions.setframes">
                <parameter
                      name="frameCount"
                      value="30">
                </parameter>
             </command>
-               <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
+               <command commandId="com.raytheon.viz.ui.actions.setframes">
                   <parameter
                         name="frameCount"
                         value="40">
                   </parameter>
                </command>
-               <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
+               <command commandId="com.raytheon.viz.ui.actions.setframes">
                   <parameter
                         name="frameCount"
                         value="50">
                   </parameter>
                </command>
-               <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
+               <command commandId="com.raytheon.viz.ui.actions.setframes">
                   <parameter
                         name="frameCount"
                         value="100">
                   </parameter>
                </command>
-               <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
+               <command commandId="com.raytheon.viz.ui.actions.setframes">
                   <parameter
                         name="frameCount"
                         value="150">
                   </parameter>
                </command>
-               <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
+               <command commandId="com.raytheon.viz.ui.actions.setframes">
                   <parameter
                         name="frameCount"
                         value="200">
                   </parameter>
                </command>
-               <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
+               <command commandId="com.raytheon.viz.ui.actions.setframes">
                   <parameter
                         name="frameCount"
                         value="250">
                   </parameter>
                </command>
-                              <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
+               <command commandId="com.raytheon.viz.ui.actions.setframes">
                   <parameter
                         name="frameCount"
-                        value="100">
+                        value="300">
                   </parameter>
                </command>
-                               <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
-                  <parameter
-                        name="frameCount"
-                        value="150">
-                  </parameter>
-               </command>
-                              <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
-                  <parameter
-                        name="frameCount"
-                        value="200">
-                  </parameter>
-               </command>
-                               <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
-                  <parameter
-                        name="frameCount"
-                        value="250">
-                  </parameter>
-               </command>
-                              <command
-                     commandId="com.raytheon.viz.ui.actions.setframes">
+               <command commandId="com.raytheon.viz.ui.actions.setframes">
                   <parameter
                         name="frameCount"
                         value="400">
diff --git a/cave/com.raytheon.viz.pointdata/localization/bundles/MetarPlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/MetarPlot.xml
index dc3cc47f01..db867cb309 100644
--- a/cave/com.raytheon.viz.pointdata/localization/bundles/MetarPlot.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/bundles/MetarPlot.xml
@@ -24,29 +24,75 @@
 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 			<descriptor xsi:type="mapDescriptor" currentAnimationMode="Temporal">
 				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${legend}"
-						plotModelFile="${svg}" spiFile="basemaps/MTR.spi"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true" isTopOfTheHour="true">
-						<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="reportType">
-								<constraint constraintValue="METAR" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pluginName">
-								<constraint constraintValue="obs" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
+	                <loadProperties loadWithoutData="true">
+                        <capabilities>
+                        </capabilities>
+	                    <resourceType>PLAIN_VIEW</resourceType>
+                    </loadProperties>
+					<resourceData xsi:type="plotBlendedResourceData">	
+						<resource>
+		               		<loadProperties loadWithoutData="true">
+		                   		<capabilities>
+		                   		</capabilities>
+		               		</loadProperties>
+							<properties isSystemResource="false" isBlinking="false"
+								isMapLayer="false" isHoverOn="false"
+								isVisible="true" />
+							<resourceData xsi:type="plotResourceData" plotSource="${legend}"
+								plotModelFile="${svg}" spiFile="basemaps/MTR.spi"
+								retrieveData="false" isUpdatingOnMetadataOnly="false"
+								isRequeryNecessaryOnTimeMatch="true" isTopOfTheHour="true">
+								<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
+										<metadataMap>
+											<mapping key="reportType">
+												<constraint constraintValue="METAR" constraintType="EQUALS" />
+											</mapping>
+											<mapping key="pluginName">
+												<constraint constraintValue="obs" constraintType="EQUALS" />
+											</mapping>
+										</metadataMap>
+							</resourceData>
+						</resource>
+						<resource>
+		               		<loadProperties loadWithoutData="true"/>
+							<properties isSystemResource="false" isBlinking="false"
+								isMapLayer="false" isHoverOn="false"
+								isVisible="true" />
+							<resourceData xsi:type="plotResourceData" plotSource="METAR/Maritime"
+								plotModelFile="maritimeDesign.svg"
+								isUpdatingOnMetadataOnly="true" retrieveData="false"
+								isRequeryNecessaryOnTimeMatch="true">
+								<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
+								<metadataMap>
+									<mapping key="reportType">
+										<constraint constraintValue="1003,1005,1007" constraintType="IN" />
+									</mapping>
+									<mapping key="pluginName">
+										<constraint constraintValue="sfcobs" constraintType="EQUALS" />
+									</mapping>
+								</metadataMap>
+							</resourceData>
+						</resource>
+						<resource>
+		               		<loadProperties loadWithoutData="true"/>
+							<properties isSystemResource="false" isBlinking="false"
+								isMapLayer="false" isHoverOn="false"
+								isVisible="true" />
+							<resourceData xsi:type="plotResourceData" plotSource="METAR/Maritime"
+								plotModelFile="ldadMesoDesign.svg"
+								isUpdatingOnMetadataOnly="true" retrieveData="false"
+								isRequeryNecessaryOnTimeMatch="true">
+								<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
+									<metadataMap>
+										<mapping key="pluginName">
+											<constraint constraintValue="ldadmesonet" constraintType="EQUALS" />
+										</mapping>
+									</metadataMap>
+							</resourceData>
+						</resource>
 					</resourceData>
 				</resource>
 			</descriptor>
 		</displays>
 	</displayList>
-</bundle>
\ No newline at end of file
+</bundle>
diff --git a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml
index a364525ec0..e686871fc2 100644
--- a/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/bundles/SurfacePlot.xml
@@ -38,7 +38,7 @@
 							<properties isSystemResource="false" isBlinking="false"
 								isMapLayer="false" isHoverOn="false"
 								isVisible="true" />
-							<resourceData xsi:type="plotResourceData" plotSource="METAR/Maritime/LDAD"
+							<resourceData xsi:type="plotResourceData" plotSource="METAR/Maritime"
 								plotModelFile="stdObsDesign.svg" spiFile="basemaps/MTR.spi"
 								isUpdatingOnMetadataOnly="true" retrieveData="false"
 								isRequeryNecessaryOnTimeMatch="true" isTopOfTheHour="true" pixelSizeHint="45">
@@ -58,7 +58,7 @@
 							<properties isSystemResource="false" isBlinking="false"
 								isMapLayer="false" isHoverOn="false"
 								isVisible="true" />
-							<resourceData xsi:type="plotResourceData" plotSource="METAR/Maritime/LDAD"
+							<resourceData xsi:type="plotResourceData" plotSource="METAR/Maritime"
 								plotModelFile="maritimeDesign.svg"
 								isUpdatingOnMetadataOnly="true" retrieveData="false"
 								isRequeryNecessaryOnTimeMatch="true">
@@ -78,7 +78,7 @@
 							<properties isSystemResource="false" isBlinking="false"
 								isMapLayer="false" isHoverOn="false"
 								isVisible="true" />
-							<resourceData xsi:type="plotResourceData" plotSource="METAR/Maritime/LDAD"
+							<resourceData xsi:type="plotResourceData" plotSource="METAR/Maritime"
 								plotModelFile="ldadMesoDesign.svg"
 								isUpdatingOnMetadataOnly="true" retrieveData="false"
 								isRequeryNecessaryOnTimeMatch="true">
diff --git a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml
index 13fca80d4d..033a33e583 100644
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml
@@ -20,7 +20,7 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<contribute xsi:type="bundleItem" file="bundles/StationPlot.xml"
-			menuText="Station Plot" id="StationPlot">		
+			menuText="Metar Plot" id="StationPlot">
     </contribute> 
 	<contribute xsi:type="subMenu" menuText="Other Plots">
 		<contribute xsi:type="bundleItem" file="bundles/15minSurfacePlot.xml"
diff --git a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml
index 508ed30482..1f5c6a1121 100644
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml
@@ -20,7 +20,7 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <contribute xsi:type="bundleItem" file="bundles/SynSurfacePlot.xml" 
-			menuText="Station Plot" id="SynSurfacePlot">
+			menuText="Synoptic Plot" id="SynSurfacePlot">
 		<substitute key="svg" value="stdSynDesign.svg"/>
 		<substitute key="legend" value="Synoptic Data Plot"/>
 		<substitute key="posOffset" value="19800"/>
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 e219202574..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllRegionalWarnings.xml
+++ /dev/null
@@ -1,283 +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="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,EXT,EXP" constraintType="IN" />
-							</mapping>
-							<mapping key="pil">
-								<constraint constraintValue="MWS,SMW,FFW,FLW,FLY,SVR,TOR,EWW,SVS,EWS,FFS,FLS" constraintType="IN" />
-							</mapping>
-							<mapping key="phensig">
-								<constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,TO.W,SV.W,EW.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="#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>
-				<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>
-				<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,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="#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,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="Local &amp; Regional 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>
-							<mapping key="officeid">
-								<constraint constraintValue="${site},${sites}" constraintType="IN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
-</bundle>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllWarnings.xml
similarity index 87%
rename from cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml
rename to cave/com.raytheon.viz.warnings/localization/bundles/AllWarnings.xml
index c2cda94a3b..d1138fd1e7 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllLocalWarnings.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllWarnings.xml
@@ -18,7 +18,7 @@
 						isUpdatingOnMetadataOnly="false"
 						isRequeryNecessaryOnTimeMatch="true"
 						retrieveData="false"
-						name="All Local Warnings"
+						name="All Warnings"
 						hideSampling="true">
 						<metadataMap>							
 							<mapping key="pluginName">
@@ -33,9 +33,6 @@
 							<mapping key="phensig">
 								<constraint constraintValue="MA.W,FF.W,FA.W,FA.Y,SV.W,TO.W,EW.W" constraintType="IN" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -53,7 +50,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local SVR Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="SVR Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
@@ -67,9 +64,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -87,7 +81,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local TOR Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="TOR Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
@@ -101,9 +95,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -121,7 +112,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local EWW Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="EWW Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
@@ -135,9 +126,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -156,7 +144,7 @@
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
 						isRequeryNecessaryOnTimeMatch="true"
-						name="Local Marine Warnings">
+						name="Marine Warnings">
 						<metadataMap>							
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
@@ -170,9 +158,6 @@
 							<mapping key="phensig">
 								<constraint constraintValue="MA.W" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -190,7 +175,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local Flash Flood Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="Flash Flood Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
@@ -204,9 +189,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -224,7 +206,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local Flood Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="Flood Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
@@ -238,9 +220,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -258,7 +237,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local Flood Advisories">
+						isRequeryNecessaryOnTimeMatch="true" name="Flood Advisories">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
@@ -272,8 +251,31 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
+						</metadataMap>
+					</resourceData>
+				</resource>
+				<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="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>
 						</metadataMap>
 					</resourceData>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/FloodWarnings.xml
similarity index 87%
rename from cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml
rename to cave/com.raytheon.viz.warnings/localization/bundles/FloodWarnings.xml
index 77d9e8baed..0ffedd8007 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAFloodWarnings.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/FloodWarnings.xml
@@ -18,7 +18,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local CWA Flood Warnings"
+						isRequeryNecessaryOnTimeMatch="true" name="Flood Warnings"
 						hideSampling="true">
 						<metadataMap>							
 							<mapping key="act">
@@ -33,9 +33,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -53,7 +50,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local Flash Flood Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="Flash Flood Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
@@ -67,9 +64,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -87,7 +81,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local Flood Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="Flood Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
@@ -101,9 +95,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -121,7 +112,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="false"
-						isRequeryNecessaryOnTimeMatch="true" name="Local Flood Advisories">
+						isRequeryNecessaryOnTimeMatch="true" name="Flood Advisories">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXT,EXP" constraintType="IN" />
@@ -135,9 +126,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
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 2eb75bd840..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalFloodWarnings.xml
+++ /dev/null
@@ -1,146 +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="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,FLY,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,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="#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,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="Local &amp; Regional 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>
-							<mapping key="officeid">
-								<constraint constraintValue="${site},${sites}" constraintType="IN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
-</bundle>
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 d550e8e093..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalRegionalWarnings.xml
+++ /dev/null
@@ -1,147 +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="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/LocalStormReportsOffice.xml b/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsOffice.xml
deleted file mode 100644
index 49b91b1d44..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsOffice.xml
+++ /dev/null
@@ -1,52 +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.
-    -->
-<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"> <!-- Ingesting LSR through the LSR GUI currently doesn't exist -->
-								<constraint constraintValue="OFFICE" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
-</bundle>
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 a780806a5d..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsRegion.xml
+++ /dev/null
@@ -1,52 +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.
-    -->
-<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},${sites}" constraintType="IN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
-</bundle>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml
index e2b9df390a..854f023d6c 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWarning.xml
@@ -52,9 +52,6 @@
 							<mapping key="phensig">
 								<constraint constraintValue="MA.W" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site},${sites}" constraintType="IN" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
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 c41e133de0..0000000000
--- a/cave/com.raytheon.viz.warnings/localization/bundles/RegionalCWAWarnings.xml
+++ /dev/null
@@ -1,147 +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="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/LocalCWASPS.xml b/cave/com.raytheon.viz.warnings/localization/bundles/SPS.xml
similarity index 86%
rename from cave/com.raytheon.viz.warnings/localization/bundles/LocalCWASPS.xml
rename to cave/com.raytheon.viz.warnings/localization/bundles/SPS.xml
index 899aee2d1f..3995e2e9b3 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWASPS.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/SPS.xml
@@ -17,7 +17,7 @@
 					<resourceData xsi:type="cwaspsResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="false" name="Local Sig Wx Advisories (SPS)"
+						isRequeryNecessaryOnTimeMatch="false" name="Sig Wx Advisories (SPS)"
 						hideSampling="true">
 						<metadataMap>							
 							<mapping key="pil">
@@ -26,9 +26,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsLocal.xml b/cave/com.raytheon.viz.warnings/localization/bundles/StormReports.xml
similarity index 94%
rename from cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsLocal.xml
rename to cave/com.raytheon.viz.warnings/localization/bundles/StormReports.xml
index 2127ec203a..67c91a9ba6 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalStormReportsLocal.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/StormReports.xml
@@ -40,9 +40,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="lsr" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="IN" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAWarnings.xml b/cave/com.raytheon.viz.warnings/localization/bundles/Warnings.xml
similarity index 86%
rename from cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAWarnings.xml
rename to cave/com.raytheon.viz.warnings/localization/bundles/Warnings.xml
index 1b6024ee6a..5c292163a2 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/LocalCWAWarnings.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/Warnings.xml
@@ -18,7 +18,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="true" name="Local CWA Warnings" 
+						isRequeryNecessaryOnTimeMatch="true" name="Warnings" 
 						hideSampling="true">
 						<metadataMap>							
 							<mapping key="act">
@@ -33,9 +33,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -53,7 +50,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="true" name="Local SVR Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="SVR Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
@@ -66,11 +63,7 @@
 							</mapping>
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
+							</mapping>						</metadataMap>
 					</resourceData>
 				</resource>
 				<resource>
@@ -87,7 +80,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="true" name="Local TOR Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="TOR Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
@@ -101,9 +94,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
@@ -121,7 +111,7 @@
 					<resourceData xsi:type="wwaResourceData" 						
 						isUpdatingOnMetadataOnly="false"
 						retrieveData="true"
-						isRequeryNecessaryOnTimeMatch="true" name="Local EWW Warnings">
+						isRequeryNecessaryOnTimeMatch="true" name="EWW Warnings">
 						<metadataMap>							
 							<mapping key="act">
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
@@ -135,9 +125,6 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="officeid">
-								<constraint constraintValue="${site}" constraintType="EQUALS" />
-							</mapping>
 						</metadataMap>
 					</resourceData>
 				</resource>
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 04e9d2b022..5f8763d133 100644
--- a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
+++ b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
@@ -19,49 +19,24 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!-- 
-	<contribute xsi:type="bundleItem" file="bundles/LocalCWASPS.xml" 
-              menuText="Local CWA SPS" id="localCWASPS">
+	<contribute xsi:type="bundleItem" file="bundles/Warnings.xml" 
+          menuText="Warnings" id="warnings">
     </contribute>
-    -->
-	<contribute xsi:type="bundleItem" file="bundles/LocalCWAWarnings.xml" 
-              menuText="Local CWA Warnings" id="localCWAWarnings">
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/LocalCWAFloodWarnings.xml" 
-              menuText="Local CWA Flood Warnings" id="localCWAFloodWarnings">
+	<contribute xsi:type="bundleItem" file="bundles/FloodWarnings.xml" 
+          menuText="Flood Warnings" id="FloodWarnings">
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/MarineWarning.xml" 
               menuText="Marine Warnings" id="marineWarnings">
     </contribute>
-			
-	<contribute xsi:type="subMenu" menuText="Other Warning Displays">
-		<contribute xsi:type="bundleItem" file="bundles/LocalRegionalWarnings.xml" 
-              menuText="Local and Regional Warnings" id="localRegionalWarnings">
-	    </contribute> 
-		<contribute xsi:type="bundleItem" file="bundles/LocalRegionalFloodWarnings.xml" 
-              menuText="Local and Regional Flood Warnings" id="localRegionalFloodWarnings">
-	    </contribute>   
-		<contribute xsi:type="bundleItem" file="bundles/AllLocalWarnings.xml" 
-              menuText="All Local Warnings" id="allLocalWarnings">
-	    </contribute>    
-	    <contribute xsi:type="bundleItem" file="bundles/AllRegionalWarnings.xml" 
-              menuText="All Regional Warnings" id="allRegionalWarnings">
-	    </contribute>
+	<contribute xsi:type="bundleItem" file="bundles/StormReports.xml"
+		menuText="Storm Reports" id="stormreports" >
+    	<substitute key="title" value="Storm Reports"/>
+    </contribute>
+	<contribute xsi:type="bundleItem" file="bundles/SPS.xml" 
+              menuText="SPS" id="SPS">
+    </contribute>
+	<contribute xsi:type="bundleItem" file="bundles/AllWarnings.xml" 
+          menuText="All Warnings" id="AllWarnings">
     </contribute>
-    <!--  There is no support in the backend for these reports -->
-    <contribute xsi:type="subMenu" menuText="Local Storm Reports">
-	    <contribute xsi:type="bundleItem" file="bundles/LocalStormReportsOffice.xml"
-			menuText="Office" id="office" >
-	    	<substitute key="title" value="Local Storm Reports"/>
-	    </contribute>
-		<contribute xsi:type="bundleItem" file="bundles/LocalStormReportsLocal.xml"
-			menuText="Local" id="local" >
-	    	<substitute key="title" value="Local Storm Reports"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/LocalStormReportsRegion.xml"
-			menuText="Region" id="region" >
-	    	<substitute key="title" value="Local Storm Reports"/>
-		</contribute>
 
-    </contribute>
 </menuTemplate>
\ No newline at end of file
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 1ce9f3ac2e..c34435b582 100644
--- a/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml
+++ b/cave/com.raytheon.viz.warnings/localization/menus/warnings/index.xml
@@ -19,11 +19,13 @@
         further_licensing_information.
     -->
 <menuContributionFile>
-	<include installTo="menu:obs?after=HAZARDS" 
+	<include installTo="menu:obs?after=WATCHWARN" 
              fileName="menus/warnings/baseWarnings.xml">
         <!-- Defaults to OAX, if there is a warnings index.xml file for the site
         you are localized to, that file will be used instead of the one here -->
 		<substitute key="site" value="KOAX"/>
+		<!--
         <substitute key="sites" value="KABR, KFSD,  KUNR, KBIS, KFGF, KBOU, KGJT, KPUB, KCYS, KRIW, KGID, KLBF, KOAX, KDDC, KGLD, KICT, KTOP,  KEAX, KLSX, KSGF, KDMX, KDVN, KDLH, KMPX, KARX, KGRB, KMKX, KILX, KLOT, KJKL, KLMK, KPAH, KIND, KIWX, KAPX, KDTX, KGRR, KMQT"/>
-    </include>
+    	-->
+	</include>
 </menuContributionFile>
\ No newline at end of file