diff --git a/lib/checks/100-custom-template-settings-usage.js b/lib/checks/100-custom-template-settings-usage.js
index 365a4c74..7a0145ce 100644
--- a/lib/checks/100-custom-template-settings-usage.js
+++ b/lib/checks/100-custom-template-settings-usage.js
@@ -137,8 +137,7 @@ const ruleImplementations = {
             result.customThemeSettings = new Set();
         },
         eachFile: ({file, theme, log, result, partialVerificationCache}) => {
-            let templateTest = file.file.match(/(?<!partials\/.+?)\.hbs$/);
-
+            let templateTest = file.file.match(/\.hbs$/);
             if (templateTest) {
                 parseWithAST({file, theme, rules: {
                     'mark-used-custom-theme-setting': require(`../ast-linter/rules/mark-used-custom-theme-settings`)
@@ -147,7 +146,14 @@ const ruleImplementations = {
                         result.customThemeSettings.add(variable);
                     });
                 }});
-            }
+                let regex = /\{\{[^}]*@custom\.([^\s}]+)[^}]*\}\}/g;
+                let match = file.content.matchAll(regex);
+                if (match) {
+                    for (const m of match) {
+                        result.customThemeSettings.add(m[1]);
+                    }
+                }   
+            } 
         },
         done: ({log, theme, result}) => {
             const config = Object.keys(theme.customSettings);