diff --git a/conf/DrivewayAlert.conf b/conf/DrivewayAlert.conf
new file mode 100644
index 00000000..7a2730b2
--- /dev/null
+++ b/conf/DrivewayAlert.conf
@@ -0,0 +1,24 @@
+# Decoder for the Harbor Freight / Bunker Hill Wireless / Ironton
+# Wireless Security Alert System / Wireless Driveway Alert System
+# Passive Infrared Sensor by ZHUJI JIARONG ELECTRICAL APPLIANCE CO.,LTD.
+#
+# Operates on 433.920MHz.
+# All models emit identical id's.
+#
+# Reference:
+#   https://fccid.io/2AA9QJR-178
+#   https://triq.org/pdv/#AAB01A04010160043C15B831DC8180918180918091818180909090909255+AAB01D04190160043C15B831DC8181818180918180918091818180909090909255+AAB01D04010160043C15B831DC8181818180918180918091818180909090909355
+
+decoder {
+    name=DrivewayAlert,
+    modulation=OOK_PWM,
+    short=368,
+    long=1108,
+    reset=5572,
+    gap=1076,
+    tolerance=296,
+    sync=0,
+    match={19}0xfb5c00,
+    bits=19,
+    unique,
+}
diff --git a/conf/GhostControls.conf b/conf/GhostControls.conf
index 28aa3bfe..18c3194e 100644
--- a/conf/GhostControls.conf
+++ b/conf/GhostControls.conf
@@ -25,6 +25,6 @@ decoder {
     get=unit:@0:{4}:[1:remote 2:keypad],
     get=options:@4:{4}:[0:none 8:party 9:vacation 15:test],
     get=command:@8:{4}:[0:none 3:toggle],
-    get=button:@12:{7}:[1:primary 0:secondary],
-    get=id:@19:{23},
+    get=button:@12:{8}:[0:none 1:secondary 2:primary],
+    get=id:@20:{22},
 }