diff --git a/config/sync/comment_notify.settings.yml b/config/sync/comment_notify.settings.yml
index ba92381..3b60022 100644
--- a/config/sync/comment_notify.settings.yml
+++ b/config/sync/comment_notify.settings.yml
@@ -1,19 +1,22 @@
 bundle_types:
   - node--article--comment
+  - node--blog--comment
+  - node--collection--comment
+  - node--gleaning--comment
 available_alerts:
   1: true
-  2: true
+  2: false
 enable_default:
-  watcher: none
-  entity_author: false
+  watcher: '1'
+  entity_author: true
 mail_templates:
   watcher:
     node:
       subject: '[site:name] :: new comment on [node:title]'
-      body: "Hi [comment-subscribed:author],\n\n[comment:author] has commented on: \"[node:title]\"\n\n----\n[comment:title]\n[comment:body]\n----\n\nYou can view the comment at the following url\n[comment:url]\n\nYou can stop receiving emails when someone replies to this post,\nby going to [comment-subscribed:unsubscribe-url]\n\nYou can set up auto-following feature for all future posts\nby creating your own user with a few clicks here [site:login-url]\n\n-- [site:name] team\n[site:url]\n"
+      body: "Hi [comment-subscribed:author],\r\n\r\n[comment:author] has commented on: \"[node:title]\"\r\n\r\n----\r\n[comment:title]\r\n[comment:body]\r\n----\r\n\r\nYou can view the comment at the following url\r\n[comment:url]\r\n\r\nYou can stop receiving emails when someone replies to this post,\r\nby going to [comment-subscribed:unsubscribe-url]\r\n\r\nYou can set up auto-following feature for all future posts\r\nby creating your own user with a few clicks here [site:login-url]\r\n\r\n-- [site:name] team\r\n[site:url]\r\n"
   entity_author:
     node:
       subject: '[site:name] :: new comment for your post'
-      body: "Hi [node:author],\n\nYou have received a comment on: \"[node:title]\"\n\n----\n[comment:title]\n[comment:body]\n----\n\nYou can view the comment at the following url\n[comment:url]\n\nYou will receive emails like this for all replies to your posts. You can\ndisable this by logging in and changing the settings on your user account at\n[node:author:edit-url].\n\n-- [site:name] team\n[site:url]\n"
+      body: "Hi [node:author],\r\n\r\nYou have received a comment on: \"[node:title]\"\r\n\r\n----\r\n[comment:title]\r\n[comment:body]\r\n----\r\n\r\nYou can view the comment at the following url\r\n[comment:url]\r\n\r\nYou will receive emails like this for all replies to your posts. You can\r\ndisable this by logging in and changing the settings on your user account at\r\n[node:author:edit-url].\r\n\r\n-- [site:name] team\r\n[site:url]\r\n"
 _core:
   default_config_hash: y7oCzsZ-B0R-nyeSFO1f2h9BEChUQGSZT-3cqXd-sLE