diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
index f10d00607b..3f04f0b664 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/AllWWA.xml
@@ -18,7 +18,7 @@
                             <resourceData xsi:type="wwaResourceData" name="Flood Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
                                 <metadataMap>
                                     <mapping key="phensig">
-                                        <constraint constraintType="IN" 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"/>
+                                        <constraint constraintType="IN" constraintValue="FA.A,FL.A,FF.A,FA.W,FA.Y,FF.S,FF.W,FL.W,HY.S,FL.S,FL.Y"/>
                                     </mapping>
                                     <mapping key="pluginName">
                                         <constraint constraintType="EQUALS" constraintValue="warning"/>
@@ -44,7 +44,7 @@
                             <resourceData xsi:type="wwaResourceData" name="Wind Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
                                 <metadataMap>
                                     <mapping key="phensig">
-                                        <constraint constraintType="IN" 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"/>
+                                        <constraint constraintType="IN" constraintValue="EW.W,HW.A,HW.W,SI.Y,WI.Y"/>
                                     </mapping>
                                     <mapping key="pluginName">
                                         <constraint constraintType="EQUALS" constraintValue="warning"/>
@@ -70,7 +70,7 @@
                             <resourceData xsi:type="wwaResourceData" name="Convective Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
                                 <metadataMap>
                                     <mapping key="phensig">
-                                        <constraint constraintType="IN" constraintValue="TO.W,SV.W,EW.W,TO.A,SV.A"/>
+                                        <constraint constraintType="IN" constraintValue="TO.W,SV.W,TO.A,SV.A,SV.S"/>
                                     </mapping>
                                     <mapping key="pluginName">
                                         <constraint constraintType="EQUALS" constraintValue="warning"/>
@@ -96,7 +96,7 @@
                             <resourceData xsi:type="wwaResourceData" name="Winter Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
                                 <metadataMap>
                                     <mapping key="phensig">
-                                        <constraint constraintType="IN" constraintValue="WS.A,WS.W,WW.Y,SQ.W"/>
+                                        <constraint constraintType="IN" constraintValue="BZ.A,BZ.W,WS.A,WS.W,WW.Y,SQ.W,EC.A,EC.W,FR.Y,FZ.A,FZ.W,HZ.A,HZ.W,IS.W,WC.A,WC.W,WC.Y,ZF.Y,ZR.Y"/>
                                     </mapping>
                                     <mapping key="pluginName">
                                         <constraint constraintType="EQUALS" constraintValue="warning"/>
@@ -120,10 +120,37 @@
                             <properties isVisible="true" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="UNKNOWN">
                                 <pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/>
                             </properties>
-                            <resourceData xsi:type="wwaResourceData" name="Marine Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
+                            <resourceData xsi:type="wwaResourceData" name="Tropical/Marine Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
                                 <metadataMap>
                                     <mapping key="phensig">
-                                        <constraint constraintType="IN" 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"/>
+                                        <constraint constraintType="IN" constraintValue="BH.S,BW.Y,CF.A,CF.S,CF.W,CF.Y,GL.A,GL.W,HF.A,HF.W,HU.A,HU.S,HU.W,LE.A,LE.W,LE.Y,LO.Y,LS.A,LS.S,LS.W,LS.Y,LW.Y,RB.Y,RP.S,SC.Y,SE.A,SE.W,SR.A,SR.W,SS.A,SS.W,SU.W,SU.Y,SW.Y,TR.A,TR.W,TS.A,TS.W,TS.Y,TY.A,TY.W,UP.A,UP.W,UP.Y"/>
+                                    </mapping>
+                                    <mapping key="pluginName">
+                                        <constraint constraintType="EQUALS" constraintValue="warning"/>
+                                    </mapping>
+                                    <mapping key="act">
+                                        <constraint constraintType="IN" constraintValue="NEW,CON,CAN,EXP"/>
+                                    </mapping>
+                                </metadataMap>
+                            </resourceData>
+                        </resource>
+                        <resource>
+                            <loadProperties loadWithoutData="true">
+                                <resourceType>PLAN_VIEW</resourceType>
+                                <perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="false"/>
+                                <capabilities>
+                                    <capability xsi:type="magnificationCapability" magnification="1.0"/>
+                                    <capability xsi:type="colorableCapability" colorAsString="white"/>
+                                    <capability xsi:type="outlineCapability" outlineWidth="4" outlineOn="true" lineStyle="SOLID"/>
+                                </capabilities>
+                            </loadProperties>
+                            <properties isVisible="true" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="UNKNOWN">
+                                <pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/>
+                            </properties>
+                            <resourceData xsi:type="wwaResourceData" name="Other Watches, Warnings, Advisories" hideSampling="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="false">
+                                <metadataMap>
+                                    <mapping key="phensig">
+                                        <constraint constraintType="IN" constraintValue="AQ.Y,AS.O,AS.Y,DS.W,DU.Y,EH.A,EH.W,FG.Y,FW.A,FW.W,HT.Y,MF.Y,MH.W,MH.Y,MS.Y,SM.Y"/>
                                     </mapping>
                                     <mapping key="pluginName">
                                         <constraint constraintType="EQUALS" constraintValue="warning"/>
