diff --git a/composer.json b/composer.json
index 2d8d295..5a8af4f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
         "drupal/block_theme_sync": "^1.0@alpha",
         "drupal/ckeditor_markdown": "^1.1",
         "drupal/coffee": "1.x-dev",
+        "drupal/comment_notify": "dev-1.x",
         "drupal/core": "^8.6.2",
         "drupal/customerror": "1.x-dev",
         "drupal/diff": "^1.0@RC",
@@ -97,7 +98,11 @@
 	    },
 	    "drupal/honeypot": {
 		"Accessibility Issue Triggered": "https://www.drupal.org/files/issues/2018-08-05/honeypot-aria-hidden-on-text-field-2944843-12.patch"
-	    }
+	    },
+      "drupal/comment_notify": {
+        "Invalid placeholder (!types) in string": "https://www.drupal.org/files/issues/2019-01-16/2938134-4.patch",
+        "The unsubscribe option is not working": "https://www.drupal.org/files/issues/2019-01-17/3026687-2.patch"
+      }
 	}
     },
     "config": {
diff --git a/composer.lock b/composer.lock
index 98d4f90..21adf58 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "df837a6abe3318a8381ad8fc5dd64b17",
+    "content-hash": "788dcf2c1028c477fe97c294b439dbba",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -2346,7 +2346,7 @@
                 },
                 "drupal": {
                     "version": "8.x-1.25",
-                    "datestamp": "1542915384",
+                    "datestamp": "1542915180",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -2417,7 +2417,7 @@
                 },
                 "drupal": {
                     "version": "8.x-1.25",
-                    "datestamp": "1542915384",
+                    "datestamp": "1542915180",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -2947,6 +2947,53 @@
             },
             "time": "2018-11-12T07:59:17+00:00"
         },
+        {
+            "name": "drupal/comment_notify",
+            "version": "dev-1.x",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/comment_notify",
+                "reference": "01751b118ce3765fe3af07a36ca8c6f6687c6534"
+            },
+            "require": {
+                "drupal/core": "*",
+                "drupal/token": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0-beta2+7-dev",
+                    "datestamp": "1544815219",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Dev releases are not covered by Drupal security advisories."
+                    }
+                },
+                "patches_applied": {
+                    "Invalid placeholder (!types) in string": "https://www.drupal.org/files/issues/2019-01-16/2938134-4.patch",
+                    "The unsubscribe option is not working": "https://www.drupal.org/files/issues/2019-01-17/3026687-2.patch"
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "greggles",
+                    "homepage": "https://www.drupal.org/user/36762"
+                }
+            ],
+            "description": "Comment follow-up e-mail notification for anonymous as well as registered users.",
+            "homepage": "https://www.drupal.org/project/comment_notify",
+            "support": {
+                "source": "http://cgit.drupalcode.org/comment_notify"
+            },
+            "time": "2018-12-28T18:11:39+00:00"
+        },
         {
             "name": "drupal/components",
             "version": "1.0.0",
@@ -4029,7 +4076,7 @@
                 },
                 "drupal": {
                     "version": "8.x-1.x-dev",
-                    "datestamp": "1542578580",
+                    "datestamp": "1542572880",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Dev releases are not covered by Drupal security advisories."
@@ -6494,6 +6541,10 @@
                     "name": "golddragon007",
                     "homepage": "https://www.drupal.org/user/2723471"
                 },
+                {
+                    "name": "james.williams",
+                    "homepage": "https://www.drupal.org/user/592268"
+                },
                 {
                     "name": "lbesenyei",
                     "homepage": "https://www.drupal.org/user/2626013"
@@ -6550,10 +6601,6 @@
                 {
                     "name": "kristiaanvandeneynde",
                     "homepage": "https://www.drupal.org/user/1345130"
-                },
-                {
-                    "name": "ronaldtebrake",
-                    "homepage": "https://www.drupal.org/user/2314038"
                 }
             ],
             "description": "Enables Group functionality for the Node module",
@@ -6657,10 +6704,6 @@
                 {
                     "name": "kristiaanvandeneynde",
                     "homepage": "https://www.drupal.org/user/1345130"
-                },
-                {
-                    "name": "ronaldtebrake",
-                    "homepage": "https://www.drupal.org/user/2314038"
                 }
             ],
             "description": "This module allows you to group users, content and other entities",
