diff --git a/etc/enhancements/abi.yaml b/etc/enhancements/abi.yaml
index 5f358098..05629734 100644
--- a/etc/enhancements/abi.yaml
+++ b/etc/enhancements/abi.yaml
@@ -32,46 +32,101 @@ enhancements:
         kwargs: {stretch: 'crude', min_stretch: 280., max_stretch: 180.}
 
   # Level 2
-  aerosol_optical_depth:
-    name: AOD
+  cloud_top_height:
+    name: HT
     operations:
       - name: colorize
         method: !!python/name:satpy.enhancements.colorize
         kwargs:
           palettes:
             - filename: colormaps/abi_l2_modified_cloud_top.cmap
-              min_value: 0.0
-              max_value: 1.0
+              min_value: -300
+              max_value: 20000
 
-  cloud_top_height:
-    name: HT
+  cloud_top_temperature:
+    name: TEMP
     operations:
       - name: colorize
         method: !!python/name:satpy.enhancements.colorize
         kwargs:
           palettes:
             - filename: colormaps/abi_l2_modified_cloud_top.cmap
-              min_value: -300
-              max_value: 20000
-
-  land_surface_temp:
+              min_value: 300
+              max_value: 200
+  lst:
     name: LST
+    sensor: abi
     operations:
       - name: colorize
-        method: !!python/name:satpy.enhancements.colorize
+        method: !!python/name:polar2grid.enhancements.colorize
         kwargs:
           palettes:
-            - filename: colormaps/abi_l2_modified_cloud_top.cmap
-              min_value: 223.15
-              max_value: 323.15
+            # AWIPS "VTRSB.cmap"
+            - min_value: 223.15
+              max_value: 429.15
+              values: [
+                0.0,
+                0.1,
+                0.2,
+                0.3,
+                0.4,
+                0.5,
+                0.6,
+                0.7,
+                0.8,
+                0.9,
+                1.0,
+              ]
+              colors: [
+                [0.0, 0.0, 0.0],
+                [0.5, 0.0, 1.0],
+                [0.0, 0.0, 1.0],
+                [0.0, 0.5, 1.0],
+                [0.0, 1.0, 1.0],
+                [0.0, 1.0, 0.5],
+                [0.0, 1.0, 0.0],
+                [0.5, 1.0, 0.0],
+                [1.0, 1.0, 0.0],
+                [1.0, 0.5, 0.0],
+                [1.0, 0.0, 0.0],
+              ]
+              color_scale: 1.0
 
-  cloud_top_temperature:
-    name: TEMP
+  aod:
+    name: AOD
+    sensor: abi
     operations:
       - name: colorize
-        method: !!python/name:satpy.enhancements.colorize
+        method: !!python/name:polar2grid.enhancements.colorize
         kwargs:
+          # AWIPS "VTRSB.cmap"
           palettes:
-            - filename: colormaps/abi_l2_modified_cloud_top.cmap
-              min_value: 300
-              max_value: 200
+            - min_value: 0.0
+              max_value: 1.0
+              values: [
+                0.0,
+                0.1,
+                0.2,
+                0.3,
+                0.4,
+                0.5,
+                0.6,
+                0.7,
+                0.8,
+                0.9,
+                1.0,
+              ]
+              colors: [
+                [0.0, 0.0, 0.0],
+                [0.5, 0.0, 1.0],
+                [0.0, 0.0, 1.0],
+                [0.0, 0.5, 1.0],
+                [0.0, 1.0, 1.0],
+                [0.0, 1.0, 0.5],
+                [0.0, 1.0, 0.0],
+                [0.5, 1.0, 0.0],
+                [1.0, 1.0, 0.0],
+                [1.0, 0.5, 0.0],
+                [1.0, 0.0, 0.0],
+              ]
+              color_scale: 1.0
diff --git a/etc/enhancements/viirs.yaml b/etc/enhancements/viirs.yaml
index 5a09d7f9..53c3aaac 100644
--- a/etc/enhancements/viirs.yaml
+++ b/etc/enhancements/viirs.yaml
@@ -198,3 +198,25 @@ enhancements:
                 [1.0, 0.0, 0.0],
               ]
               color_scale: 1.0
+
+  cloud_top_height:
+    name: CldTopHght
+    operations:
+      - name: colorize
+        method: !!python/name:satpy.enhancements.colorize
+        kwargs:
+          palettes:
+            - filename: colormaps/abi_l2_modified_cloud_top.cmap
+              min_value: -300
+              max_value: 20000
+
+  cloud_top_temperature:
+    name: CldTopTemp
+    operations:
+      - name: colorize
+        method: !!python/name:satpy.enhancements.colorize
+        kwargs:
+          palettes:
+            - filename: colormaps/abi_l2_modified_cloud_top.cmap
+              min_value: 300
+              max_value: 200