diff --git a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
index ed54ce27a..4bb1204a4 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
@@ -1,9 +1,9 @@
-@import '~ChillMainSass/custom/config/colors';
-@import '~ChillMainSass/custom/mixins/entity';
+@import '~ChillMainAssets/modules/bootstrap/bootstrap';
+//@import '~ChillMainSass/custom/mixins/entity';
 
-.chill-entity.chill-entity__activity-reason {
-    @include entity($chill-pink, white);
-}
+//.chill-entity.chill-entity__activity-reason {
+//    @include entity($chill-pink, white);
+//}
 
 .activity {
     color: $chill-green;
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 6ee6e82f8..db65ccec6 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -45,7 +45,7 @@ module.exports = function(encore, entries)
     // Aliases are used when webpack is trying to resolve modules path
     encore.addAliases({
         ChillMainAssets: __dirname + '/Resources/public',
-        ChillMainSass: __dirname + '/Resources/public/modules/scratch',
+        //ChillMainSass: __dirname + '/Resources/public/modules/scratch',
         ShowHide: __dirname + '/Resources/public/modules/show_hide'
     });
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss
index 55546c56e..775789b48 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss
@@ -1,4 +1,4 @@
-@import '~ChillMainSass/custom/config/colors';
+@import '~ChillMainAssets/modules/bootstrap/bootstrap';
 
 /*
 *  PERSON CONTEXT
@@ -51,16 +51,16 @@ div.person-view {
          display: flex;
          flex-flow: row wrap;
          div.cf_title_box:nth-child(4n+1) h2 {
-            @extend .chill-red;
+            @extend .chill-red !optional;
          }
          div.cf_title_box:nth-child(4n+2) h2 {
-            @extend .chill-green;
+            @extend .chill-green !optional;
          }
          div.cf_title_box:nth-child(4n+3) h2 {
-            @extend .chill-orange;
+            @extend .chill-orange !optional;
          }
          div.cf_title_box:nth-child(4n+4) h2 {
-            @extend .chill-blue;
+            @extend .chill-blue !optional;
          }
          div.cf_title_box:nth-child(2n+1) {
             width: 50%;
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss b/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss
index d5a2aa8a7..ba42f1fb2 100644
--- a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss
+++ b/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss
@@ -1,4 +1,4 @@
-@import '~ChillMainSass/custom/config/colors';
+@import '~ChillMainAssets/modules/bootstrap/bootstrap';
 
 @import "_task-statuses.scss";
 @import "_task-list.scss";