@@ -146,7 +173,7 @@
                             <properties isVisible="true" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="UNKNOWN">
                                 <pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/>
                             </properties>
-                            <resourceData xsi:type="cwaspsResourceData" name="Sig Wx Advisories (SPS)" hideSampling="true" isRequeryNecessaryOnTimeMatch="false" isUpdatingOnMetadataOnly="false" retrieveData="true">
+                            <resourceData xsi:type="cwaspsResourceData" name="Sig Wx Advisories (SPS)" hideSampling="false" isRequeryNecessaryOnTimeMatch="false" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="pluginName">
                                         <constraint constraintType="EQUALS" constraintValue="warning"/>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/ConvWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/ConvWWA.xml
new file mode 100644
index 0000000000..6c7f73a1cf
--- /dev/null
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/ConvWWA.xml
@@ -0,0 +1,60 @@
+<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="Convective Watches, Warnings and Advisories">
+						<metadataMap>							
+							<mapping key="act">
+								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
+							</mapping>
+							<mapping key="phensig">
+								<constraint constraintValue="TO.A,SV.A,TO.W,SV.W,EW.W,SV.S" constraintType="IN" />
+							</mapping>
+							<mapping key="pluginName">
+								<constraint constraintValue="warning" constraintType="EQUALS" />
+							</mapping>
+						</metadataMap>
+					</resourceData>
+				</resource>
+                <resource>
+                    <loadProperties loadWithoutData="true">
+                        <resourceType>PLAN_VIEW</resourceType>
+                        <perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="false"/>
+                        <capabilities>
+                            <capability xsi:type="colorableCapability" colorAsString="white"/>
+                            <capability xsi:type="outlineCapability" outlineWidth="4" outlineOn="true" lineStyle="SOLID"/>
+                        </capabilities>
+                    </loadProperties>
+                    <properties isVisible="true" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="UNKNOWN">
+                        <pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/>
+                    </properties>
+                    <resourceData xsi:type="cwaspsResourceData" name="Sig Wx Advisories (SPS)" hideSampling="false" isRequeryNecessaryOnTimeMatch="false" isUpdatingOnMetadataOnly="false" retrieveData="true">
+                        <metadataMap>
+                            <mapping key="pluginName">
+                                <constraint constraintType="EQUALS" constraintValue="warning"/>
+                            </mapping>
+                            <mapping key="pil">
+                                <constraint constraintType="IN" constraintValue="SPS"/>
+                            </mapping>
+                        </metadataMap>
+                    </resourceData>
+                </resource>
+			</descriptor>
+		</displays>
+	</displayList>
+</bundle>
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/FireWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/FireWWA.xml
new file mode 100644
index 0000000000..57cde11062
--- /dev/null
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/FireWWA.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="Fire Watches, Warnings, Advisories">
+						<metadataMap>							
+							<mapping key="act">
+								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
+							</mapping>
+							<mapping key="phensig">
+								<constraint constraintValue="FW.A,FW.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/MarineWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml
index ae4f7a13f3..70360c38ec 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/MarineWWA.xml
@@ -23,7 +23,8 @@
 								<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" />
+                                <constraint constraintValue="BH.S,BW.Y,CF.A,CF.S,CF.W,CF.Y,GL.A,GL.W,HF.A,HF.W,HU.A,HU.S,HU.W,LE.A,LE.W,LE.Y,LO.Y,LS.A,LS.S,LS.W,LS.Y,LW.Y,RB.Y,RP.S,SC.Y,SE.A,SE.W,SR.A,SR.W,SS.A,SS.W,SU.W,SU.Y,SW.Y,TR.A,TR.W,TS.A,TS.W,TS.Y,TY.A,TY.W,UP.A,UP.W,UP.Y" constraintType="IN" />
+                                
 							</mapping>
 							<mapping key="pluginName">
 								<constraint constraintValue="warning" constraintType="EQUALS" />
