diff --git a/gulpfile.js b/gulpfile.js
index 0b07ef70aa94041cb42caa28fc96f5fcb13b6a9e..71b18ecf519aec24df75032a1196815bd150ce2b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -59,7 +59,8 @@ var paths = new (function () {
         js: media + '/js/**/*.js',
         config: src + '/deploy/phpConfig/**/*',
         css_components: media + '/components/**/*.css',
-        js_components: media + '/components/**/*.js'
+        js_components: media + '/components/**/*.js',
+        twig_components: media + '/components/**/*.twig'
     };
 
 
@@ -69,7 +70,8 @@ var paths = new (function () {
         js: stat + '/js/',
         config: dst + '/application/config/',
         css_components: stat + '/components/',
-        js_components: stat + '/components/'
+        js_components: stat + '/components/',
+        twig_components: stat + '/components/'
     };
 })();
 
@@ -91,13 +93,15 @@ var pipes = (function () {
     var jsPipe = lazypipe()
         .pipe(options.opt ? uglify : prettify);
 
+    var twigPipe = empty;
 
     return {
         css: cssPipe,
         less: lessPipe,
         js: jsPipe,
         css_components: cssPipe,
-        js_components: jsPipe
+        js_components: jsPipe,
+        twig_components: twigPipe
     }
 })();
 
@@ -106,7 +110,8 @@ var ext = {
     less: '.css',
     js: '.js',
     'css_components': '.css',
-    'js_components': '.js'
+    'js_components': '.js',
+    'twig_components': '.twig'
 };
 
 
@@ -190,6 +195,7 @@ gulp.task('config:copy', function () {
 
 gulp.task('components:copy', function () {
     constructTask(getConfig('css_components'));
+    constructTask(getConfig('twig_components'));
     return constructTask(getConfig('js_components'));
 });
 
@@ -227,6 +233,7 @@ gulp.task('watch', function (event) {
     constructWatch(getConfig('js', event.path));
     constructWatch(getConfig('css_components', event.path));
     constructWatch(getConfig('js_components', event.path));
+    constructWatch(getConfig('twig_components', event.path));
 });