diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e358e127..bbe21ac72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -119,3 +119,9 @@ Version 1.5.17
 - [CRUD] add step delete
 - [CRUD] check that action exists before inserting them in edit and view template
 - [CRUD] fix error when no crud are created
+
+Master branch
+=============
+
+- [webpack] add namespace for import sass ;
+- [activity] move activity.scss to own bundle ;
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 05807258b..010deb3ca 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -2,19 +2,6 @@ parameters:
 #    cl_chill_main.example.class: Chill\MainBundle\Example
 
 services:
-            
-    twig_intl:
-        class: Twig_Extensions_Extension_Intl
-        tags: 
-            - { name: twig.extension }
-            
-    twig_date:
-        class: Twig_Extensions_Extension_Date
-        arguments:
-            - "@translator"
-        tags: 
-            - { name: twig.extension }
-
     chill.main.helper.translatable_string:
         class: Chill\MainBundle\Templating\TranslatableStringHelper
         arguments:
diff --git a/Resources/config/services/templating.yml b/Resources/config/services/templating.yml
index 8791c10b1..49836e3f9 100644
--- a/Resources/config/services/templating.yml
+++ b/Resources/config/services/templating.yml
@@ -1,4 +1,21 @@
 services:
+    twig_intl:
+        class: Twig_Extensions_Extension_Intl
+        tags: 
+            - { name: twig.extension }
+            
+    twig_date:
+        class: Twig_Extensions_Extension_Date
+        arguments:
+            - "@translator"
+        tags: 
+            - { name: twig.extension }
+            
+    twig_text:
+        class: Twig_Extensions_Extension_Text
+        tags:
+            - { name: twig.extension }
+    
     Chill\MainBundle\Templating\ChillTwigHelper:
         tags:
             - { name: twig.extension }
diff --git a/Resources/public/sass/_custom.scss b/Resources/public/sass/_custom.scss
index 867d1b071..ee533a7ee 100644
--- a/Resources/public/sass/_custom.scss
+++ b/Resources/public/sass/_custom.scss
@@ -4,7 +4,6 @@
 @import 'custom/fonts';
 @import 'custom/timeline';
 @import 'custom/mixins/entity';
-@import 'custom/activity';
 @import 'custom/report';
 @import 'custom/person';
 @import 'custom/pagination';
diff --git a/Resources/public/sass/custom/_activity.scss b/Resources/public/sass/custom/_activity.scss
deleted file mode 100644
index 604bc3c7a..000000000
--- a/Resources/public/sass/custom/_activity.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-span.entity.entity-activity.activity-reason {
-    @include entity($chill-pink, white);
-}
-
-.activity {
-    color: $chill-green;
-}
diff --git a/Resources/public/sass/custom/mixins/entity.scss b/Resources/public/sass/custom/mixins/entity.scss
index d32570534..28cc74d06 100644
--- a/Resources/public/sass/custom/mixins/entity.scss
+++ b/Resources/public/sass/custom/mixins/entity.scss
@@ -1,6 +1,6 @@
 @mixin entity($background-color, $color: white) {
     font-variant: small-caps;
-    display: inline;
+    display: inline-block;
     padding: .2em .6em .3em;
     font-size: 88%;
     font-weight: bold;
@@ -11,5 +11,6 @@
     border-radius: .25em;
     color: $color;
     background-color: $background-color;
+    margin: 0.5em;
 }
 
diff --git a/chill.webpack.config.js b/chill.webpack.config.js
index 4baf22fa2..4b80320cc 100644
--- a/chill.webpack.config.js
+++ b/chill.webpack.config.js
@@ -4,6 +4,7 @@ module.exports = function(encore, entries) {
     encore.addEntry('login', './vendor/chill-project/main/Resources/public/modules/login_page/index.js');
     encore.addEntry('tabs', './vendor/chill-project/main/Resources/public/modules/tabs/index.js');
     encore.addAliases({
-        ShowHide: __dirname + '/Resources/public/modules/show_hide/'
+        ShowHide: __dirname + '/Resources/public/modules/show_hide/',
+        ChillMainSass: __dirname + '/Resources/public/sass'
     });
 };