diff --git a/cave/com.raytheon.viz.warnings/localization/bundles/OtherWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/OtherWWA.xml
new file mode 100644
index 0000000000..08abfd0060
--- /dev/null
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/OtherWWA.xml
@@ -0,0 +1,38 @@
+<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="Other Watches, Warnings, Advisories">
+						<metadataMap>							
+							<mapping key="act">
+								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
+							</mapping>
+							<mapping key="phensig">
+                                <constraint constraintValue="AQ.Y,AS.O,AS.Y,DS.W,DU.Y,EC.A,EC.W,EH.A,EH.W,FG.Y,FW.A,FW.W,HT.Y,MF.Y,MH.W,MH.Y,MS.Y,SM.Y,WC.A,WC.W,WC.Y,ZF.Y,ZR.Y" 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/WindWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/WindWWA.xml
index 8217e68841..4aca8d12e1 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/WindWWA.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/WindWWA.xml
@@ -23,7 +23,7 @@
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
 							</mapping>
 							<mapping key="phensig">
-								<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" />
+								<constraint constraintValue="BW.Y,EW.W,HF.A,HF.W,HW.A,HW.W,LW.Y,SI.Y,GL.A,GL.W,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/bundles/WinterWWA.xml b/cave/com.raytheon.viz.warnings/localization/bundles/WinterWWA.xml
index f33dcde649..6f09ea6b2e 100644
--- a/cave/com.raytheon.viz.warnings/localization/bundles/WinterWWA.xml
+++ b/cave/com.raytheon.viz.warnings/localization/bundles/WinterWWA.xml
@@ -23,7 +23,7 @@
 								<constraint constraintValue="NEW,CON,CAN,EXP" constraintType="IN" />
 							</mapping>
 							<mapping key="phensig">
-								<constraint constraintValue="WS.A,WS.W,WW.Y,SQ.W" constraintType="IN" />
+								<constraint constraintValue="BZ.A,BZ.W,WS.A,WS.W,WW.Y,SQ.W,EC.A,EC.W,FR.Y,FZ.A,FZ.W,HZ.A,LE.A,LE.W,LE.Y,HZ.W,IS.W,WC.A,WC.W,WC.Y,ZF.Y,ZR.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 077127b9cd..d3ebf2ee8f 100644
--- a/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
+++ b/cave/com.raytheon.viz.warnings/localization/menus/warnings/baseWarnings.xml
@@ -10,30 +10,41 @@
     
   <!--   <contribute xsi:type="bundleItem" file="bundles/AllWarnings.xml" 
           menuText="All Warnings" id="warnings">
-    </contribute> --> 
+    </contribute> 
 	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/ConvectiveWatchPlot.xml"
              menuText="Convective Watches" id="convectiveWatches">
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/ConvWarn.xml" 
           menuText="Convective Warnings" id="convWarnings">
-    </contribute>
+    </contribute>--> 
 
 	<contribute xsi:type="separator" id="separator4"/>
+	<contribute xsi:type="bundleItem" file="bundles/ConvWWA.xml" 
+          menuText="Convective Watches, Warnings, Advisories" id="ConvWarnings">
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/FireWWA.xml" 
+          menuText="Fire Watches, Warnings, Advisories" id="fireWarnings">
+    </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/FloodWWA.xml" 
           menuText="Flood Watches, Warnings, Advisories" id="FloodWarnings">
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/MarineWWA.xml" 
+              menuText="Tropical/Marine Watches, Warnings, Advisories" id="marineWarnings">
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/WindWWA.xml" 
           menuText="Wind Watches, Warnings, Advisories" id="windWarnings">
-    </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/MarineWWA.xml" 
-              menuText="Marine Watches, Warnings, Advisories" id="marineWarnings">
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/WinterWWA.xml" 
           menuText="Winter Watches, Warnings, Advisories" id="winterWarnings">
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/OtherWWA.xml" 
+          menuText="Other Watches, Warnings, Advisories" id="otherWarnings">
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/SPS.xml" 
               menuText="SPS / Sig Wx Advisories" id="SPS">
     </contribute>
+    <contribute xsi:type="separator" id="separator4"/>
+    
 	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/SvrWxPlot.xml" 
                menuText="SPC Svr Wx Plot" id="spcWxPlot">
 	</contribute>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml
index 419b1d9d97..849f301767 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/phensigColors.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <phensigColors>
 	<map>
-	  <entry><key>AF.W</key><value color="gray" name="Ashfall Warning"></value></entry>
-	  <entry><key>AF.Y</key><value color="gray" name="Ashfall Advisory"></value></entry>
 	  <entry><key>AQ.Y</key><value color="gray" name="Air Quality Alert"></value></entry>
 	  <entry><key>AS.O</key><value color="gray" name="Air Stagnation Outlook"></value></entry>
 	  <entry><key>AS.Y</key><value color="gray" name="Air Stagnation Advisory"></value></entry>