diff --git a/cheetah/rro_overlays/UwbOverlay/res/values/config.xml b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml
index 7a77d32..0d69434 100644
--- a/cheetah/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml
@@ -17,4 +17,15 @@
  */
 -->
 <resources>
+  <!-- When true, the filter engine will alter UWB values to improve accuracy. -->
+  <bool name="enable_filters">true</bool>
+
+  <!-- Enables elevation estimation. Strongly recommended for hardware that doesn't support
+  elevation. This helps produce better predictions from pose changes, and improves the quality
+  of the AoA primer. -->
+  <bool name="enable_primer_est_elevation">false</bool>
+
+  <!-- Enables the AoA conversion primer. This is needed on hardware that does not convert AoA
+  to spherical coordinates, including hardware that does not support elevation.-->
+  <bool name="enable_primer_aoa">true</bool>
 </resources>
diff --git a/device-cheetah.mk b/device-cheetah.mk
index e1f5e13..f9b8f61 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -373,10 +373,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Device features
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
-
-# Window Extensions
-$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
-
-# Disable Settings large-screen optimization enabled by Window Extensions
-PRODUCT_SYSTEM_PROPERTIES += \
-    persist.settings.large_screen_opt.enabled=false
diff --git a/device-panther.mk b/device-panther.mk
index 21e2f75..f289096 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -356,10 +356,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Device features
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
-
-# Window Extensions
-$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
-
-# Disable Settings large-screen optimization enabled by Window Extensions
-PRODUCT_SYSTEM_PROPERTIES += \
-    persist.settings.large_screen_opt.enabled=false