diff --git a/.eslintignore b/.eslintignore
index 12d5a11..4364a64 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,5 @@
 **/node_modules/**
 node_modules/**
 **/empty-dust/**
-**/empty-jade/**
+**/empty-pug/**
 **/example/**
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 3e8f6e7..9d7b984 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,12 +4,12 @@
 [submodule "templates/empty-handlebars"]
 	path = templates/empty-handlebars
 	url = https://github.com/catberry/catberry-hello-world-handlebars.git
-[submodule "templates/empty-jade"]
-	path = templates/empty-jade
-	url = https://github.com/catberry/catberry-hello-world-jade.git
 [submodule "templates/empty-dust"]
 	path = templates/empty-dust
 	url = https://github.com/catberry/catberry-hello-world-dust.git
 [submodule "module_presets"]
 	path = module_presets
 	url = https://github.com/catberry/catberry-module-presets.git
+[submodule "templates/empty-pug"]
+	path = templates/empty-pug
+	url = https://github.com/catberry/catberry-hello-world-pug.git
diff --git a/README.md b/README.md
index 9f7e8c4..baa7632 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Included templates:
 * `example` - finished project that works with GitHub API and demonstrates how to implement such isomorphic application using Catberry Framework
 * `empty-handlebars` - empty project using [Handlebars](http://handlebarsjs.com/) template engine.
 * `empty-dust` - empty project using [Dust](https://github.com/catberry/catberry-dust) template engine.
-* `empty-jade` - empty project using [Jade](http://jade-lang.com/) template engine.
+* `empty-pug` - empty project using [Pug](https://pugjs.org/) template engine.
 
 ### Add [Store](https://github.com/catberry/catberry/blob/master/docs/index.md#stores) into your project
  
@@ -44,7 +44,7 @@ Also you can use `preset` values such as:
 
 * `handlebars` (by default)
 * `dust`
-* `jade`
+* `pug`
 
 To get more usage details, please use `catberry --help`
 
diff --git a/lib/templateManager.js b/lib/templateManager.js
index f0d275a..111de17 100644
--- a/lib/templateManager.js
+++ b/lib/templateManager.js
@@ -19,7 +19,7 @@ const DEFAULTS = {
 const COMPONENT_PRESETS = {
 	handlebars: 'component-handlebars',
 	dust: 'component-dust',
-	jade: 'component-jade'
+	pug: 'component-pug'
 };
 
 module.exports = {
diff --git a/templates/empty-dust b/templates/empty-dust
index c055afa..32d9ebc 160000
--- a/templates/empty-dust
+++ b/templates/empty-dust
@@ -1 +1 @@
-Subproject commit c055afa7bb9635f232bc9d9db913106bf4c281f0
+Subproject commit 32d9ebc8c6f5092975c8cde9780289c2e46b17c1
diff --git a/templates/empty-handlebars b/templates/empty-handlebars
index bd3755e..4b0edcd 160000
--- a/templates/empty-handlebars
+++ b/templates/empty-handlebars
@@ -1 +1 @@
-Subproject commit bd3755eb592b6f7c24a1b011d45aecbd469782da
+Subproject commit 4b0edcd424b634e703d3cb660c7aca76526b166a
diff --git a/templates/empty-jade b/templates/empty-jade
deleted file mode 160000
index 5cf11c3..0000000
--- a/templates/empty-jade
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5cf11c39b687afd4b6a3e6fbc90e0dca45d30179
diff --git a/templates/empty-pug b/templates/empty-pug
new file mode 160000
index 0000000..dbbc322
--- /dev/null
+++ b/templates/empty-pug
@@ -0,0 +1 @@
+Subproject commit dbbc322acddd97460333738a65533282a0230852
diff --git a/templates/example b/templates/example
index da4eb9c..766c15e 160000
--- a/templates/example
+++ b/templates/example
@@ -1 +1 @@
-Subproject commit da4eb9cc258fbd141fab7c99aa79bb1d496074bf
+Subproject commit 766c15e979631f99c5a4d5306229b2835d0c47a4