diff --git a/scwx-qt/source/scwx/qt/settings/general_settings.cpp b/scwx-qt/source/scwx/qt/settings/general_settings.cpp
index e6d49a4b..fe3982e2 100644
--- a/scwx-qt/source/scwx/qt/settings/general_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/general_settings.cpp
@@ -52,6 +52,7 @@ public:
 
       antiAliasingEnabled_.SetDefault(true);
       clockFormat_.SetDefault(defaultClockFormatValue);
+      customStyleDrawLayer_.SetDefault(".*\\.annotations\\.points");
       debugEnabled_.SetDefault(false);
       defaultAlertAction_.SetDefault(defaultDefaultAlertActionValue);
       defaultRadarSite_.SetDefault("KLSX");
@@ -102,6 +103,8 @@ public:
          SCWX_SETTINGS_ENUM_VALIDATOR(scwx::util::ClockFormat,
                                       scwx::util::ClockFormatIterator(),
                                       scwx::util::GetClockFormatName));
+      customStyleDrawLayer_.SetValidator([](const std::string& value)
+                                         { return !value.empty(); });
       defaultAlertAction_.SetValidator(
          SCWX_SETTINGS_ENUM_VALIDATOR(types::AlertAction,
                                       types::AlertActionIterator(),
diff --git a/test/data b/test/data
index f631a9ff..0ea32947 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit f631a9ffa16353d8560ecec7ee16f4e2ae20b310
+Subproject commit 0ea32947d6a6e39a69d931b2827056e7bc58cbba