diff --git a/src/flextype/settings.yaml b/src/flextype/settings.yaml
index d03c3a7f..2b6bead0 100644
--- a/src/flextype/settings.yaml
+++ b/src/flextype/settings.yaml
@@ -79,6 +79,12 @@ entries:
   vars:
     debug: false
   expressions:
+    math:
+      enabled: true
+      class: "Flextype\\Entries\\Expressions\\MathExpression"
+    date:
+      enabled: true
+      class: "Flextype\\Entries\\Expressions\\DateExpression"
     actions:
       enabled: true
       class: "Flextype\\Entries\\Expressions\\ActionsExpression"
@@ -632,6 +638,9 @@ parsers:
         path: "src/flextype/core/Parsers/Shortcodes/EntriesShortcode.php"
         fetch:
           enabled: true
+      date:
+        enabled: true
+        path: "src/flextype/core/Parsers/Shortcodes/DateShortcode.php"
       php:
         enabled: true
         path: "src/flextype/core/Parsers/Shortcodes/PhpShortcode.php"
diff --git a/tests/fixtures/settings/settings.yaml b/tests/fixtures/settings/settings.yaml
index b48781ae..d0530820 100644
--- a/tests/fixtures/settings/settings.yaml
+++ b/tests/fixtures/settings/settings.yaml
@@ -79,6 +79,12 @@ entries:
   vars:
     debug: false
   expressions:
+    math:
+      enabled: true
+      class: "Flextype\\Entries\\Expressions\\MathExpression"
+    date:
+      enabled: true
+      class: "Flextype\\Entries\\Expressions\\DateExpression"
     actions:
       enabled: true
       class: "Flextype\\Entries\\Expressions\\ActionsExpression"
@@ -654,6 +660,9 @@ parsers:
       php:
         enabled: true
         path: "src/flextype/core/Parsers/Shortcodes/PhpShortcode.php"
+      date:
+        enabled: true
+        path: "src/flextype/core/Parsers/Shortcodes/DateShortcode.php"
       raw:
         enabled: true
         path: "src/flextype/core/Parsers/Shortcodes/RawShortcode.php"