@@ -12766,6 +12809,7 @@
     "stability-flags": {
         "drupal/block_theme_sync": 15,
         "drupal/coffee": 20,
+        "drupal/comment_notify": 20,
         "drupal/customerror": 20,
         "drupal/diff": 5,
         "drupal/drutopia_core": 20,
diff --git a/config/sync/comment_notify.settings.yml b/config/sync/comment_notify.settings.yml
new file mode 100644
index 0000000..17a406f
--- /dev/null
+++ b/config/sync/comment_notify.settings.yml
@@ -0,0 +1,17 @@
+node_types:
+  - blog
+available_alerts:
+  1: true
+  2: false
+enable_default:
+  watcher: '1'
+  entity_author: true
+mail_templates:
+  watcher:
+    subject: '[site:name] :: new comment on [node:title]'
+    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:
+    subject: '[site:name] :: new comment for your post'
+    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: Q6HMOSKUhb-YgBPZ1JIbcVeOxHPv-eJoBGYmXiG9Pik
diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.comment_notify.yml b/config/sync/config_snapshot.snapshot.config_sync.module.comment_notify.yml
new file mode 100644
index 0000000..ef80d9b
--- /dev/null
+++ b/config/sync/config_snapshot.snapshot.config_sync.module.comment_notify.yml
@@ -0,0 +1,30 @@
+uuid: 49585043-4c03-4f31-a704-0cc843abf295
+langcode: en
+status: true
+dependencies:
+  module:
+    - comment_notify
+id: config_sync.module.comment_notify
+snapshotSet: config_sync
+extensionType: module
+extensionName: comment_notify
+items:
+  -
+    collection: ''
+    name: comment_notify.settings
+    data:
+      node_types:
+        - article
+      available_alerts:
+        1: true
+        2: true
+      enable_default:
+        watcher: none
+        entity_author: false
+      mail_templates:
+        watcher:
+          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"
+        entity_author:
+          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"
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index b2576a7..26bb499 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -141,6 +141,7 @@ module:
   ds: 1
   menu_link_content: 1
   pathauto: 1
+  comment_notify: 10
   content_translation: 10
   indieweb_microformat: 10
   views: 10
diff --git a/config/sync/language/es/field.field.block_content.basic.body.yml b/config/sync/language/es/field.field.block_content.basic.body.yml
new file mode 100644
index 0000000..92785c1
--- /dev/null
+++ b/config/sync/language/es/field.field.block_content.basic.body.yml
@@ -0,0 +1 @@
+label: Cuerpo
diff --git a/config/sync/language/es/field.field.node.action.body.yml b/config/sync/language/es/field.field.node.action.body.yml
new file mode 100644
index 0000000..92785c1
--- /dev/null
+++ b/config/sync/language/es/field.field.node.action.body.yml
@@ -0,0 +1 @@
+label: Cuerpo
diff --git a/config/sync/language/es/field.field.node.article.body.yml b/config/sync/language/es/field.field.node.article.body.yml
new file mode 100644
index 0000000..92785c1
--- /dev/null
+++ b/config/sync/language/es/field.field.node.article.body.yml
@@ -0,0 +1 @@
+label: Cuerpo
diff --git a/config/sync/language/es/field.field.node.blog.body.yml b/config/sync/language/es/field.field.node.blog.body.yml
new file mode 100644
index 0000000..92785c1
--- /dev/null
+++ b/config/sync/language/es/field.field.node.blog.body.yml
@@ -0,0 +1 @@
+label: Cuerpo
diff --git a/config/sync/language/es/field.field.node.campaign.body.yml b/config/sync/language/es/field.field.node.campaign.body.yml
new file mode 100644
index 0000000..92785c1
--- /dev/null
+++ b/config/sync/language/es/field.field.node.campaign.body.yml
@@ -0,0 +1 @@
+label: Cuerpo
diff --git a/config/sync/language/es/field.field.node.case_study.body.yml b/config/sync/language/es/field.field.node.case_study.body.yml
new file mode 100644
index 0000000..92785c1
--- /dev/null
+++ b/config/sync/language/es/field.field.node.case_study.body.yml
@@ -0,0 +1 @@
+label: Cuerpo
diff --git a/config/sync/language/es/field.field.node.event.body.yml b/config/sync/language/es/field.field.node.event.body.yml
new file mode 100644
index 0000000..92785c1
--- /dev/null
+++ b/config/sync/language/es/field.field.node.event.body.yml
@@ -0,0 +1 @@
+label: Cuerpo
diff --git a/config/sync/language/es/field.field.node.page.body.yml b/config/sync/language/es/field.field.node.page.body.yml
new file mode 100644
index 0000000..92785c1
--- /dev/null
+++ b/config/sync/language/es/field.field.node.page.body.yml
@@ -0,0 +1 @@
+label: Cuerpo
diff --git a/config/sync/language/es/field.field.node.resource.body.yml b/config/sync/language/es/field.field.node.resource.body.yml
new file mode 100644
index 0000000..92785c1
--- /dev/null
+++ b/config/sync/language/es/field.field.node.resource.body.yml
@@ -0,0 +1 @@
+label: Cuerpo
diff --git a/config/sync/user.role.anonymous.yml b/config/sync/user.role.anonymous.yml
index ad4c707..d58c85c 100644
--- a/config/sync/user.role.anonymous.yml
+++ b/config/sync/user.role.anonymous.yml
@@ -14,6 +14,7 @@ permissions:
   - 'access content'
   - 'access site-wide contact form'
   - 'post comments'
+  - 'subscribe to comments'
   - 'use exclude node title'
   - 'use text format minimalhtml'
   - 'use text format restricted_html'
diff --git a/config/sync/user.role.authenticated.yml b/config/sync/user.role.authenticated.yml
index cec6f7e..ac33796 100644
--- a/config/sync/user.role.authenticated.yml
+++ b/config/sync/user.role.authenticated.yml
@@ -19,6 +19,7 @@ permissions:
   - 'edit own comments'
   - 'post comments'
   - 'skip comment approval'
+  - 'subscribe to comments'
   - 'use exclude node title'
   - 'use text format basic_html'
   - 'use text format minimalhtml'